Merge pull request #3022 from GDLMadushanka/guavaMaster

Upgrade guava version
wso2 · Nov 9, 2023 · a08f4ca · a08f4ca
2 parents e01b616 + 8fe154c
commit a08f4ca
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 32 deletions.
diff --git a/features/org.wso2.micro.integrator.server.feature/pom.xml b/features/org.wso2.micro.integrator.server.feature/pom.xml
@@ -276,9 +276,6 @@
                                 <bundleDef>commons-configuration:commons-configuration:${commons.configuration.version}</bundleDef>
                                 <!-- bundles needed to swagger for DSS feature -->
                                 <bundleDef>org.wso2.orbit.io.swagger.v3:swagger-parser:${swagger.parser.orbit.version}</bundleDef>
-                                <bundleDef>io.swagger:swagger-core:${swagger.core.v2.version}</bundleDef>
-                                <bundleDef>io.swagger:swagger-models:${swagger.core.v2.version}</bundleDef>
-                                <bundleDef>io.swagger:swagger-annotations:${swagger.core.v2.version}</bundleDef>
                                 <bundleDef>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${fasterxml.jackson.version}</bundleDef>
                                 <bundleDef>javax.validation:validation-api:${javax.validation.version}</bundleDef>
                                 <bundleDef>org.yaml:snakeyaml:${snakeyaml.version}</bundleDef>

diff --git a/integration/mediation-tests/tests-mediator-2/pom.xml b/integration/mediation-tests/tests-mediator-2/pom.xml
@@ -417,14 +417,12 @@
         <dependency>
             <groupId>org.openjdk.nashorn</groupId>
             <artifactId>nashorn-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-util</artifactId>
-        </dependency>
-         <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-commons</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -1276,21 +1276,6 @@
                 <artifactId>swagger-parser</artifactId>
                 <version>${swagger.parser.orbit.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-core</artifactId>
-                <version>${swagger.core.v2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-models</artifactId>
-                <version>${swagger.core.v2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger.core.v2.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.dataformat</groupId>
                 <artifactId>jackson-dataformat-yaml</artifactId>
@@ -1558,9 +1543,9 @@
         <!-- Debezium Orbit version -->
         <debezium.version>2.1.4.Final.wso2v1</debezium.version>
 
-        <synapse.version>4.0.0-wso2v57</synapse.version>
+        <synapse.version>4.0.0-wso2v61</synapse.version>
         <imp.pkg.version.synapse>[4.0.0, 4.0.1)</imp.pkg.version.synapse>
-        <carbon.mediation.version>4.7.175</carbon.mediation.version>
+        <carbon.mediation.version>4.7.182</carbon.mediation.version>
         <carbon.crypto.version>1.1.3</carbon.crypto.version>
         <carbon.crypto.api.imp.pkg.version.range>[1.1.0,1.2.0)</carbon.crypto.api.imp.pkg.version.range>
         <carbon.data.version>4.5.2</carbon.data.version>
@@ -1673,7 +1658,7 @@
         <apache.felix.scr.ds.annotations.version>1.2.4</apache.felix.scr.ds.annotations.version>
         <org.wso2.carbon.caching.core.version>4.2.0</org.wso2.carbon.caching.core.version>
         <json.smart.version>2.4.11</json.smart.version>
-        <google.guava.version>31.0.1-jre</google.guava.version>
+        <google.guava.version>32.1.3-jre</google.guava.version>
         <ca.uhn.hapi.wso2.version>2.1.0.wso2v1</ca.uhn.hapi.wso2.version>
         <junit.version>4.8.2</junit.version>
         <netty.version>4.1.86.Final</netty.version>
@@ -1865,8 +1850,7 @@
         <prometheus.version>0.8.1</prometheus.version>
         <version.equinox.platform>3.14.0</version.equinox.platform>
         <!-- OAS3 Versions -->
-        <swagger.parser.orbit.version>2.0.30.wso2v1</swagger.parser.orbit.version>
-        <swagger.core.v2.version>1.6.5</swagger.core.v2.version>
+        <swagger.parser.orbit.version>2.0.30.wso2v2</swagger.parser.orbit.version>
         <snakeyaml.version>2.2</snakeyaml.version>
         <javax.validation.version>1.1.0.Final</javax.validation.version>
         <version.disruptor>3.4.2</version.disruptor>
@@ -1882,7 +1866,7 @@
         <ow2.asm.version>9.2</ow2.asm.version>
         <jsoup.version>1.15.3</jsoup.version>
         <grpc-context.orbit.version>1.27.2.wso2v1</grpc-context.orbit.version>
-        <opencensus.orbit.version>0.30.0.wso2v1</opencensus.orbit.version>
+        <opencensus.orbit.version>0.30.0.wso2v2</opencensus.orbit.version>
     </properties>
 
     <repositories>