Merge pull request #12148 from PasanT9/okio-2

Bump okio version and related dependencies
wso2 · Oct 2, 2023 · 72ddb4a · 72ddb4a
2 parents 5fd24f1 + 8172ffb
commit 72ddb4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
@@ -134,8 +134,8 @@
                             io.opentracing.*; version="${jaeger.client.version}",
                             io.opentracing.*; version="${jaeger.client.version}",
                             io.opentelemetry.*; version="${opentelemetry.all.version}",
-                            zipkin2.reporter.*; version="${zipkin.reporter.version}",
-                            zipkin2.reporter.okhttp3.*; version="${zipkin.sender.okhttp3.version}",
+                            zipkin2.reporter.*; version="${zipkin.reporter.version.range}",
+                            zipkin2.reporter.okhttp3.*; version="${zipkin.reporter.version.range}",
                             org.apache.commons.logging.*; version="${import.package.version.commons.logging}",
                             org.wso2.carbon.apimgt.impl.*; version="${carbon.apimgt.imp.pkg.version}",
                             org.wso2.carbon.utils.*,
@@ -145,6 +145,7 @@
                             *;resolution:=optional
                         </Import-Package>
                         <Export-Package>
+                            zipkin2.reporter.*; version="${zipkin.reporter.version}",
                             !org.wso2.carbon.apimgt.tracing.internal.*,
                             org.wso2.carbon.apimgt.tracing.*;version="${carbon.apimgt.version}"
                         </Export-Package>

diff --git a/pom.xml b/pom.xml
@@ -2177,12 +2177,13 @@
         <swagger3.core.version>2.2.8</swagger3.core.version>
         <javax.enterprise.version>2.0</javax.enterprise.version>
         <jaeger.client.version>1.8.0.wso2v1</jaeger.client.version>
-        <zipkin.sender.okhttp3.version>2.16.3</zipkin.sender.okhttp3.version>
-        <zipkin.reporter.version>2.16.3</zipkin.reporter.version>
+        <zipkin.sender.okhttp3.version>2.16.4</zipkin.sender.okhttp3.version>
+        <zipkin.reporter.version>2.16.4</zipkin.reporter.version>
+        <zipkin.reporter.version.range>[2.16.4,3)</zipkin.reporter.version.range>
         <brave.opentracing.version>0.32.0</brave.opentracing.version>
         <opentracing.api.version>0.31.0</opentracing.api.version>
         <opentracing.mock.version>0.31.0</opentracing.mock.version>
-        <opentelemetry.all.version>1.11.0.wso2v3</opentelemetry.all.version>
+        <opentelemetry.all.version>1.11.0.wso2v4</opentelemetry.all.version>
         <aspectj.version>1.9.5</aspectj.version>
         <everit.version>1.5.0.wso2.v2</everit.version>
         <json.orbit.version>3.0.0.wso2v1</json.orbit.version>
@@ -2204,8 +2205,8 @@
         <org.wso2.orbit.com.amazonaws.version>1.11.1034.wso2v2</org.wso2.orbit.com.amazonaws.version>
 
         <zipkin.version>2.23.2</zipkin.version>
-        <okhttp.wso2.version>4.9.3.wso2v2</okhttp.wso2.version>
-        <okio.wso2.version>2.8.0.wso2v2</okio.wso2.version>
+        <okhttp.wso2.version>4.11.0.wso2v1</okhttp.wso2.version>
+        <okio.wso2.version>3.5.0.wso2v1</okio.wso2.version>
 
         <openfeign.version>11.0</openfeign.version>
         <maven.spotbugsplugin.version>4.1.4</maven.spotbugsplugin.version>