versions align

walmartlabs · Oct 9, 2023 · 982b9d0 · 982b9d0
1 parent 9ffaec5
commit 982b9d0
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 0 deletions.
diff --git a/agent/pom.xml b/agent/pom.xml
@@ -100,6 +100,7 @@
         <dependency>
             <groupId>com.squareup.okhttp</groupId>
             <artifactId>okhttp</artifactId>
+            <version>2.7.5</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.ws.rs</groupId>

diff --git a/client/pom.xml b/client/pom.xml
@@ -65,6 +65,12 @@
             <groupId>io.gsonfire</groupId>
             <artifactId>gson-fire</artifactId>
             <version>${gson.fire.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

diff --git a/it/common/pom.xml b/it/common/pom.xml
@@ -49,10 +49,12 @@
         <dependency>
             <groupId>com.squareup.okhttp</groupId>
             <artifactId>okhttp</artifactId>
+            <version>2.7.5</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <version>2.10</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>

diff --git a/it/console/pom.xml b/it/console/pom.xml
@@ -94,11 +94,13 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <version>2.10</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp</groupId>
             <artifactId>okhttp</artifactId>
+            <version>2.7.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/it/server/pom.xml b/it/server/pom.xml
@@ -170,6 +170,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <version>2.10</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -200,6 +201,7 @@
         <dependency>
             <groupId>com.squareup.okhttp</groupId>
             <artifactId>okhttp</artifactId>
+            <version>2.7.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/plugins/tasks/concord/pom.xml b/plugins/tasks/concord/pom.xml
@@ -69,6 +69,7 @@
         <dependency>
             <groupId>com.squareup.okhttp</groupId>
             <artifactId>okhttp</artifactId>
+            <version>2.7.5</version>
         </dependency>
 
         <dependency>

diff --git a/runtime/v1/impl/pom.xml b/runtime/v1/impl/pom.xml
@@ -66,6 +66,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <version>2.10</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.ws.rs</groupId>
@@ -127,6 +128,7 @@
         <dependency>
             <groupId>com.squareup.okhttp</groupId>
             <artifactId>okhttp</artifactId>
+            <version>2.7.5</version>
         </dependency>
 
         <!-- tasks -->

diff --git a/runtime/v2/runner/pom.xml b/runtime/v2/runner/pom.xml
@@ -62,6 +62,7 @@
         <dependency>
             <groupId>com.squareup.okhttp</groupId>
             <artifactId>okhttp</artifactId>
+            <version>2.7.5</version>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>

diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
@@ -1162,6 +1162,12 @@
                 <groupId>ca.ibodrov.concord</groupId>
                 <artifactId>testcontainers-concord-core</artifactId>
                 <version>${testcontainers.concord.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.code.gson</groupId>
+                        <artifactId>gson</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>ca.ibodrov.concord</groupId>