From 1e28fe2500d1b2e0d341ce5727458a26e4854f61 Mon Sep 17 00:00:00 2001
From: dalexandrov <mitiaalexandrov@gmail.com>
Date: Wed, 20 Jan 2021 17:30:57 +0200
Subject: [PATCH 1/3] Microprofile Opentracing uprgated to 2.0

---
 dependencies/pom.xml                          | 34 +++++-------
 .../tests/tck/tck-opentracing/pom.xml         | 52 ++-----------------
 2 files changed, 17 insertions(+), 69 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 762f51332dc..4bd160171bb 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -18,7 +18,7 @@
 -->
 
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.helidon</groupId>
@@ -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>
@@ -273,11 +273,11 @@
                 <artifactId>jakarta.interceptor-api</artifactId>
                 <version>${version.lib.interceptor-api}</version>
                 <exclusions>
-                  <!-- Exclude EJB. See https://github.com/eclipse-ee4j/interceptor-api/issues/31 -->
-                  <exclusion>
-                      <groupId>jakarta.ejb</groupId>
-                      <artifactId>jakarta.ejb-api</artifactId>
-                  </exclusion>
+                    <!-- Exclude EJB. See https://github.com/eclipse-ee4j/interceptor-api/issues/31 -->
+                    <exclusion>
+                        <groupId>jakarta.ejb</groupId>
+                        <artifactId>jakarta.ejb-api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -434,9 +434,9 @@
                 <version>${version.lib.grpc}</version>
             </dependency>
             <dependency>
-              <groupId>io.opentracing.contrib</groupId>
-              <artifactId>opentracing-grpc</artifactId>
-              <version>${version.lib.opentracing.grpc}</version>
+                <groupId>io.opentracing.contrib</groupId>
+                <artifactId>opentracing-grpc</artifactId>
+                <version>${version.lib.opentracing.grpc}</version>
             </dependency>
 
             <!-- Webserver related -->
@@ -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>
@@ -845,10 +839,10 @@
                 <artifactId>jboss-transaction-spi</artifactId>
                 <version>${version.lib.jboss.transaction-spi}</version>
                 <exclusions>
-                  <exclusion>
-                      <groupId>org.jboss.spec.javax.resource</groupId>
-                      <artifactId>jboss-connector-api_1.7_spec</artifactId>
-                  </exclusion>
+                    <exclusion>
+                        <groupId>org.jboss.spec.javax.resource</groupId>
+                        <artifactId>jboss-connector-api_1.7_spec</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
diff --git a/microprofile/tests/tck/tck-opentracing/pom.xml b/microprofile/tests/tck/tck-opentracing/pom.xml
index 2eabe1b22df..f30e3f167d0 100644
--- a/microprofile/tests/tck/tck-opentracing/pom.xml
+++ b/microprofile/tests/tck/tck-opentracing/pom.xml
@@ -16,8 +16,8 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>tck-project</artifactId>
@@ -27,12 +27,6 @@
     <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>
@@ -40,11 +34,6 @@
             <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>
@@ -52,12 +41,6 @@
                 </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>
@@ -141,7 +95,7 @@
                     <dependency>
                         <groupId>io.opentracing</groupId>
                         <artifactId>opentracing-api</artifactId>
-                        <version>0.31.0</version>
+                        <version>0.33.0</version>
                     </dependency>
                 </dependencies>
             </plugin>

From 7cb27ef73bd888dfc008f00979f929aaa47d6c90 Mon Sep 17 00:00:00 2001
From: dalexandrov <mitiaalexandrov@gmail.com>
Date: Wed, 20 Jan 2021 17:59:32 +0200
Subject: [PATCH 2/3] More dependences removed.

---
 dependencies/pom.xml                          | 26 +++++++++----------
 .../tests/tck/tck-opentracing/pom.xml         | 13 ----------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 4bd160171bb..2213be973cd 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -18,7 +18,7 @@
 -->
 
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.helidon</groupId>
@@ -273,11 +273,11 @@
                 <artifactId>jakarta.interceptor-api</artifactId>
                 <version>${version.lib.interceptor-api}</version>
                 <exclusions>
-                    <!-- Exclude EJB. See https://github.com/eclipse-ee4j/interceptor-api/issues/31 -->
-                    <exclusion>
-                        <groupId>jakarta.ejb</groupId>
-                        <artifactId>jakarta.ejb-api</artifactId>
-                    </exclusion>
+                  <!-- Exclude EJB. See https://github.com/eclipse-ee4j/interceptor-api/issues/31 -->
+                  <exclusion>
+                      <groupId>jakarta.ejb</groupId>
+                      <artifactId>jakarta.ejb-api</artifactId>
+                  </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -434,9 +434,9 @@
                 <version>${version.lib.grpc}</version>
             </dependency>
             <dependency>
-                <groupId>io.opentracing.contrib</groupId>
-                <artifactId>opentracing-grpc</artifactId>
-                <version>${version.lib.opentracing.grpc}</version>
+              <groupId>io.opentracing.contrib</groupId>
+              <artifactId>opentracing-grpc</artifactId>
+              <version>${version.lib.opentracing.grpc}</version>
             </dependency>
 
             <!-- Webserver related -->
@@ -839,10 +839,10 @@
                 <artifactId>jboss-transaction-spi</artifactId>
                 <version>${version.lib.jboss.transaction-spi}</version>
                 <exclusions>
-                    <exclusion>
-                        <groupId>org.jboss.spec.javax.resource</groupId>
-                        <artifactId>jboss-connector-api_1.7_spec</artifactId>
-                    </exclusion>
+                  <exclusion>
+                      <groupId>org.jboss.spec.javax.resource</groupId>
+                      <artifactId>jboss-connector-api_1.7_spec</artifactId>
+                  </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
diff --git a/microprofile/tests/tck/tck-opentracing/pom.xml b/microprofile/tests/tck/tck-opentracing/pom.xml
index f30e3f167d0..8b0342e0547 100644
--- a/microprofile/tests/tck/tck-opentracing/pom.xml
+++ b/microprofile/tests/tck/tck-opentracing/pom.xml
@@ -85,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.33.0</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

From 9c6806f033b8a7fbb392bc93345bc247d3a0fdad Mon Sep 17 00:00:00 2001
From: dalexandrov <mitiaalexandrov@gmail.com>
Date: Wed, 20 Jan 2021 18:04:11 +0200
Subject: [PATCH 3/3] Codestyle.

---
 microprofile/tests/tck/tck-opentracing/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/microprofile/tests/tck/tck-opentracing/pom.xml b/microprofile/tests/tck/tck-opentracing/pom.xml
index 8b0342e0547..c442562aecd 100644
--- a/microprofile/tests/tck/tck-opentracing/pom.xml
+++ b/microprofile/tests/tck/tck-opentracing/pom.xml
@@ -16,8 +16,8 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>tck-project</artifactId>