This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/tomee-8.x by this push:
     new 232f884fe8 [TOMEE-4053] Dependency properties cleanup
232f884fe8 is described below

commit 232f884fe8250c800cb6edc9cb4326f9f41b2644
Author: Swell <5782559+sul...@users.noreply.github.com>
AuthorDate: Sun Oct 30 11:43:47 2022 +0100

    [TOMEE-4053] Dependency properties cleanup
---
 mp-jwt/pom.xml                               |   2 -
 pom.xml                                      |  88 ++++++++---
 tck/microprofile-tck/config/pom.xml          |   2 -
 tck/microprofile-tck/fault-tolerance/pom.xml |   2 -
 tck/microprofile-tck/health/pom.xml          |   2 -
 tck/microprofile-tck/jwt/pom.xml             |   2 -
 tck/microprofile-tck/metrics/pom.xml         |   3 -
 tck/microprofile-tck/openapi/pom.xml         |   2 -
 tck/microprofile-tck/opentracing/pom.xml     |   4 -
 tck/microprofile-tck/pom.xml                 |  68 +++++++++
 tck/microprofile-tck/rest-client/pom.xml     |   4 +-
 tomee/tomee-microprofile/mp-common/pom.xml   | 216 ++++++++++++++++-----------
 12 files changed, 268 insertions(+), 127 deletions(-)

diff --git a/mp-jwt/pom.xml b/mp-jwt/pom.xml
index bdd10b18f9..d1bd007c0f 100644
--- a/mp-jwt/pom.xml
+++ b/mp-jwt/pom.xml
@@ -34,13 +34,11 @@
     <dependency>
       <groupId>org.eclipse.microprofile.jwt</groupId>
       <artifactId>microprofile-jwt-auth-api</artifactId>
-      <version>${microprofile.jwt.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
-      <version>${microprofile.config.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 229808b8aa..cf8e6dd1c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,27 +173,24 @@
 
     <!-- Micro Profile API -->
     <version.microprofile>2.0</version.microprofile>
-    <microprofile.config.version>1.3</microprofile.config.version>
-    
<microprofile.fault-tolerance.version>1.1.4</microprofile.fault-tolerance.version>
-    <microprofile.health.version>1.0</microprofile.health.version>
-    <microprofile.jwt.version>1.1.1</microprofile.jwt.version>
-    <microprofile.metrics.version>1.1.1</microprofile.metrics.version>
-    <microprofile.openapi.version>1.1.2</microprofile.openapi.version>
-    <microprofile.opentracing.version>1.1.2</microprofile.opentracing.version>
-    <microprofile.rest-client.version>1.3.3</microprofile.rest-client.version>
+    <version.microprofile.config>1.3</version.microprofile.config>
+    
<version.microprofile.fault-tolerance>1.1.4</version.microprofile.fault-tolerance>
+    <version.microprofile.health>1.0</version.microprofile.health>
+    <version.microprofile.jwt>1.1.1</version.microprofile.jwt>
+    <version.microprofile.metrics>1.1.1</version.microprofile.metrics>
+    <version.microprofile.openapi>1.1.2</version.microprofile.openapi>
+    <version.microprofile.opentracing>1.1.2</version.microprofile.opentracing>
+    <version.microprofile.rest-client>1.3.3</version.microprofile.rest-client>
 
     <opentracing.api>0.31.0</opentracing.api>
 
-    <!-- Micro Profile Impl. -->
-    <microprofile.config.impl.version>1.2.1</microprofile.config.impl.version>
-    
<microprofile.fault-tolerance.impl.version>1.2.1</microprofile.fault-tolerance.impl.version>
-    <microprofile.health.impl.version>1.0.1</microprofile.health.impl.version>
-    
<microprofile.metrics.impl.version>1.0.2</microprofile.metrics.impl.version>
-    
<microprofile.openapi.impl.version>1.0.12</microprofile.openapi.impl.version>
-    
<microprofile.opentracing.impl.version>1.0.0</microprofile.opentracing.impl.version>
-
-    
<microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
-    
<microprofile.rest-client.impl.version>${cxf.version}</microprofile.rest-client.impl.version>
+    <!-- Geronimo Impl. -->
+    <version.microprofile.impl.config>1.2.1</version.microprofile.impl.config>
+    
<version.microprofile.impl.fault-tolerance>1.2.1</version.microprofile.impl.fault-tolerance>
+    <version.microprofile.impl.health>1.0.1</version.microprofile.impl.health>
+    
<version.microprofile.impl.metrics>1.0.2</version.microprofile.impl.metrics>
+    
<version.microprofile.impl.openapi>1.0.12</version.microprofile.impl.openapi>
+    
<version.microprofile.impl.opentracing>1.0.0</version.microprofile.impl.opentracing>
 
     <!-- Jackson and snakeyaml required by OpenAPI Impl -->
     <version.jackson>2.14.0</version.jackson>
@@ -992,6 +989,61 @@
   </pluginRepositories>
   <dependencyManagement>
     <dependencies>
+      <!-- Micro Profile API -->
+      <dependency>
+        <groupId>org.eclipse.microprofile.config</groupId>
+        <artifactId>microprofile-config-api</artifactId>
+        <version>${version.microprofile.config}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+        <artifactId>microprofile-fault-tolerance-api</artifactId>
+        <version>${version.microprofile.fault-tolerance}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.health</groupId>
+        <artifactId>microprofile-health-api</artifactId>
+        <version>${version.microprofile.health}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.jwt</groupId>
+        <artifactId>microprofile-jwt-auth-api</artifactId>
+        <version>${version.microprofile.jwt}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.metrics</groupId>
+        <artifactId>microprofile-metrics-api</artifactId>
+        <version>${version.microprofile.metrics}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.openapi</groupId>
+        <artifactId>microprofile-openapi-api</artifactId>
+        <version>${version.microprofile.openapi}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.opentracing</groupId>
+        <artifactId>microprofile-opentracing-api</artifactId>
+        <version>${version.microprofile.opentracing}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.rest.client</groupId>
+        <artifactId>microprofile-rest-client-api</artifactId>
+        <version>${version.microprofile.rest-client}</version>
+      </dependency>
+      <!-- Open Tracing API -->
+      <dependency>
+        <groupId>io.opentracing</groupId>
+        <artifactId>opentracing-api</artifactId>
+        <version>${opentracing.api}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.opentracing</groupId>
+        <artifactId>opentracing-mock</artifactId>
+        <version>${opentracing.api}</version>
+      </dependency>
+      <!-- Following dependencies remain to be cleaned up -->
+
+
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>javaee-api</artifactId>
diff --git a/tck/microprofile-tck/config/pom.xml 
b/tck/microprofile-tck/config/pom.xml
index 129046090c..5d26501511 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -99,14 +99,12 @@
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
-      <version>${microprofile.config.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-tck</artifactId>
-      <version>${microprofile.config.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml 
b/tck/microprofile-tck/fault-tolerance/pom.xml
index 2d305277f0..ba061d921a 100644
--- a/tck/microprofile-tck/fault-tolerance/pom.xml
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -86,14 +86,12 @@
     <dependency>
       <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
       <artifactId>microprofile-fault-tolerance-api</artifactId>
-      <version>${microprofile.fault-tolerance.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
       <artifactId>microprofile-fault-tolerance-tck</artifactId>
-      <version>${microprofile.fault-tolerance.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tck/microprofile-tck/health/pom.xml 
b/tck/microprofile-tck/health/pom.xml
index bb25326596..6f3e839e39 100644
--- a/tck/microprofile-tck/health/pom.xml
+++ b/tck/microprofile-tck/health/pom.xml
@@ -85,7 +85,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.health</groupId>
       <artifactId>microprofile-health-api</artifactId>
-      <version>${microprofile.health.version}</version>
       <exclusions>
         <exclusion>
           <groupId>javax.inject</groupId>
@@ -97,7 +96,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.health</groupId>
       <artifactId>microprofile-health-tck</artifactId>
-      <version>${microprofile.health.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index 19f180db63..16fc1a5178 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -95,7 +95,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.jwt</groupId>
       <artifactId>microprofile-jwt-auth-tck</artifactId>
-      <version>${microprofile.jwt.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -109,7 +108,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.jwt</groupId>
       <artifactId>microprofile-jwt-auth-tck</artifactId>
-      <version>${microprofile.jwt.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/tck/microprofile-tck/metrics/pom.xml 
b/tck/microprofile-tck/metrics/pom.xml
index fcb91c39f0..f5a7d9710a 100644
--- a/tck/microprofile-tck/metrics/pom.xml
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -93,14 +93,12 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api-tck</artifactId>
-      <version>${microprofile.metrics.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.jboss.arquillian.container</groupId>
@@ -113,7 +111,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-rest-tck</artifactId>
-      <version>${microprofile.metrics.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tck/microprofile-tck/openapi/pom.xml 
b/tck/microprofile-tck/openapi/pom.xml
index 5b94e576c4..7463cc565d 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -97,14 +97,12 @@
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-api</artifactId>
-      <version>${microprofile.openapi.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-tck</artifactId>
-      <version>${microprofile.openapi.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/tck/microprofile-tck/opentracing/pom.xml 
b/tck/microprofile-tck/opentracing/pom.xml
index dfde0416d0..c0a0c24204 100644
--- a/tck/microprofile-tck/opentracing/pom.xml
+++ b/tck/microprofile-tck/opentracing/pom.xml
@@ -85,14 +85,12 @@
     <dependency>
       <groupId>org.eclipse.microprofile.opentracing</groupId>
       <artifactId>microprofile-opentracing-api</artifactId>
-      <version>${microprofile.opentracing.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.microprofile.opentracing</groupId>
       <artifactId>microprofile-opentracing-tck</artifactId>
-      <version>${microprofile.opentracing.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -121,14 +119,12 @@
     <dependency>
       <groupId>io.opentracing</groupId>
       <artifactId>opentracing-mock</artifactId>
-      <version>${opentracing.api}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.opentracing</groupId>
       <artifactId>opentracing-api</artifactId>
-      <version>${opentracing.api}</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/tck/microprofile-tck/pom.xml b/tck/microprofile-tck/pom.xml
index 7dfe4504bf..7b9a60b831 100644
--- a/tck/microprofile-tck/pom.xml
+++ b/tck/microprofile-tck/pom.xml
@@ -63,4 +63,72 @@
       </modules>
     </profile>
   </profiles>
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- Micro Profile TCK -->
+      <dependency>
+        <groupId>org.eclipse.microprofile.config</groupId>
+        <artifactId>microprofile-config-tck</artifactId>
+        <version>${version.microprofile.config}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+        <artifactId>microprofile-fault-tolerance-tck</artifactId>
+        <version>${version.microprofile.fault-tolerance}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.health</groupId>
+        <artifactId>microprofile-health-tck</artifactId>
+        <version>${version.microprofile.health}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.jwt</groupId>
+        <artifactId>microprofile-jwt-auth-tck</artifactId>
+        <version>${version.microprofile.jwt}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.jwt</groupId>
+        <artifactId>microprofile-jwt-auth-tck</artifactId>
+        <version>${version.microprofile.jwt}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.metrics</groupId>
+        <artifactId>microprofile-metrics-api-tck</artifactId>
+        <version>${version.microprofile.metrics}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.metrics</groupId>
+        <artifactId>microprofile-metrics-rest-tck</artifactId>
+        <version>${version.microprofile.metrics}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.openapi</groupId>
+        <artifactId>microprofile-openapi-tck</artifactId>
+        <version>${version.microprofile.openapi}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.opentracing</groupId>
+        <artifactId>microprofile-opentracing-tck</artifactId>
+        <version>${version.microprofile.opentracing}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.rest.client</groupId>
+        <artifactId>microprofile-rest-client-tck</artifactId>
+        <version>${version.microprofile.rest-client}</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
 </project>
diff --git a/tck/microprofile-tck/rest-client/pom.xml 
b/tck/microprofile-tck/rest-client/pom.xml
index 7da1dc35f3..9fa538783e 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -115,7 +115,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.rest.client</groupId>
       <artifactId>microprofile-rest-client-api</artifactId>
-      <version>${microprofile.rest-client.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -128,7 +127,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.rest.client</groupId>
       <artifactId>microprofile-rest-client-tck</artifactId>
-      <version>${microprofile.rest-client.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -205,7 +203,7 @@
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-mp-client</artifactId>
-      <version>${microprofile.rest-client.impl.version}</version>
+      <version>${cxf.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/tomee/tomee-microprofile/mp-common/pom.xml 
b/tomee/tomee-microprofile/mp-common/pom.xml
index aea7202ae7..4574305675 100644
--- a/tomee/tomee-microprofile/mp-common/pom.xml
+++ b/tomee/tomee-microprofile/mp-common/pom.xml
@@ -27,7 +27,61 @@
   <artifactId>mp-common</artifactId>
   <name>TomEE :: TomEE :: MicroProfile Common</name>
 
+  <dependencyManagement>
+    <dependencies>
+      <!-- Geronimo Impl. -->
+      <dependency>
+        <groupId>org.apache.geronimo.config</groupId>
+        <artifactId>geronimo-config-impl</artifactId>
+        <version>${version.microprofile.impl.config}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.safeguard</groupId>
+        <artifactId>safeguard-impl</artifactId>
+        <version>${version.microprofile.impl.fault-tolerance}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo</groupId>
+        <artifactId>geronimo-health</artifactId>
+        <version>${version.microprofile.impl.health}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo</groupId>
+        <artifactId>geronimo-metrics</artifactId>
+        <version>${version.microprofile.impl.metrics}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo</groupId>
+        <artifactId>geronimo-openapi-impl</artifactId>
+        <version>${version.microprofile.impl.openapi}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo</groupId>
+        <artifactId>geronimo-opentracing</artifactId>
+        <version>${version.microprofile.impl.opentracing}</version>
+      </dependency>
+      <!-- Other Impl. -->
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-mp-client</artifactId>
+        <version>${cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.tomee</groupId>
+        <artifactId>cxf-shade</artifactId>
+        <version>${tomee.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>mp-jwt</artifactId>
+        <version>${tomee.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
+
+    <!-- provided dependencies -->
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>javaee-api</artifactId>
@@ -42,59 +96,64 @@
     </dependency>
 
     <dependency>
-      <artifactId>openejb-rest</artifactId>
       <groupId>org.apache.tomee</groupId>
+      <artifactId>openejb-rest</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
-    <!-- MicroProfile -->
+    <!-- Micro Profile API -->
+
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
-      <version>${microprofile.config.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.config</groupId>
-      <artifactId>geronimo-config-impl</artifactId>
-      <version>${microprofile.config.impl.version}</version>
+      <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+      <artifactId>microprofile-fault-tolerance-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.microprofile.health</groupId>
+      <artifactId>microprofile-health-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.inject</groupId>
+          <artifactId>javax.inject</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.microprofile.jwt</groupId>
       <artifactId>microprofile-jwt-auth-api</artifactId>
-      <version>${microprofile.jwt.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mp-jwt</artifactId>
-      <version>${microprofile.jwt.impl.version}</version>
+      <groupId>org.eclipse.microprofile.metrics</groupId>
+      <artifactId>microprofile-metrics-api</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
-      <artifactId>microprofile-fault-tolerance-api</artifactId>
-      <version>${microprofile.fault-tolerance.version}</version>
+      <groupId>org.eclipse.microprofile.openapi</groupId>
+      <artifactId>microprofile-openapi-api</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.safeguard</groupId>
-      <artifactId>safeguard-impl</artifactId>
-      <version>${microprofile.fault-tolerance.impl.version}</version>
+      <groupId>org.eclipse.microprofile.opentracing</groupId>
+      <artifactId>microprofile-opentracing-api</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+          <artifactId>geronimo-atinject_1.0_spec</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
 
     <dependency>
-      <groupId>org.eclipse.microprofile.health</groupId>
-      <artifactId>microprofile-health-api</artifactId>
-      <version>${microprofile.health.version}</version>
+      <groupId>org.eclipse.microprofile.rest.client</groupId>
+      <artifactId>microprofile-rest-client-api</artifactId>
       <exclusions>
         <exclusion>
           <groupId>javax.inject</groupId>
@@ -103,40 +162,74 @@
       </exclusions>
     </dependency>
 
+    <!-- Open Tracing API -->
+    <dependency>
+      <groupId>io.opentracing</groupId>
+      <artifactId>opentracing-api</artifactId>
+    </dependency>
+
+    <!-- Geronimo Impl. -->
+
+    <dependency>
+      <groupId>org.apache.geronimo.config</groupId>
+      <artifactId>geronimo-config-impl</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.geronimo.safeguard</groupId>
+      <artifactId>safeguard-impl</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.geronimo</groupId>
       <artifactId>geronimo-health</artifactId>
-      <version>${microprofile.health.impl.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.eclipse.microprofile.metrics</groupId>
-      <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-metrics</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-metrics</artifactId>
-      <version>${microprofile.metrics.impl.version}</version>
+      <artifactId>geronimo-openapi-impl</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.eclipse.microprofile.rest.client</groupId>
-      <artifactId>microprofile-rest-client-api</artifactId>
-      <version>${microprofile.rest-client.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.inject</groupId>
-          <artifactId>javax.inject</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-opentracing</artifactId>
+    </dependency>
+
+    <!-- Jackson and snakeyaml required by OpenAPI Impl -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+    </dependency>
+
+    <!-- Other Micro Profile Impl. -->
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mp-jwt</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-mp-client</artifactId>
-      <version>${microprofile.rest-client.impl.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.glassfish.jaxb</groupId>
@@ -197,7 +290,6 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>cxf-shade</artifactId>
-      <version>${tomee.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.glassfish.jaxb</groupId>
@@ -218,55 +310,5 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>org.eclipse.microprofile.openapi</groupId>
-      <artifactId>microprofile-openapi-api</artifactId>
-      <version>${microprofile.openapi.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-openapi-impl</artifactId>
-      <version>${microprofile.openapi.impl.version}</version>
-    </dependency>
-
-    <!-- Jackson required by OpenAPI Impl -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-yaml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <!-- Jackson Dataformat Yaml requires snakeyaml -->
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.microprofile.opentracing</groupId>
-      <artifactId>microprofile-opentracing-api</artifactId>
-      <version>${microprofile.opentracing.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-atinject_1.0_spec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-opentracing</artifactId>
-      <version>${microprofile.opentracing.impl.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.opentracing</groupId>
-      <artifactId>opentracing-api</artifactId>
-      <version>${opentracing.api}</version>
-    </dependency>
   </dependencies>
 </project>

Reply via email to