This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 7649f56246 [TOMEE-4035] - MicroProfile 5.0 (#924)
7649f56246 is described below
commit 7649f56246ddb2788f3e6a3c00f79ec410c37478
Author: Gwénaël Ruelland <[email protected]>
AuthorDate: Wed Sep 14 16:56:40 2022 +0200
[TOMEE-4035] - MicroProfile 5.0 (#924)
* [TOMEE-4035] - MicroProfile 5.0
---
boms/tomee-microprofile/pom.xml | 8 +-
boms/tomee-plume/pom.xml | 8 +-
boms/tomee-plus/pom.xml | 8 +-
pom.xml | 3 +-
tomee/tomee-microprofile/mp-common/pom.xml | 140 ++++++++++++++++++++++++++---
5 files changed, 139 insertions(+), 28 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index f064573b2c..f9fa9201ff 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -378,7 +378,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance-api</artifactId>
- <version>6.0.0-RC4</version>
+ <version>6.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -389,7 +389,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
- <version>6.0.0-RC4</version>
+ <version>6.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -400,7 +400,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance-core</artifactId>
- <version>6.0.0-RC4</version>
+ <version>6.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -411,7 +411,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance</artifactId>
- <version>6.0.0-RC4</version>
+ <version>6.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 295c400128..3a7ec5054f 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -389,7 +389,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance-api</artifactId>
- <version>6.0.0-RC4</version>
+ <version>6.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -400,7 +400,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
- <version>6.0.0-RC4</version>
+ <version>6.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -411,7 +411,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance-core</artifactId>
- <version>6.0.0-RC4</version>
+ <version>6.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -422,7 +422,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance</artifactId>
- <version>6.0.0-RC4</version>
+ <version>6.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index c1ab2dc2a5..27e2f5f60b 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -400,7 +400,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance-api</artifactId>
- <version>6.0.0-RC4</version>
+ <version>6.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -411,7 +411,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
- <version>6.0.0-RC4</version>
+ <version>6.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -422,7 +422,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance-core</artifactId>
- <version>6.0.0-RC4</version>
+ <version>6.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -433,7 +433,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance</artifactId>
- <version>6.0.0-RC4</version>
+ <version>6.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/pom.xml b/pom.xml
index f8963bd5bb..92d4b594f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,8 +229,7 @@
<microprofile.fault-tolerance.version>4.0</microprofile.fault-tolerance.version>
<microprofile.fault-tolerance.tck.version>4.0</microprofile.fault-tolerance.tck.version>
-
<microprofile.fault-tolerance.impl.version>6.0.0-RC4</microprofile.fault-tolerance.impl.version>
-
+
<microprofile.fault-tolerance.impl.version>6.0.0</microprofile.fault-tolerance.impl.version>
<microprofile.health.version>4.0</microprofile.health.version>
<microprofile.health.tck.version>4.0</microprofile.health.tck.version>
diff --git a/tomee/tomee-microprofile/mp-common/pom.xml
b/tomee/tomee-microprofile/mp-common/pom.xml
index 03bf4df416..b1fb6f73a1 100644
--- a/tomee/tomee-microprofile/mp-common/pom.xml
+++ b/tomee/tomee-microprofile/mp-common/pom.xml
@@ -27,7 +27,131 @@
<artifactId>mp-common</artifactId>
<name>TomEE :: TomEE :: MicroProfile Common</name>
+ <dependencyManagement>
+ <dependencies>
+ <!-- MicroProfile API -->
+ <dependency>
+ <groupId>org.eclipse.microprofile</groupId>
+ <artifactId>microprofile</artifactId>
+ <version>${microprofile.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>${microprofile.config.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>${microprofile.fault-tolerance.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>${microprofile.health.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>${microprofile.jwt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>${microprofile.metrics.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.openapi</groupId>
+ <artifactId>microprofile-openapi-api</artifactId>
+ <version>${microprofile.openapi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>${microprofile.opentracing.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ <version>${microprofile.rest-client.version}</version>
+ </dependency>
+ <!-- SmallRye API & Impl -->
+ <dependency>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config</artifactId>
+ <version>${microprofile.config.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-fault-tolerance-api</artifactId>
+ <version>${microprofile.fault-tolerance.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-fault-tolerance</artifactId>
+ <version>${microprofile.fault-tolerance.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
+ <version>${microprofile.fault-tolerance.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-fault-tolerance-core</artifactId>
+ <version>${microprofile.fault-tolerance.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-health-api</artifactId>
+ <version>${microprofile.health.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-health</artifactId>
+ <version>${microprofile.health.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-metrics-api</artifactId>
+ <version>${microprofile.metrics.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-metrics</artifactId>
+ <version>${microprofile.metrics.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-open-api</artifactId>
+ <version>${microprofile.openapi.impl.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-open-api-core</artifactId>
+ <version>${microprofile.openapi.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-open-api-jaxrs</artifactId>
+ <version>${microprofile.openapi.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-opentracing</artifactId>
+ <version>${microprofile.opentracing.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-opentracing-contrib</artifactId>
+ <version>${microprofile.opentracing.impl.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jakartaee-api</artifactId>
@@ -49,16 +173,15 @@
</dependency>
<!-- MicroProfile -->
+
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
- <version>${microprofile.config.version}</version>
</dependency>
<dependency>
<groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config</artifactId>
- <version>${microprofile.config.impl.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -78,7 +201,6 @@
<dependency>
<groupId>org.eclipse.microprofile.jwt</groupId>
<artifactId>microprofile-jwt-auth-api</artifactId>
- <version>${microprofile.jwt.version}</version>
</dependency>
<dependency>
@@ -96,13 +218,11 @@
<dependency>
<groupId>org.eclipse.microprofile.fault-tolerance</groupId>
<artifactId>microprofile-fault-tolerance-api</artifactId>
- <version>${microprofile.fault-tolerance.version}</version>
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance</artifactId>
- <version>${microprofile.fault-tolerance.impl.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -114,7 +234,6 @@
<dependency>
<groupId>org.eclipse.microprofile.health</groupId>
<artifactId>microprofile-health-api</artifactId>
- <version>${microprofile.health.version}</version>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
@@ -126,7 +245,6 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-health</artifactId>
- <version>${microprofile.health.impl.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -138,13 +256,11 @@
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
<artifactId>microprofile-metrics-api</artifactId>
- <version>${microprofile.health.version}</version>
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-metrics</artifactId>
- <version>${microprofile.metrics.impl.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -156,7 +272,6 @@
<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>
@@ -181,13 +296,11 @@
<dependency>
<groupId>org.eclipse.microprofile.openapi</groupId>
<artifactId>microprofile-openapi-api</artifactId>
- <version>${microprofile.openapi.version}</version>
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-open-api</artifactId>
- <version>${microprofile.openapi.impl.version}</version>
<type>pom</type>
<exclusions>
<exclusion>
@@ -215,13 +328,11 @@
<dependency>
<groupId>org.eclipse.microprofile.opentracing</groupId>
<artifactId>microprofile-opentracing-api</artifactId>
- <version>${microprofile.opentracing.version}</version>
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-opentracing</artifactId>
- <version>${microprofile.opentracing.impl.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -235,5 +346,6 @@
<artifactId>opentracing-api</artifactId>
<version>${opentracing.api}</version>
</dependency>
+
</dependencies>
</project>
