Skip to content

Commit 81413db

Browse files
brigbrig
committed
client v1 deps to clients
1 parent 47039d9 commit 81413db

File tree

9 files changed

+47
-51
lines changed

9 files changed

+47
-51
lines changed

‎client/pom.xml

+14-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515

1616
<properties>
1717
<swagger.version>1.5.20</swagger.version>
18+
<gson.version>2.10</gson.version>
19+
<gson.fire.version>1.8.3</gson.fire.version>
20+
<okhttp.version>2.7.5</okhttp.version>
21+
<okio.version>1.17.2</okio.version>
1822
</properties>
1923

2024
<dependencies>
@@ -35,28 +39,34 @@
3539
<dependency>
3640
<groupId>com.squareup.okhttp</groupId>
3741
<artifactId>okhttp</artifactId>
42+
<version>${okhttp.version}</version>
3843
</dependency>
3944
<dependency>
4045
<groupId>com.squareup.okhttp</groupId>
4146
<artifactId>logging-interceptor</artifactId>
47+
<version>${okhttp.version}</version>
4248
</dependency>
4349
<dependency>
4450
<groupId>com.squareup.okio</groupId>
4551
<artifactId>okio</artifactId>
52+
<version>${okio.version}</version>
4653
</dependency>
4754
<dependency>
4855
<groupId>com.google.code.gson</groupId>
4956
<artifactId>gson</artifactId>
50-
</dependency>
51-
<dependency>
52-
<groupId>io.gsonfire</groupId>
53-
<artifactId>gson-fire</artifactId>
57+
<version>${gson.version}</version>
5458
</dependency>
5559
<dependency>
5660
<groupId>io.swagger</groupId>
5761
<artifactId>swagger-annotations</artifactId>
5862
<version>${swagger.version}</version>
5963
</dependency>
64+
<dependency>
65+
<groupId>io.gsonfire</groupId>
66+
<artifactId>gson-fire</artifactId>
67+
<version>${gson.fire.version}</version>
68+
</dependency>
69+
6070
<dependency>
6171
<groupId>org.slf4j</groupId>
6272
<artifactId>slf4j-api</artifactId>

‎k8s/agent-operator/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@
7070
<groupId>com.fasterxml.jackson.core</groupId>
7171
<artifactId>jackson-annotations</artifactId>
7272
</dependency>
73-
<dependency>
74-
<groupId>com.squareup.okhttp3</groupId>
75-
<artifactId>okhttp</artifactId>
76-
</dependency>
7773
<dependency>
7874
<groupId>com.google.guava</groupId>
7975
<artifactId>guava</artifactId>

‎server/impl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@
387387
<plugin>
388388
<groupId>io.swagger.core.v3</groupId>
389389
<artifactId>swagger-maven-plugin</artifactId>
390-
<version>2.2.15</version>
391390
<configuration>
391+
<!-- <openapi31>true</openapi31>-->
392392
<outputFileName>swagger</outputFileName>
393393
<outputPath>${project.build.directory}/classes/com/walmartlabs/concord/server/swagger</outputPath>
394394
<outputFormat>YAML</outputFormat>

‎server/plugins/ansible/client/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,38 @@
1515

1616
<properties>
1717
<swagger.version>1.5.20</swagger.version>
18+
<gson.version>2.10</gson.version>
19+
<gson.fire.version>1.8.3</gson.fire.version>
20+
<okhttp.version>2.7.5</okhttp.version>
21+
<okio.version>1.17.2</okio.version>
1822
</properties>
1923

2024
<dependencies>
2125
<dependency>
2226
<groupId>com.walmartlabs.concord</groupId>
2327
<artifactId>concord-client</artifactId>
28+
<version>${project.version}</version>
2429
</dependency>
2530

2631
<dependency>
2732
<groupId>com.squareup.okhttp</groupId>
2833
<artifactId>okhttp</artifactId>
34+
<version>${okhttp.version}</version>
2935
</dependency>
3036
<dependency>
3137
<groupId>com.squareup.okhttp</groupId>
3238
<artifactId>logging-interceptor</artifactId>
39+
<version>${okhttp.version}</version>
3340
</dependency>
3441
<dependency>
3542
<groupId>com.squareup.okio</groupId>
3643
<artifactId>okio</artifactId>
44+
<version>${okio.version}</version>
3745
</dependency>
3846
<dependency>
3947
<groupId>com.google.code.gson</groupId>
4048
<artifactId>gson</artifactId>
49+
<version>${gson.version}</version>
4150
</dependency>
4251
<dependency>
4352
<groupId>io.swagger</groupId>
@@ -47,6 +56,7 @@
4756
<dependency>
4857
<groupId>io.gsonfire</groupId>
4958
<artifactId>gson-fire</artifactId>
59+
<version>${gson.fire.version}</version>
5060
</dependency>
5161

5262
<!-- JDK9+ compatibility -->

‎server/plugins/ansible/impl/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
<plugin>
125125
<groupId>io.swagger.core.v3</groupId>
126126
<artifactId>swagger-maven-plugin</artifactId>
127-
<version>2.2.15</version>
128127
<configuration>
129128
<outputFileName>swagger</outputFileName>
130129
<outputPath>${project.build.directory}/classes/com/walmartlabs/concord/server/plugins/ansible/swagger</outputPath>

‎server/plugins/noderoster/client/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,38 @@
1515

1616
<properties>
1717
<swagger.version>1.5.20</swagger.version>
18+
<gson.version>2.10</gson.version>
19+
<gson.fire.version>1.8.3</gson.fire.version>
20+
<okhttp.version>2.7.5</okhttp.version>
21+
<okio.version>1.17.2</okio.version>
1822
</properties>
1923

2024
<dependencies>
2125
<dependency>
2226
<groupId>com.walmartlabs.concord</groupId>
2327
<artifactId>concord-client</artifactId>
28+
<version>${project.version}</version>
2429
</dependency>
2530

2631
<dependency>
2732
<groupId>com.squareup.okhttp</groupId>
2833
<artifactId>okhttp</artifactId>
34+
<version>${okhttp.version}</version>
2935
</dependency>
3036
<dependency>
3137
<groupId>com.squareup.okhttp</groupId>
3238
<artifactId>logging-interceptor</artifactId>
39+
<version>${okhttp.version}</version>
3340
</dependency>
3441
<dependency>
3542
<groupId>com.squareup.okio</groupId>
3643
<artifactId>okio</artifactId>
44+
<version>${okio.version}</version>
3745
</dependency>
3846
<dependency>
3947
<groupId>com.google.code.gson</groupId>
4048
<artifactId>gson</artifactId>
49+
<version>${gson.version}</version>
4150
</dependency>
4251
<dependency>
4352
<groupId>io.swagger</groupId>
@@ -47,6 +56,7 @@
4756
<dependency>
4857
<groupId>io.gsonfire</groupId>
4958
<artifactId>gson-fire</artifactId>
59+
<version>${gson.fire.version}</version>
5060
</dependency>
5161

5262
<!-- JDK9+ compatibility -->

‎server/plugins/noderoster/impl/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@
240240
<plugin>
241241
<groupId>io.swagger.core.v3</groupId>
242242
<artifactId>swagger-maven-plugin</artifactId>
243-
<version>2.2.15</version>
244243
<configuration>
245244
<outputFileName>swagger</outputFileName>
246245
<outputPath>${project.build.directory}/classes/com/walmartlabs/concord/server/plugins/noderoster/swagger</outputPath>

‎server/plugins/pfed-sso/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@
8585
<artifactId>httpcore</artifactId>
8686
<scope>provided</scope>
8787
</dependency>
88-
<dependency>
89-
<groupId>com.google.code.gson</groupId>
90-
<artifactId>gson</artifactId>
91-
<scope>provided</scope>
92-
</dependency>
9388

9489
<dependency>
9590
<groupId>org.immutables</groupId>

‎targetplatform/pom.xml

+12-35
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@
5454
<graalvm.version>22.0.0.2</graalvm.version>
5555
<greenmail.version>1.6.5</greenmail.version>
5656
<groovy.version>2.5.17</groovy.version>
57-
<gson.fire.version>1.8.3</gson.fire.version>
58-
<gson.version>2.10</gson.version>
5957
<guava.version>31.1-jre</guava.version>
6058
<guice.version>5.1.0</guice.version>
6159
<hibernate.validator.version>6.1.5.Final</hibernate.validator.version>
@@ -106,9 +104,6 @@
106104
<mockito.version>4.9.0</mockito.version>
107105
<mustache.version>0.9.10</mustache.version>
108106
<nimbus.jwt.version>8.8</nimbus.jwt.version>
109-
<okhttp.version>2.7.5</okhttp.version>
110-
<okhttp3.version>3.14.9</okhttp3.version>
111-
<okio.version>1.17.2</okio.version>
112107
<ollie.version>0.0.37</ollie.version>
113108
<pac4j.version>4.0.0-RC3</pac4j.version>
114109
<parc.version>0.1.2</parc.version>
@@ -134,6 +129,7 @@
134129
<dependencyManagement>
135130
<dependencies>
136131
<!-- Concord -->
132+
<!-- deprecated -->
137133
<dependency>
138134
<groupId>com.walmartlabs.concord</groupId>
139135
<artifactId>concord-client</artifactId>
@@ -339,11 +335,17 @@
339335
<artifactId>concord-oneops-plugin</artifactId>
340336
<version>${project.version}</version>
341337
</dependency>
338+
<!-- deprecated -->
342339
<dependency>
343340
<groupId>com.walmartlabs.concord.server.plugins.ansible</groupId>
344341
<artifactId>concord-ansible-plugin-client</artifactId>
345342
<version>${project.version}</version>
346343
</dependency>
344+
<dependency>
345+
<groupId>com.walmartlabs.concord.server.plugins.ansible</groupId>
346+
<artifactId>concord-ansible-plugin-client2</artifactId>
347+
<version>${project.version}</version>
348+
</dependency>
347349
<dependency>
348350
<groupId>com.walmartlabs.concord.server.plugins.ansible</groupId>
349351
<artifactId>concord-ansible-plugin-db</artifactId>
@@ -369,6 +371,11 @@
369371
<artifactId>concord-noderoster-plugin-client</artifactId>
370372
<version>${project.version}</version>
371373
</dependency>
374+
<dependency>
375+
<groupId>com.walmartlabs.concord.server.plugins.noderoster</groupId>
376+
<artifactId>concord-noderoster-plugin-client2</artifactId>
377+
<version>${project.version}</version>
378+
</dependency>
372379
<dependency>
373380
<groupId>com.walmartlabs.concord.server.plugins</groupId>
374381
<artifactId>pfed-sso</artifactId>
@@ -469,16 +476,6 @@
469476
<artifactId>simpleclient_hotspot</artifactId>
470477
<version>${prometheus.simpleclient.version}</version>
471478
</dependency>
472-
<dependency>
473-
<groupId>com.google.code.gson</groupId>
474-
<artifactId>gson</artifactId>
475-
<version>${gson.version}</version>
476-
</dependency>
477-
<dependency>
478-
<groupId>io.gsonfire</groupId>
479-
<artifactId>gson-fire</artifactId>
480-
<version>${gson.fire.version}</version>
481-
</dependency>
482479
<dependency>
483480
<groupId>ch.qos.logback</groupId>
484481
<artifactId>logback-classic</artifactId>
@@ -994,26 +991,6 @@
994991
<artifactId>config</artifactId>
995992
<version>${config.version}</version>
996993
</dependency>
997-
<dependency>
998-
<groupId>com.squareup.okio</groupId>
999-
<artifactId>okio</artifactId>
1000-
<version>${okio.version}</version>
1001-
</dependency>
1002-
<dependency>
1003-
<groupId>com.squareup.okhttp</groupId>
1004-
<artifactId>okhttp</artifactId>
1005-
<version>${okhttp.version}</version>
1006-
</dependency>
1007-
<dependency>
1008-
<groupId>com.squareup.okhttp</groupId>
1009-
<artifactId>logging-interceptor</artifactId>
1010-
<version>${okhttp.version}</version>
1011-
</dependency>
1012-
<dependency>
1013-
<groupId>com.squareup.okhttp3</groupId>
1014-
<artifactId>okhttp</artifactId>
1015-
<version>${okhttp3.version}</version>
1016-
</dependency>
1017994
<dependency>
1018995
<groupId>org.ini4j</groupId>
1019996
<artifactId>ini4j</artifactId>

0 commit comments

Comments
 (0)