MicroProfile Opentracing 2.0 (#2676)

* Microprofile Opentracing uprgated to 2.0 * Unused dependences removed * Obsolete excludes removed
helidon-io · Jan 25, 2021 · a069d47 · a069d47
1 parent c162cc5
commit a069d47
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 66 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -102,7 +102,7 @@
         <version.lib.microprofile-reactive-streams-operators-api>1.0.1</version.lib.microprofile-reactive-streams-operators-api>
         <version.lib.microprofile-reactive-streams-operators-core>1.0.1</version.lib.microprofile-reactive-streams-operators-core>
         <version.lib.microprofile-rest-client>1.4.1</version.lib.microprofile-rest-client>
-        <version.lib.microprofile-tracing>1.3.3</version.lib.microprofile-tracing>
+        <version.lib.microprofile-tracing>2.0</version.lib.microprofile-tracing>
         <version.lib.mockito>2.23.4</version.lib.mockito>
         <version.lib.mongodb.reactivestreams>1.11.0</version.lib.mongodb.reactivestreams>
         <version.lib.mssql-jdbc>8.4.1.jre8</version.lib.mssql-jdbc>
@@ -613,12 +613,6 @@
                 <groupId>org.eclipse.microprofile.opentracing</groupId>
                 <artifactId>microprofile-opentracing-api</artifactId>
                 <version>${version.lib.microprofile-tracing}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.osgi</groupId>
-                        <artifactId>org.osgi.annotation.versioning</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.microprofile.rest.client</groupId>

diff --git a/microprofile/tests/tck/tck-opentracing/pom.xml b/microprofile/tests/tck/tck-opentracing/pom.xml
@@ -27,37 +27,20 @@
     <artifactId>tck-opentracing</artifactId>
     <name>Helidon Microprofile Tests TCK Opentracing</name>
 
-    <properties>
-        <!-- We force the version of jackson to 2.9.0 since that's -->
-        <!-- what the TCK test forces us to use (via shrinkwrap)   -->
-        <version.lib.jackson>2.9.0</version.lib.jackson>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.helidon.microprofile.tests</groupId>
             <artifactId>helidon-arquillian</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
             <exclusions>
-                <exclusion>
-                    <!-- TCK requires Jackson, not JSON-B -->
-                    <groupId>org.glassfish.jersey.media</groupId>
-                    <artifactId>jersey-media-json-binding</artifactId>
-                </exclusion>
                 <exclusion>
                     <!-- we must remove security tracing -->
                     <groupId>io.helidon.security.integration</groupId>
                     <artifactId>helidon-security-integration-jersey-client</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <!-- The TCK depends on unmarshalling using Jackson -->
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-json-jackson</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
@@ -90,35 +73,6 @@
             <artifactId>opentracing-mock</artifactId>
             <scope>test</scope>
         </dependency>
-        <!--
-            Override dependency versions for jackson-jaxrs-provider to
-            workaround proxy issues with shrinkwrap maven.
-        -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-base</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-jaxb-annotations</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -131,19 +85,6 @@
                         <suiteXmlFile>tck-suite.xml</suiteXmlFile>
                     </suiteXmlFiles>
                 </configuration>
-                <dependencies>
-                    <!--
-                        Forcing resolution of opentracing-api:0.31.0
-                        to workaround proxy issues with shrinkwrap maven.
-                        Cannot override managed version of opentracing-api since
-                        0.31.0 is not compatible with Helidon
-                    -->
-                    <dependency>
-                        <groupId>io.opentracing</groupId>
-                        <artifactId>opentracing-api</artifactId>
-                        <version>0.31.0</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>