[TOMEE-4053] Dependency properties cleanup

apache · Jan 31, 2023 · 3b138a3 · 3b138a3
1 parent 38099bb
commit 3b138a3
Show file tree

Hide file tree

Showing 29 changed files with 260 additions and 214 deletions.
diff --git a/deps/cxf-rt-rs-mp-client-shade/pom.xml b/deps/cxf-rt-rs-mp-client-shade/pom.xml
@@ -65,7 +65,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.rest.client</groupId>
       <artifactId>microprofile-rest-client-api</artifactId>
-      <version>${microprofile.rest-client.version}</version>
     </dependency>
 
   </dependencies>

diff --git a/examples/mp-config-example/pom.xml b/examples/mp-config-example/pom.xml
@@ -24,7 +24,7 @@
   <name>TomEE :: Examples :: MicroProfile Config</name>
   <properties>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
-    <microprofile.config.version>3.0.1</microprofile.config.version>
+    <version.microprofile.config>3.0.2</version.microprofile.config>
     <tomee.version>10.0.0-SNAPSHOT</tomee.version>
     <version.arquillian>1.7.0.Alpha10</version.arquillian>
   </properties>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
-      <version>${microprofile.config.version}</version>
+      <version>${version.microprofile.config}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/examples/mp-custom-healthcheck/pom.xml b/examples/mp-custom-healthcheck/pom.xml
@@ -24,7 +24,7 @@
   <name>TomEE :: Examples :: Custom HealthCheck</name>
   <properties>
     <arquillian-junit-container.version>1.7.0.Alpha10</arquillian-junit-container.version>
-    <microprofile-health-api.version>4.0</microprofile-health-api.version>
+    <version.microprofile.health-api>4.0.1</version.microprofile.health-api>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.1.0</maven-war-plugin.version>
     <jakartaee-api.version>9.1-M2</jakartaee-api.version>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.health</groupId>
       <artifactId>microprofile-health-api</artifactId>
-      <version>${microprofile-health-api.version}</version>
+      <version>${version.microprofile.health-api}</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>

diff --git a/examples/mp-faulttolerance-fallback/pom.xml b/examples/mp-faulttolerance-fallback/pom.xml
@@ -21,7 +21,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Fault Tolerance :: Fallback</name>
   <properties>
-    <microprofile-fault-tolerance-api.version>1.0</microprofile-fault-tolerance-api.version>
+    <version.microprofile.fault-tolerance-api>4.0.2</version.microprofile.fault-tolerance-api>
     <arquillian-junit-container.version>1.7.0.Alpha10</arquillian-junit-container.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.1.0</maven-war-plugin.version>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
       <artifactId>microprofile-fault-tolerance-api</artifactId>
-      <version>${microprofile-fault-tolerance-api.version}</version>
+      <version>${version.microprofile.fault-tolerance-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/examples/mp-faulttolerance-retry/pom.xml b/examples/mp-faulttolerance-retry/pom.xml
@@ -23,7 +23,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Fault Tolerance :: Retry</name>
   <properties>
-    <microprofile-fault-tolerance-api.version>1.0</microprofile-fault-tolerance-api.version>
+    <version.microprofile.fault-tolerance-api>4.0.2</version.microprofile.fault-tolerance-api>
     <arquillian-junit-container.version>1.7.0.Alpha10</arquillian-junit-container.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.1.0</maven-war-plugin.version>

diff --git a/examples/mp-faulttolerance-timeout/pom.xml b/examples/mp-faulttolerance-timeout/pom.xml
@@ -23,7 +23,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Fault Tolerance :: Timeout</name>
   <properties>
-    <microprofile-fault-tolerance-api.version>1.0</microprofile-fault-tolerance-api.version>
+    <version.microprofile.fault-tolerance-api>4.0.2</version.microprofile.fault-tolerance-api>
     <arquillian-junit-container.version>1.7.0.Alpha10</arquillian-junit-container.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.1.0</maven-war-plugin.version>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
       <artifactId>microprofile-fault-tolerance-api</artifactId>
-      <version>${microprofile-fault-tolerance-api.version}</version>
+      <version>${version.microprofile.fault-tolerance-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/examples/mp-metrics-counted/pom.xml b/examples/mp-metrics-counted/pom.xml
@@ -25,7 +25,7 @@
   <name>TomEE :: Examples :: Microprofile Metrics Counted</name>
   <properties>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
-    <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+    <version.microprofile.metrics>5.0.0</version.microprofile.metrics>
     <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
     <docker.image.name>tomee/${project.artifactId}</docker.image.name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <version>${version.microprofile.metrics}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/examples/mp-metrics-gauge/pom.xml b/examples/mp-metrics-gauge/pom.xml
@@ -24,7 +24,7 @@
   <name>TomEE :: Examples :: MicroProfile Metrics Gauge</name>
   <properties>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
-    <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+    <version.microprofile.metrics>5.0.0</version.microprofile.metrics>
     <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
     <tomee.version>10.0.0-SNAPSHOT</tomee.version>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <version>${version.microprofile.metrics}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/examples/mp-metrics-histogram/pom.xml b/examples/mp-metrics-histogram/pom.xml
@@ -25,7 +25,7 @@
   <name>TomEE :: Examples :: Microprofile Metrics Histogram</name>
   <properties>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
-    <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+    <version.microprofile.metrics>5.0.0</version.microprofile.metrics>
     <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
     <tomee.version>10.0.0-SNAPSHOT</tomee.version>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <version>${version.microprofile.metrics}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/examples/mp-metrics-metered/pom.xml b/examples/mp-metrics-metered/pom.xml
@@ -24,7 +24,7 @@
   <packaging>war</packaging>
   <properties>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
-    <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+    <version.microprofile.metrics>5.0.0</version.microprofile.metrics>
     <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
     <tomee.version>10.0.0-SNAPSHOT</tomee.version>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <version>${version.microprofile.metrics}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/examples/mp-metrics-timed/pom.xml b/examples/mp-metrics-timed/pom.xml
@@ -24,7 +24,7 @@
   <name>TomEE :: Examples :: Microprofile Metrics Timed</name>
   <properties>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
-    <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+    <version.microprofile.metrics>5.0.0</version.microprofile.metrics>
     <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
     <tomee.version>10.0.0-SNAPSHOT</tomee.version>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <version>${version.microprofile.metrics}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/examples/mp-rest-client/README.adoc b/examples/mp-rest-client/README.adoc
@@ -23,7 +23,7 @@ To use MicroProfile Rest Client you need 3 changes in your project:
  <dependency>
      <groupId>org.eclipse.microprofile.rest.client</groupId>
      <artifactId>microprofile-rest-client-api</artifactId>
-     <version>${microprofile.rest-client.version}</version>
+     <version>${version.microprofile.rest-client}</version>
      <scope>provided</scope>
  </dependency>
 ----

diff --git a/examples/mp-rest-client/README_es.adoc b/examples/mp-rest-client/README_es.adoc
@@ -22,7 +22,7 @@ Para utilizar el Cliente Rest de MicroProfile se requieren 3 cambios en su proye
  <dependency>
      <groupId>org.eclipse.microprofile.rest.client</groupId>
      <artifactId>microprofile-rest-client-api</artifactId>
-     <version>${microprofile.rest-client.version}</version>
+     <version>${version.microprofile.rest-client}</version>
      <scope>provided</scope>
  </dependency>
 ----

diff --git a/examples/mp-rest-client/README_pt.adoc b/examples/mp-rest-client/README_pt.adoc
@@ -22,7 +22,7 @@ Para usar o MicroProfile Rest Client, são necessárias 3 alterações no seu pr
  <dependency>
      <groupId>org.eclipse.microprofile.rest.client</groupId>
      <artifactId>microprofile-rest-client-api</artifactId>
-     <version>${microprofile.rest-client.version}</version>
+     <version>${version.microprofile.rest-client}</version>
      <scope>provided</scope>
  </dependency>
 ----

diff --git a/examples/mp-rest-client/pom.xml b/examples/mp-rest-client/pom.xml
@@ -24,7 +24,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile REST Client</name>
   <properties>
-    <microprofile.rest-client.version>3.0</microprofile.rest-client.version>
+    <version.microprofile.rest-client>3.0.1</version.microprofile.rest-client>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
     <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.rest.client</groupId>
       <artifactId>microprofile-rest-client-api</artifactId>
-      <version>${microprofile.rest-client.version}</version>
+      <version>${version.microprofile.rest-client}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/itests/microprofile-jwt-itests/pom.xml b/itests/microprofile-jwt-itests/pom.xml
@@ -87,7 +87,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.jwt</groupId>
       <artifactId>microprofile-jwt-auth-api</artifactId>
-      <version>${microprofile.jwt.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/itests/tomee-microprofile-itests/pom.xml b/itests/tomee-microprofile-itests/pom.xml
@@ -86,13 +86,13 @@
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-api</artifactId>
-      <version>${microprofile.openapi.version}</version>
+      <version>${version.microprofile.openapi}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <version>${version.microprofile.metrics}</version>
       <scope>compile</scope>
     </dependency>
 

diff --git 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
@@ -174,36 +174,25 @@
     <maven.compiler.release>11</maven.compiler.release>
 
     <!-- Micro Profile API -->
-    <microprofile.version>5.0</microprofile.version>
-    <microprofile.config.version>3.0.2</microprofile.config.version>
-    <microprofile.config.tck.version>3.0.2</microprofile.config.tck.version>
-    <microprofile.fault-tolerance.version>4.0.2</microprofile.fault-tolerance.version>
-    <microprofile.fault-tolerance.tck.version>4.0.2</microprofile.fault-tolerance.tck.version>
-    <microprofile.health.version>4.0.1</microprofile.health.version>
-    <microprofile.health.tck.version>4.0.1</microprofile.health.tck.version>
-    <microprofile.jwt.version>2.0</microprofile.jwt.version>
-    <microprofile.jwt.tck.version>2.0</microprofile.jwt.tck.version>
-    <microprofile.metrics.version>4.0.1</microprofile.metrics.version>
-    <microprofile.metrics.tck.version>4.0.1</microprofile.metrics.tck.version>
-    <microprofile.openapi.version>3.0</microprofile.openapi.version>
-    <microprofile.openapi.tck.version>3.0</microprofile.openapi.tck.version>
-    <microprofile.opentracing.version>3.0</microprofile.opentracing.version>
-    <microprofile.opentracing.tck.version>3.0</microprofile.opentracing.tck.version>
-    <microprofile.rest-client.version>3.0.1</microprofile.rest-client.version>
-    <microprofile.rest-client.tck.version>3.0.1</microprofile.rest-client.tck.version>
+    <version.microprofile>6.0</version.microprofile>
+    <version.microprofile.config>3.0.2</version.microprofile.config>
+    <version.microprofile.fault-tolerance>4.0.2</version.microprofile.fault-tolerance>
+    <version.microprofile.health>4.0.1</version.microprofile.health>
+    <version.microprofile.jwt>2.1</version.microprofile.jwt>
+    <version.microprofile.metrics>5.0.0</version.microprofile.metrics>
+    <version.microprofile.openapi>3.1</version.microprofile.openapi>
+    <version.microprofile.opentracing>3.0</version.microprofile.opentracing>
+    <version.microprofile.rest-client>3.0.1</version.microprofile.rest-client>
 
-    <opentracing.api>0.33.0</opentracing.api>
+    <version.io.opentracing>0.33.0</version.io.opentracing>
 
     <!-- Micro Profile Impl. -->
-    <microprofile.config.impl.version>3.0.0</microprofile.config.impl.version>
-    <microprofile.fault-tolerance.impl.version>6.0.0</microprofile.fault-tolerance.impl.version>
-    <microprofile.health.impl.version>4.0.0</microprofile.health.impl.version>
-    <microprofile.metrics.impl.version>4.0.0</microprofile.metrics.impl.version>
-    <microprofile.openapi.impl.version>3.0.0</microprofile.openapi.impl.version>
-    <microprofile.opentracing.impl.version>3.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>
+    <version.microprofile.impl.config>3.1.1</version.microprofile.impl.config>
+    <version.microprofile.impl.fault-tolerance>6.1.0</version.microprofile.impl.fault-tolerance>
+    <version.microprofile.impl.health>4.0.1</version.microprofile.impl.health>
+    <version.microprofile.impl.metrics>4.0.0</version.microprofile.impl.metrics>
+    <version.microprofile.impl.openapi>3.1.2</version.microprofile.impl.openapi>
+    <version.microprofile.impl.opentracing>3.0.0</version.microprofile.impl.opentracing>
 
     <!-- Jackson and snakeyaml required by OpenAPI Impl -->
     <version.jackson>2.14.1</version.jackson>
@@ -239,6 +228,7 @@
     <version.hibernate.orm>6.1.4.Final</version.hibernate.orm>
     <version.hibernate.validator>7.0.5.Final</version.hibernate.validator>
 
+    <!-- Other API and Impl. not in Jakarta EE -->
     <geronimo-jcache_1.0_spec.version>1.0-alpha-1</geronimo-jcache_1.0_spec.version>
     <version.krazo>2.0.2</version.krazo>
     <version.deltaspike>1.9.6</version.deltaspike>
@@ -1058,6 +1048,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>${version.io.opentracing}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.opentracing</groupId>
+        <artifactId>opentracing-mock</artifactId>
+        <version>${version.io.opentracing}</version>
+      </dependency>
+      <!-- Following dependencies remain to be cleaned up -->
+
+
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>jakartaee-api</artifactId>

diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
@@ -116,14 +116,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.tck.version}</version>
       <scope>test</scope>
     </dependency>