You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/04/04 19:10:21 UTC
[tomee] branch microprofile-smallrye-impls created (now fbadb5ca5c)
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a change to branch microprofile-smallrye-impls
in repository https://gitbox.apache.org/repos/asf/tomee.git
at fbadb5ca5c TOMEE-3890 Attempt to use Smallrye Microprofile implementation instead of Geronimo
This branch includes the following new commits:
new fbadb5ca5c TOMEE-3890 Attempt to use Smallrye Microprofile implementation instead of Geronimo
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[tomee] 01/01: TOMEE-3890 Attempt to use Smallrye Microprofile implementation instead of Geronimo
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch microprofile-smallrye-impls
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit fbadb5ca5cd2692a2b04f9213a0e44e5fb63dc66
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Mon Apr 4 21:10:12 2022 +0200
TOMEE-3890 Attempt to use Smallrye Microprofile implementation instead of Geronimo
---
boms/tomee-microprofile-api/pom.xml | 61 ++-
boms/tomee-microprofile/pom.xml | 475 ++++++++++++-------
boms/tomee-plume-api/pom.xml | 61 ++-
boms/tomee-plume/pom.xml | 505 ++++++++++++++-------
boms/tomee-plus-api/pom.xml | 61 ++-
boms/tomee-plus/pom.xml | 493 +++++++++++++-------
deps/microprofile-config-api-shade/pom.xml | 176 -------
.../microprofile-fault-tolerance-api-shade/pom.xml | 176 -------
deps/microprofile-health-api-shade/pom.xml | 182 --------
deps/microprofile-jwt-auth-api-shade/pom.xml | 176 -------
deps/microprofile-metrics-api-shade/pom.xml | 176 -------
deps/microprofile-openapi-api-shade/pom.xml | 176 -------
deps/microprofile-opentracing-api-shade/pom.xml | 182 --------
deps/microprofile-rest-client-api-shade/pom.xml | 182 --------
deps/pom.xml | 9 -
deps/safeguard-impl/pom.xml | 197 --------
mp-jwt/pom.xml | 24 +-
pom.xml | 33 +-
tck/microprofile-tck/config/pom.xml | 12 +-
tck/microprofile-tck/health/pom.xml | 10 +-
tck/microprofile-tck/jwt/pom.xml | 6 +-
tck/microprofile-tck/metrics/pom.xml | 12 +-
tck/microprofile-tck/openapi/pom.xml | 12 +-
tck/microprofile-tck/opentracing/pom.xml | 12 +-
tck/microprofile-tck/rest-client/pom.xml | 12 +-
tomee/tomee-microprofile/mp-common/pom.xml | 174 +++----
.../microprofile/config/TomEEOpenAPIExtension.java | 289 ------------
.../jakarta.enterprise.inject.spi.Extension | 17 -
28 files changed, 1179 insertions(+), 2722 deletions(-)
diff --git a/boms/tomee-microprofile-api/pom.xml b/boms/tomee-microprofile-api/pom.xml
index e75bcab141..1ecb375f32 100644
--- a/boms/tomee-microprofile-api/pom.xml
+++ b/boms/tomee-microprofile-api/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
- <version>0.31.0</version>
+ <version>0.33.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -229,7 +229,7 @@
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-config-api-shade</artifactId>
+ <artifactId>microprofile-rest-client-api-shade</artifactId>
<version>9.0.0-M8-SNAPSHOT</version>
<exclusions>
<exclusion>
@@ -240,8 +240,8 @@
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-fault-tolerance-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <artifactId>openejb-api</artifactId>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -250,9 +250,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-health-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -261,9 +261,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-jwt-auth-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>4.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -272,9 +272,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-metrics-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>4.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -283,9 +283,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-openapi-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>2.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -294,9 +294,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-opentracing-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>4.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -305,9 +305,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-rest-client-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.openapi</groupId>
+ <artifactId>microprofile-openapi-api</artifactId>
+ <version>3.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -316,9 +316,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-api</artifactId>
- <version>${project.version}</version>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ <version>3.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 10c3195147..68ae1095e8 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -210,10 +210,21 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>io.opentracing.contrib</groupId>
+ <artifactId>opentracing-concurrent</artifactId>
+ <version>0.4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
- <version>0.31.0</version>
+ <version>0.33.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -222,9 +233,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jakarta.jws</groupId>
- <artifactId>jakarta.jws-api</artifactId>
- <version>2.1.0</version>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-noop</artifactId>
+ <version>0.33.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -233,9 +244,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
+ <version>0.33.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -244,9 +255,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>3.0.1</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-annotation</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -255,9 +266,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jakarta.xml.soap</groupId>
- <artifactId>jakarta.xml.soap-api</artifactId>
- <version>1.4.2</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-classloader</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -266,9 +277,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <version>2.3.3</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-constraint</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -277,9 +288,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.10.10</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-expression</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -288,9 +299,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <version>7.5.2</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-function</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -299,9 +310,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.sourceforge.serp</groupId>
- <artifactId>serp</artifactId>
- <version>1.15.1</version>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config-common</artifactId>
+ <version>3.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -310,9 +321,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config-core</artifactId>
+ <version>3.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -321,9 +332,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>2.11.1</version>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config</artifactId>
+ <version>3.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -332,10 +343,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>3.1.5</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye.reactive</groupId>
+ <artifactId>mutiny</artifactId>
+ <version>1.2.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -344,10 +354,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>3.1.5</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-fault-tolerance-core</artifactId>
+ <version>6.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -356,10 +365,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.config</groupId>
- <artifactId>geronimo-config-impl</artifactId>
- <version>1.2.3</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-health-api</artifactId>
+ <version>4.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -368,9 +376,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
- <version>1.0.1</version>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-health</artifactId>
+ <version>4.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -379,10 +387,64 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-health-common</artifactId>
- <version>2.0.1</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-metrics</artifactId>
+ <version>4.0.0-RC1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-open-api-core</artifactId>
+ <version>3.0.0-RC1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-open-api-jaxrs</artifactId>
+ <version>3.0.0-RC1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-opentracing-contrib</artifactId>
+ <version>3.0.0-RC1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-opentracing</artifactId>
+ <version>3.0.0-RC1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <version>2.1.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -391,10 +453,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-health</artifactId>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
<version>2.0.1</version>
- <classifier>jakarta</classifier>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -403,10 +464,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-metrics-common</artifactId>
- <version>1.0.6</version>
- <classifier>jakarta</classifier>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -415,10 +475,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-metrics</artifactId>
- <version>1.0.6</version>
- <classifier>jakarta</classifier>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
+ <version>1.4.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -427,10 +486,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-openapi-impl</artifactId>
- <version>1.0.15</version>
- <classifier>jakarta</classifier>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>2.3.3</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -439,9 +497,64 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-opentracing-common</artifactId>
- <version>1.0.3</version>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.10.10</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <version>7.5.2</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.serp</groupId>
+ <artifactId>serp</artifactId>
+ <version>1.15.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.12.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>2.11.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>3.1.5</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -451,9 +564,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-opentracing</artifactId>
- <version>1.0.3</version>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>3.1.5</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -462,6 +575,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <version>1.0.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
@@ -982,83 +1106,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-config-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-fault-tolerance-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-health-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-jwt-auth-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-metrics-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-openapi-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-opentracing-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>microprofile-rest-client-api-shade</artifactId>
@@ -1279,17 +1326,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>safeguard-impl-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>sxc-shade</artifactId>
@@ -1686,6 +1722,94 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>3.0.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>2.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.openapi</groupId>
+ <artifactId>microprofile-openapi-api</artifactId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
@@ -1752,6 +1876,28 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.4.3.Final</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jandex</artifactId>
+ <version>2.4.1.Final</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
@@ -1917,6 +2063,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>9.2</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
diff --git a/boms/tomee-plume-api/pom.xml b/boms/tomee-plume-api/pom.xml
index 2d3978eac8..8dcb40f5b5 100644
--- a/boms/tomee-plume-api/pom.xml
+++ b/boms/tomee-plume-api/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
- <version>0.31.0</version>
+ <version>0.33.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -207,7 +207,7 @@
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-config-api-shade</artifactId>
+ <artifactId>microprofile-rest-client-api-shade</artifactId>
<version>9.0.0-M8-SNAPSHOT</version>
<exclusions>
<exclusion>
@@ -218,8 +218,8 @@
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-fault-tolerance-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <artifactId>openejb-api</artifactId>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -228,9 +228,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-health-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -239,9 +239,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-jwt-auth-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>4.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -250,9 +250,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-metrics-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>4.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -261,9 +261,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-openapi-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>2.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -272,9 +272,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-opentracing-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>4.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -283,9 +283,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-rest-client-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.openapi</groupId>
+ <artifactId>microprofile-openapi-api</artifactId>
+ <version>3.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -294,9 +294,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-api</artifactId>
- <version>${project.version}</version>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ <version>3.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index b5e553bc59..346646d2f3 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -221,10 +221,21 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>io.opentracing.contrib</groupId>
+ <artifactId>opentracing-concurrent</artifactId>
+ <version>0.4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
- <version>0.31.0</version>
+ <version>0.33.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -233,9 +244,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>2.0.0</version>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-noop</artifactId>
+ <version>0.33.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -244,9 +255,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
+ <version>0.33.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -255,9 +266,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jakarta.xml.soap</groupId>
- <artifactId>jakarta.xml.soap-api</artifactId>
- <version>1.4.2</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-annotation</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -266,9 +277,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.10.10</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-classloader</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -277,9 +288,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <version>7.5.2</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-constraint</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -288,9 +299,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.sourceforge.serp</groupId>
- <artifactId>serp</artifactId>
- <version>1.15.1</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-expression</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -299,9 +310,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <version>1.1</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-function</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -310,9 +321,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jdbc-store</artifactId>
- <version>5.16.4</version>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config-common</artifactId>
+ <version>3.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -321,9 +332,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-legacy</artifactId>
- <version>5.16.4</version>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config-core</artifactId>
+ <version>3.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -332,9 +343,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.batchee</groupId>
- <artifactId>batchee-jbatch</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config</artifactId>
+ <version>3.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -343,10 +354,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.batchee</groupId>
- <artifactId>batchee-jbatch</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye.reactive</groupId>
+ <artifactId>mutiny</artifactId>
+ <version>1.2.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -355,9 +365,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jcs-core</artifactId>
- <version>2.1</version>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-fault-tolerance-core</artifactId>
+ <version>6.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -366,9 +376,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jcs-jcache</artifactId>
- <version>2.1</version>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-health-api</artifactId>
+ <version>4.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -377,9 +387,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-health</artifactId>
+ <version>4.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -388,9 +398,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>2.11.1</version>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-metrics</artifactId>
+ <version>4.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -399,10 +409,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>3.1.5</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-open-api-core</artifactId>
+ <version>3.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -411,10 +420,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>3.1.5</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-open-api-jaxrs</artifactId>
+ <version>3.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -423,10 +431,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.config</groupId>
- <artifactId>geronimo-config-impl</artifactId>
- <version>1.2.3</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-opentracing-contrib</artifactId>
+ <version>3.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -435,9 +442,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
- <version>1.0.1</version>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-opentracing</artifactId>
+ <version>3.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -446,10 +453,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-health-common</artifactId>
- <version>2.0.1</version>
- <classifier>jakarta</classifier>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -458,10 +464,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-health</artifactId>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
<version>2.0.1</version>
- <classifier>jakarta</classifier>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -470,10 +475,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-metrics-common</artifactId>
- <version>1.0.6</version>
- <classifier>jakarta</classifier>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
+ <version>1.4.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -482,10 +486,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-metrics</artifactId>
- <version>1.0.6</version>
- <classifier>jakarta</classifier>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.10.10</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <version>7.5.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -494,9 +508,64 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-openapi-impl</artifactId>
- <version>1.0.15</version>
+ <groupId>net.sourceforge.serp</groupId>
+ <artifactId>serp</artifactId>
+ <version>1.15.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq.protobuf</groupId>
+ <artifactId>activemq-protobuf</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jdbc-store</artifactId>
+ <version>5.16.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-openwire-legacy</artifactId>
+ <version>5.16.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.batchee</groupId>
+ <artifactId>batchee-jbatch</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.batchee</groupId>
+ <artifactId>batchee-jbatch</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -506,9 +575,53 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-opentracing-common</artifactId>
- <version>1.0.3</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-core</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.12.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>2.11.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>3.1.5</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -518,9 +631,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-opentracing</artifactId>
- <version>1.0.3</version>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>3.1.5</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -529,6 +642,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <version>1.0.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
@@ -1082,83 +1206,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-config-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-fault-tolerance-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-health-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-jwt-auth-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-metrics-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-openapi-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-opentracing-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>microprofile-rest-client-api-shade</artifactId>
@@ -1390,17 +1437,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>safeguard-impl-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>sxc-shade</artifactId>
@@ -1786,6 +1822,94 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>3.0.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>2.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.openapi</groupId>
+ <artifactId>microprofile-openapi-api</artifactId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
@@ -1885,6 +2009,28 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.4.3.Final</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jandex</artifactId>
+ <version>2.4.1.Final</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
@@ -2050,6 +2196,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>9.2</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
diff --git a/boms/tomee-plus-api/pom.xml b/boms/tomee-plus-api/pom.xml
index 75a1eb25dc..4408aebda9 100644
--- a/boms/tomee-plus-api/pom.xml
+++ b/boms/tomee-plus-api/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
- <version>0.31.0</version>
+ <version>0.33.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -196,7 +196,7 @@
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-config-api-shade</artifactId>
+ <artifactId>microprofile-rest-client-api-shade</artifactId>
<version>9.0.0-M8-SNAPSHOT</version>
<exclusions>
<exclusion>
@@ -207,8 +207,8 @@
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-fault-tolerance-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <artifactId>openejb-api</artifactId>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -217,9 +217,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-health-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -228,9 +228,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-jwt-auth-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>4.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -239,9 +239,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-metrics-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>4.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -250,9 +250,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-openapi-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>2.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -261,9 +261,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-opentracing-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>4.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -272,9 +272,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-rest-client-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
+ <groupId>org.eclipse.microprofile.openapi</groupId>
+ <artifactId>microprofile-openapi-api</artifactId>
+ <version>3.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -283,9 +283,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-api</artifactId>
- <version>${project.version}</version>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ <version>3.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 88ee07ba86..29bfa9439f 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -232,10 +232,21 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>io.opentracing.contrib</groupId>
+ <artifactId>opentracing-concurrent</artifactId>
+ <version>0.4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
- <version>0.31.0</version>
+ <version>0.33.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -244,9 +255,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-noop</artifactId>
+ <version>0.33.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -255,9 +266,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jakarta.xml.soap</groupId>
- <artifactId>jakarta.xml.soap-api</artifactId>
- <version>1.4.2</version>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
+ <version>0.33.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -266,9 +277,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.10.10</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-annotation</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -277,9 +288,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <version>7.5.2</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-classloader</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -288,9 +299,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.sourceforge.serp</groupId>
- <artifactId>serp</artifactId>
- <version>1.15.1</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-constraint</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -299,9 +310,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <version>1.1</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-expression</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -310,9 +321,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jdbc-store</artifactId>
- <version>5.16.4</version>
+ <groupId>io.smallrye.common</groupId>
+ <artifactId>smallrye-common-function</artifactId>
+ <version>2.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -321,9 +332,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-legacy</artifactId>
- <version>5.16.4</version>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config-common</artifactId>
+ <version>3.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -332,10 +343,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.batchee</groupId>
- <artifactId>batchee-jbatch</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config-core</artifactId>
+ <version>3.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -344,9 +354,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jcs-core</artifactId>
- <version>2.1</version>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config</artifactId>
+ <version>3.0.0-RC2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -355,9 +365,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jcs-jcache</artifactId>
- <version>2.1</version>
+ <groupId>io.smallrye.reactive</groupId>
+ <artifactId>mutiny</artifactId>
+ <version>1.2.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -366,9 +376,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-fault-tolerance-core</artifactId>
+ <version>6.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -377,9 +387,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>2.11.1</version>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-health-api</artifactId>
+ <version>4.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -388,10 +398,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>3.1.5</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-health</artifactId>
+ <version>4.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -400,10 +409,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>3.1.5</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-metrics</artifactId>
+ <version>4.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -412,10 +420,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.config</groupId>
- <artifactId>geronimo-config-impl</artifactId>
- <version>1.2.3</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-open-api-core</artifactId>
+ <version>3.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -424,9 +431,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
- <version>1.0.1</version>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-open-api-jaxrs</artifactId>
+ <version>3.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -435,10 +442,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-health-common</artifactId>
- <version>2.0.1</version>
- <classifier>jakarta</classifier>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-opentracing-contrib</artifactId>
+ <version>3.0.0-RC1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -447,10 +453,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-health</artifactId>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-opentracing</artifactId>
+ <version>3.0.0-RC1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
<version>2.0.1</version>
- <classifier>jakarta</classifier>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -459,10 +475,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-metrics-common</artifactId>
- <version>1.0.6</version>
- <classifier>jakarta</classifier>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
+ <version>1.4.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -471,10 +486,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-metrics</artifactId>
- <version>1.0.6</version>
- <classifier>jakarta</classifier>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.10.10</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <version>7.5.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -483,9 +508,53 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-openapi-impl</artifactId>
- <version>1.0.15</version>
+ <groupId>net.sourceforge.serp</groupId>
+ <artifactId>serp</artifactId>
+ <version>1.15.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq.protobuf</groupId>
+ <artifactId>activemq-protobuf</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jdbc-store</artifactId>
+ <version>5.16.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-openwire-legacy</artifactId>
+ <version>5.16.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.batchee</groupId>
+ <artifactId>batchee-jbatch</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -495,9 +564,53 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-opentracing-common</artifactId>
- <version>1.0.3</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-core</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.12.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>2.11.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>3.1.5</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -507,9 +620,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-opentracing</artifactId>
- <version>1.0.3</version>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>3.1.5</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -518,6 +631,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <version>1.0.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
@@ -1082,83 +1206,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-config-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-fault-tolerance-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-health-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-jwt-auth-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-metrics-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-openapi-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-opentracing-api-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>microprofile-rest-client-api-shade</artifactId>
@@ -1379,17 +1426,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>safeguard-impl-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>sxc-shade</artifactId>
@@ -1786,6 +1822,94 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>3.0.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>2.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.openapi</groupId>
+ <artifactId>microprofile-openapi-api</artifactId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
@@ -1863,6 +1987,28 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.4.3.Final</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jandex</artifactId>
+ <version>2.4.1.Final</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
@@ -2028,6 +2174,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>9.2</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
diff --git a/deps/microprofile-config-api-shade/pom.xml b/deps/microprofile-config-api-shade/pom.xml
deleted file mode 100644
index 3123501b2f..0000000000
--- a/deps/microprofile-config-api-shade/pom.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.0-M8-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>microprofile-config-api-shade</artifactId>
- <name>TomEE :: Deps :: microprofile-config-api Shade</name>
-
- <!--
- This is to make sure ApplicationComposer, EJBContainer, Arquillian can work.
- Patching the final zip does not allow for all those use case
-
- Ideally, we should split this project for each patched library so we can have
- fine grained includes in TomEE modules.
- -->
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.microprofile.config</groupId>
- <artifactId>microprofile-config-api</artifactId>
- <version>${microprofile.config.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <artifactSet>
- <includes>
- <include>org.eclipse.microprofile.config:*</include> <!-- only CXF to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.activation</pattern>
- <shadedPattern>jakarta.activation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.ejb</pattern>
- <shadedPattern>jakarta.ejb</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.enterprise</pattern>
- <shadedPattern>jakarta.enterprise</shadedPattern>
- <excludes>
- <exclude>javax.enterprise.deploy.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.inject</pattern>
- <shadedPattern>jakarta.inject</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.interceptor</pattern>
- <shadedPattern>jakarta.interceptor</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.json</pattern>
- <shadedPattern>jakarta.json</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jws</pattern>
- <shadedPattern>jakarta.jws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.mail</pattern>
- <shadedPattern>jakarta.mail</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.persistence</pattern>
- <shadedPattern>jakarta.persistence</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.resource</pattern>
- <shadedPattern>jakarta.resource</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.servlet</pattern>
- <shadedPattern>jakarta.servlet</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.transaction</pattern>
- <shadedPattern>jakarta.transaction</shadedPattern>
- <excludes>
- <exclude>javax.transaction.xa.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.validation</pattern>
- <shadedPattern>jakarta.validation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.ws.rs</pattern>
- <shadedPattern>jakarta.ws.rs</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.bind</pattern>
- <shadedPattern>jakarta.xml.bind</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.soap</pattern>
- <shadedPattern>jakarta.xml.soap</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.ws</pattern>
- <shadedPattern>jakarta.xml.ws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.internal.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/deps/microprofile-fault-tolerance-api-shade/pom.xml b/deps/microprofile-fault-tolerance-api-shade/pom.xml
deleted file mode 100644
index f62a324934..0000000000
--- a/deps/microprofile-fault-tolerance-api-shade/pom.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.0-M8-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>microprofile-fault-tolerance-api-shade</artifactId>
- <name>TomEE :: Deps :: microprofile-fault-tolerance-api Shade</name>
-
- <!--
- This is to make sure ApplicationComposer, EJBContainer, Arquillian can work.
- Patching the final zip does not allow for all those use case
-
- Ideally, we should split this project for each patched library so we can have
- fine grained includes in TomEE modules.
- -->
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
- <artifactId>microprofile-fault-tolerance-api</artifactId>
- <version>${microprofile.fault-tolerance.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <artifactSet>
- <includes>
- <include>org.eclipse.microprofile.fault-tolerance:*</include> <!-- only CXF to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.activation</pattern>
- <shadedPattern>jakarta.activation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.ejb</pattern>
- <shadedPattern>jakarta.ejb</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.enterprise</pattern>
- <shadedPattern>jakarta.enterprise</shadedPattern>
- <excludes>
- <exclude>javax.enterprise.deploy.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.inject</pattern>
- <shadedPattern>jakarta.inject</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.interceptor</pattern>
- <shadedPattern>jakarta.interceptor</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.json</pattern>
- <shadedPattern>jakarta.json</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jws</pattern>
- <shadedPattern>jakarta.jws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.mail</pattern>
- <shadedPattern>jakarta.mail</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.persistence</pattern>
- <shadedPattern>jakarta.persistence</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.resource</pattern>
- <shadedPattern>jakarta.resource</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.servlet</pattern>
- <shadedPattern>jakarta.servlet</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.transaction</pattern>
- <shadedPattern>jakarta.transaction</shadedPattern>
- <excludes>
- <exclude>javax.transaction.xa.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.validation</pattern>
- <shadedPattern>jakarta.validation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.ws.rs</pattern>
- <shadedPattern>jakarta.ws.rs</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.bind</pattern>
- <shadedPattern>jakarta.xml.bind</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.soap</pattern>
- <shadedPattern>jakarta.xml.soap</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.ws</pattern>
- <shadedPattern>jakarta.xml.ws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.internal.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/deps/microprofile-health-api-shade/pom.xml b/deps/microprofile-health-api-shade/pom.xml
deleted file mode 100644
index ca3b4737ed..0000000000
--- a/deps/microprofile-health-api-shade/pom.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.0-M8-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>microprofile-health-api-shade</artifactId>
- <name>TomEE :: Deps :: microprofile-health-api Shade</name>
-
- <!--
- This is to make sure ApplicationComposer, EJBContainer, Arquillian can work.
- Patching the final zip does not allow for all those use case
-
- Ideally, we should split this project for each patched library so we can have
- fine grained includes in TomEE modules.
- -->
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.microprofile.health</groupId>
- <artifactId>microprofile-health-api</artifactId>
- <version>${microprofile.health.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <artifactSet>
- <includes>
- <include>org.eclipse.microprofile.health:*</include> <!-- only CXF to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.activation</pattern>
- <shadedPattern>jakarta.activation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.ejb</pattern>
- <shadedPattern>jakarta.ejb</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.enterprise</pattern>
- <shadedPattern>jakarta.enterprise</shadedPattern>
- <excludes>
- <exclude>javax.enterprise.deploy.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.inject</pattern>
- <shadedPattern>jakarta.inject</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.interceptor</pattern>
- <shadedPattern>jakarta.interceptor</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.json</pattern>
- <shadedPattern>jakarta.json</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jws</pattern>
- <shadedPattern>jakarta.jws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.mail</pattern>
- <shadedPattern>jakarta.mail</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.persistence</pattern>
- <shadedPattern>jakarta.persistence</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.resource</pattern>
- <shadedPattern>jakarta.resource</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.servlet</pattern>
- <shadedPattern>jakarta.servlet</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.transaction</pattern>
- <shadedPattern>jakarta.transaction</shadedPattern>
- <excludes>
- <exclude>javax.transaction.xa.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.validation</pattern>
- <shadedPattern>jakarta.validation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.ws.rs</pattern>
- <shadedPattern>jakarta.ws.rs</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.bind</pattern>
- <shadedPattern>jakarta.xml.bind</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.soap</pattern>
- <shadedPattern>jakarta.xml.soap</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.ws</pattern>
- <shadedPattern>jakarta.xml.ws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.internal.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/deps/microprofile-jwt-auth-api-shade/pom.xml b/deps/microprofile-jwt-auth-api-shade/pom.xml
deleted file mode 100644
index e072d631c2..0000000000
--- a/deps/microprofile-jwt-auth-api-shade/pom.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.0-M8-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>microprofile-jwt-auth-api-shade</artifactId>
- <name>TomEE :: Deps :: microprofile-jwt-auth-api Shade</name>
-
- <!--
- This is to make sure ApplicationComposer, EJBContainer, Arquillian can work.
- Patching the final zip does not allow for all those use case
-
- Ideally, we should split this project for each patched library so we can have
- fine grained includes in TomEE modules.
- -->
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.microprofile.jwt</groupId>
- <artifactId>microprofile-jwt-auth-api</artifactId>
- <version>${microprofile.jwt.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <artifactSet>
- <includes>
- <include>org.eclipse.microprofile.jwt:*</include> <!-- only CXF to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.activation</pattern>
- <shadedPattern>jakarta.activation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.ejb</pattern>
- <shadedPattern>jakarta.ejb</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.enterprise</pattern>
- <shadedPattern>jakarta.enterprise</shadedPattern>
- <excludes>
- <exclude>javax.enterprise.deploy.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.inject</pattern>
- <shadedPattern>jakarta.inject</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.interceptor</pattern>
- <shadedPattern>jakarta.interceptor</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.json</pattern>
- <shadedPattern>jakarta.json</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jws</pattern>
- <shadedPattern>jakarta.jws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.mail</pattern>
- <shadedPattern>jakarta.mail</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.persistence</pattern>
- <shadedPattern>jakarta.persistence</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.resource</pattern>
- <shadedPattern>jakarta.resource</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.servlet</pattern>
- <shadedPattern>jakarta.servlet</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.transaction</pattern>
- <shadedPattern>jakarta.transaction</shadedPattern>
- <excludes>
- <exclude>javax.transaction.xa.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.validation</pattern>
- <shadedPattern>jakarta.validation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.ws.rs</pattern>
- <shadedPattern>jakarta.ws.rs</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.bind</pattern>
- <shadedPattern>jakarta.xml.bind</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.soap</pattern>
- <shadedPattern>jakarta.xml.soap</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.ws</pattern>
- <shadedPattern>jakarta.xml.ws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.internal.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/deps/microprofile-metrics-api-shade/pom.xml b/deps/microprofile-metrics-api-shade/pom.xml
deleted file mode 100644
index 5a2cf85642..0000000000
--- a/deps/microprofile-metrics-api-shade/pom.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.0-M8-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>microprofile-metrics-api-shade</artifactId>
- <name>TomEE :: Deps :: microprofile-metrics-api Shade</name>
-
- <!--
- This is to make sure ApplicationComposer, EJBContainer, Arquillian can work.
- Patching the final zip does not allow for all those use case
-
- Ideally, we should split this project for each patched library so we can have
- fine grained includes in TomEE modules.
- -->
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.microprofile.metrics</groupId>
- <artifactId>microprofile-metrics-api</artifactId>
- <version>${microprofile.metrics.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <artifactSet>
- <includes>
- <include>org.eclipse.microprofile.metrics:*</include> <!-- only CXF to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.activation</pattern>
- <shadedPattern>jakarta.activation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.ejb</pattern>
- <shadedPattern>jakarta.ejb</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.enterprise</pattern>
- <shadedPattern>jakarta.enterprise</shadedPattern>
- <excludes>
- <exclude>javax.enterprise.deploy.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.inject</pattern>
- <shadedPattern>jakarta.inject</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.interceptor</pattern>
- <shadedPattern>jakarta.interceptor</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.json</pattern>
- <shadedPattern>jakarta.json</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jws</pattern>
- <shadedPattern>jakarta.jws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.mail</pattern>
- <shadedPattern>jakarta.mail</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.persistence</pattern>
- <shadedPattern>jakarta.persistence</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.resource</pattern>
- <shadedPattern>jakarta.resource</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.servlet</pattern>
- <shadedPattern>jakarta.servlet</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.transaction</pattern>
- <shadedPattern>jakarta.transaction</shadedPattern>
- <excludes>
- <exclude>javax.transaction.xa.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.validation</pattern>
- <shadedPattern>jakarta.validation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.ws.rs</pattern>
- <shadedPattern>jakarta.ws.rs</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.bind</pattern>
- <shadedPattern>jakarta.xml.bind</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.soap</pattern>
- <shadedPattern>jakarta.xml.soap</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.ws</pattern>
- <shadedPattern>jakarta.xml.ws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.internal.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/deps/microprofile-openapi-api-shade/pom.xml b/deps/microprofile-openapi-api-shade/pom.xml
deleted file mode 100644
index 1a410b806d..0000000000
--- a/deps/microprofile-openapi-api-shade/pom.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.0-M8-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>microprofile-openapi-api-shade</artifactId>
- <name>TomEE :: Deps :: microprofile-openapi-api Shade</name>
-
- <!--
- This is to make sure ApplicationComposer, EJBContainer, Arquillian can work.
- Patching the final zip does not allow for all those use case
-
- Ideally, we should split this project for each patched library so we can have
- fine grained includes in TomEE modules.
- -->
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.microprofile.openapi</groupId>
- <artifactId>microprofile-openapi-api</artifactId>
- <version>${microprofile.openapi.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <artifactSet>
- <includes>
- <include>org.eclipse.microprofile.openapi:*</include> <!-- only CXF to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.activation</pattern>
- <shadedPattern>jakarta.activation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.ejb</pattern>
- <shadedPattern>jakarta.ejb</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.enterprise</pattern>
- <shadedPattern>jakarta.enterprise</shadedPattern>
- <excludes>
- <exclude>javax.enterprise.deploy.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.inject</pattern>
- <shadedPattern>jakarta.inject</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.interceptor</pattern>
- <shadedPattern>jakarta.interceptor</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.json</pattern>
- <shadedPattern>jakarta.json</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jws</pattern>
- <shadedPattern>jakarta.jws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.mail</pattern>
- <shadedPattern>jakarta.mail</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.persistence</pattern>
- <shadedPattern>jakarta.persistence</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.resource</pattern>
- <shadedPattern>jakarta.resource</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.servlet</pattern>
- <shadedPattern>jakarta.servlet</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.transaction</pattern>
- <shadedPattern>jakarta.transaction</shadedPattern>
- <excludes>
- <exclude>javax.transaction.xa.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.validation</pattern>
- <shadedPattern>jakarta.validation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.ws.rs</pattern>
- <shadedPattern>jakarta.ws.rs</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.bind</pattern>
- <shadedPattern>jakarta.xml.bind</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.soap</pattern>
- <shadedPattern>jakarta.xml.soap</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.ws</pattern>
- <shadedPattern>jakarta.xml.ws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.internal.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/deps/microprofile-opentracing-api-shade/pom.xml b/deps/microprofile-opentracing-api-shade/pom.xml
deleted file mode 100644
index b713ad247f..0000000000
--- a/deps/microprofile-opentracing-api-shade/pom.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.0-M8-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>microprofile-opentracing-api-shade</artifactId>
- <name>TomEE :: Deps :: microprofile-opentracing-api Shade</name>
-
- <!--
- This is to make sure ApplicationComposer, EJBContainer, Arquillian can work.
- Patching the final zip does not allow for all those use case
-
- Ideally, we should split this project for each patched library so we can have
- fine grained includes in TomEE modules.
- -->
-
- <dependencies>
- <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>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <artifactSet>
- <includes>
- <include>org.eclipse.microprofile.opentracing:*</include> <!-- only CXF to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.activation</pattern>
- <shadedPattern>jakarta.activation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.ejb</pattern>
- <shadedPattern>jakarta.ejb</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.enterprise</pattern>
- <shadedPattern>jakarta.enterprise</shadedPattern>
- <excludes>
- <exclude>javax.enterprise.deploy.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.inject</pattern>
- <shadedPattern>jakarta.inject</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.interceptor</pattern>
- <shadedPattern>jakarta.interceptor</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.json</pattern>
- <shadedPattern>jakarta.json</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jws</pattern>
- <shadedPattern>jakarta.jws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.mail</pattern>
- <shadedPattern>jakarta.mail</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.persistence</pattern>
- <shadedPattern>jakarta.persistence</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.resource</pattern>
- <shadedPattern>jakarta.resource</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.servlet</pattern>
- <shadedPattern>jakarta.servlet</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.transaction</pattern>
- <shadedPattern>jakarta.transaction</shadedPattern>
- <excludes>
- <exclude>javax.transaction.xa.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.validation</pattern>
- <shadedPattern>jakarta.validation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.ws.rs</pattern>
- <shadedPattern>jakarta.ws.rs</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.bind</pattern>
- <shadedPattern>jakarta.xml.bind</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.soap</pattern>
- <shadedPattern>jakarta.xml.soap</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.ws</pattern>
- <shadedPattern>jakarta.xml.ws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.internal.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/deps/microprofile-rest-client-api-shade/pom.xml b/deps/microprofile-rest-client-api-shade/pom.xml
deleted file mode 100644
index 1eecb91b7a..0000000000
--- a/deps/microprofile-rest-client-api-shade/pom.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.0-M8-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>microprofile-rest-client-api-shade</artifactId>
- <name>TomEE :: Deps :: microprofile-rest-client-api Shade</name>
-
- <!--
- This is to make sure ApplicationComposer, EJBContainer, Arquillian can work.
- Patching the final zip does not allow for all those use case
-
- Ideally, we should split this project for each patched library so we can have
- fine grained includes in TomEE modules.
- -->
-
- <dependencies>
- <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>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <artifactSet>
- <includes>
- <include>org.eclipse.microprofile.rest.client:*</include> <!-- only CXF to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.activation</pattern>
- <shadedPattern>jakarta.activation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.ejb</pattern>
- <shadedPattern>jakarta.ejb</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.enterprise</pattern>
- <shadedPattern>jakarta.enterprise</shadedPattern>
- <excludes>
- <exclude>javax.enterprise.deploy.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.inject</pattern>
- <shadedPattern>jakarta.inject</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.interceptor</pattern>
- <shadedPattern>jakarta.interceptor</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.json</pattern>
- <shadedPattern>jakarta.json</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jws</pattern>
- <shadedPattern>jakarta.jws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.mail</pattern>
- <shadedPattern>jakarta.mail</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.persistence</pattern>
- <shadedPattern>jakarta.persistence</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.resource</pattern>
- <shadedPattern>jakarta.resource</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.servlet</pattern>
- <shadedPattern>jakarta.servlet</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.transaction</pattern>
- <shadedPattern>jakarta.transaction</shadedPattern>
- <excludes>
- <exclude>javax.transaction.xa.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.validation</pattern>
- <shadedPattern>jakarta.validation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.ws.rs</pattern>
- <shadedPattern>jakarta.ws.rs</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.bind</pattern>
- <shadedPattern>jakarta.xml.bind</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.soap</pattern>
- <shadedPattern>jakarta.xml.soap</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.ws</pattern>
- <shadedPattern>jakarta.xml.ws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.internal.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/deps/pom.xml b/deps/pom.xml
index 118fa1cece..7245a9ca38 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -39,14 +39,5 @@
<module>bval-jsr-shade</module>
<module>commons-dbcp2-shade</module>
<module>commons-fileupload-shade</module>
- <module>microprofile-config-api-shade</module>
- <module>microprofile-opentracing-api-shade</module>
- <module>microprofile-fault-tolerance-api-shade</module>
- <module>microprofile-health-api-shade</module>
- <module>microprofile-jwt-auth-api-shade</module>
- <module>microprofile-metrics-api-shade</module>
- <module>microprofile-openapi-api-shade</module>
- <module>microprofile-rest-client-api-shade</module>
- <module>safeguard-impl</module>
</modules>
</project>
diff --git a/deps/safeguard-impl/pom.xml b/deps/safeguard-impl/pom.xml
deleted file mode 100644
index 99b8ab45e8..0000000000
--- a/deps/safeguard-impl/pom.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.0-M8-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>safeguard-impl-shade</artifactId>
- <name>TomEE :: Deps :: SafeGuard Impl Shade</name>
-
- <!--
- This is to make sure ApplicationComposer, EJBContainer, Arquillian can work.
- Patching the final zip does not allow for all those use case
-
- Ideally, we should split this project for each patched library so we can have
- fine grained includes in TomEE modules.
- -->
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.safeguard</groupId>
- <artifactId>safeguard-impl</artifactId>
- <version>${microprofile.fault-tolerance.impl.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.microprofile.config</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>microprofile-config-api-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.microprofile.config</groupId>
- <artifactId>microprofile-config-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <artifactSet>
- <includes>
- <include>org.apache.geronimo.safeguard:*</include> <!-- only CXF to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.activation</pattern>
- <shadedPattern>jakarta.activation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.ejb</pattern>
- <shadedPattern>jakarta.ejb</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.enterprise</pattern>
- <shadedPattern>jakarta.enterprise</shadedPattern>
- <excludes>
- <exclude>javax.enterprise.deploy.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.inject</pattern>
- <shadedPattern>jakarta.inject</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.interceptor</pattern>
- <shadedPattern>jakarta.interceptor</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.json</pattern>
- <shadedPattern>jakarta.json</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jws</pattern>
- <shadedPattern>jakarta.jws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.mail</pattern>
- <shadedPattern>jakarta.mail</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.persistence</pattern>
- <shadedPattern>jakarta.persistence</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.resource</pattern>
- <shadedPattern>jakarta.resource</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.servlet</pattern>
- <shadedPattern>jakarta.servlet</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.transaction</pattern>
- <shadedPattern>jakarta.transaction</shadedPattern>
- <excludes>
- <exclude>javax.transaction.xa.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.validation</pattern>
- <shadedPattern>jakarta.validation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.ws.rs</pattern>
- <shadedPattern>jakarta.ws.rs</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.bind</pattern>
- <shadedPattern>jakarta.xml.bind</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.soap</pattern>
- <shadedPattern>jakarta.xml.soap</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.ws</pattern>
- <shadedPattern>jakarta.xml.ws</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- <relocation>
- <pattern>com.sun.xml.internal.bind</pattern>
- <shadedPattern>org.glassfish.jaxb</shadedPattern>
- <rawString>true</rawString>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/mp-jwt/pom.xml b/mp-jwt/pom.xml
index 4f1018a532..b22d510355 100644
--- a/mp-jwt/pom.xml
+++ b/mp-jwt/pom.xml
@@ -32,28 +32,16 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-jwt-auth-api-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>${microprofile.jwt.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>microprofile-jwt-auth-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-config-api-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>${microprofile.config.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>microprofile-config-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
diff --git a/pom.xml b/pom.xml
index 125799ea5b..25591410c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,41 +223,40 @@
<version.shrinkwrap.resolver.bom>3.1.4</version.shrinkwrap.resolver.bom>
<!-- Micro Profile -->
- <microprofile.version>2.0</microprofile.version>
+ <microprofile.version>5.0</microprofile.version>
- <microprofile.config.version>1.4</microprofile.config.version>
+ <microprofile.config.version>3.0.1</microprofile.config.version>
<microprofile.config.tck.version>3.0.1</microprofile.config.tck.version>
- <microprofile.config.impl.version>1.2.3</microprofile.config.impl.version>
+ <microprofile.config.impl.version>3.0.0-RC2</microprofile.config.impl.version>
- <microprofile.jwt.version>1.2.2</microprofile.jwt.version>
+ <microprofile.jwt.version>2.0</microprofile.jwt.version>
<microprofile.jwt.tck.version>2.0</microprofile.jwt.tck.version>
<microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
- <!-- 1.1 Implementation not started yet -->
- <microprofile.fault-tolerance.version>1.1.4</microprofile.fault-tolerance.version>
+ <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>1.2.1</microprofile.fault-tolerance.impl.version>
+ <microprofile.fault-tolerance.impl.version>6.0.0-RC1</microprofile.fault-tolerance.impl.version>
- <microprofile.health.version>3.1</microprofile.health.version>
+ <microprofile.health.version>4.0</microprofile.health.version>
<microprofile.health.tck.version>4.0</microprofile.health.tck.version>
- <microprofile.health.impl.version>2.0.1</microprofile.health.impl.version>
+ <microprofile.health.impl.version>4.0.0-RC1</microprofile.health.impl.version>
- <microprofile.metrics.version>3.0-RC2</microprofile.metrics.version>
+ <microprofile.metrics.version>4.0.1</microprofile.metrics.version>
<microprofile.metrics.tck.version>4.0.1</microprofile.metrics.tck.version>
- <microprofile.metrics.impl.version>1.0.6</microprofile.metrics.impl.version>
+ <microprofile.metrics.impl.version>4.0.0-RC1</microprofile.metrics.impl.version>
- <microprofile.rest-client.version>2.0</microprofile.rest-client.version>
+ <microprofile.rest-client.version>3.0</microprofile.rest-client.version>
<microprofile.rest-client.tck.version>3.0</microprofile.rest-client.tck.version>
<microprofile.rest-client.impl.version>${cxf.version}</microprofile.rest-client.impl.version>
- <microprofile.openapi.version>1.1.2</microprofile.openapi.version>
+ <microprofile.openapi.version>3.0</microprofile.openapi.version>
<microprofile.openapi.tck.version>3.0</microprofile.openapi.tck.version>
- <microprofile.openapi.impl.version>1.0.15</microprofile.openapi.impl.version>
+ <microprofile.openapi.impl.version>3.0.0-RC1</microprofile.openapi.impl.version>
- <microprofile.opentracing.version>1.3</microprofile.opentracing.version>
+ <microprofile.opentracing.version>3.0</microprofile.opentracing.version>
<microprofile.opentracing.tck.version>3.0</microprofile.opentracing.tck.version>
- <microprofile.opentracing.impl.version>1.0.3</microprofile.opentracing.impl.version>
- <opentracing.api>0.31.0</opentracing.api>
+ <microprofile.opentracing.impl.version>3.0.0-RC1</microprofile.opentracing.impl.version>
+ <opentracing.api>0.33.0</opentracing.api>
<!-- Jackson required by OpenAPI Impl -->
<jackson.version>2.13.0-rc2</jackson.version>
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index ad8484a714..ec24534533 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -97,16 +97,10 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-config-api-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>${microprofile.config.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.microprofile.config</groupId>
- <artifactId>microprofile-config-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/tck/microprofile-tck/health/pom.xml b/tck/microprofile-tck/health/pom.xml
index 2f9b6c9ba1..76c054bbc2 100644
--- a/tck/microprofile-tck/health/pom.xml
+++ b/tck/microprofile-tck/health/pom.xml
@@ -83,18 +83,14 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-health-api-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>${microprofile.health.version}</version>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.eclipse.microprofile.health</groupId>
- <artifactId>microprofile-health-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index 4fdde61dbe..0c3f24b274 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -136,9 +136,9 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.config</groupId>
- <artifactId>geronimo-config-impl</artifactId>
- <version>1.2.3</version>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config-core</artifactId>
+ <version>${microprofile.config.impl.version}</version>
<classifier>jakarta</classifier>
<scope>test</scope>
</dependency>
diff --git a/tck/microprofile-tck/metrics/pom.xml b/tck/microprofile-tck/metrics/pom.xml
index 5f82ee6718..28d307839b 100644
--- a/tck/microprofile-tck/metrics/pom.xml
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -91,16 +91,10 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-metrics-api-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>${microprofile.metrics.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.microprofile.metrics</groupId>
- <artifactId>microprofile-metrics-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/tck/microprofile-tck/openapi/pom.xml b/tck/microprofile-tck/openapi/pom.xml
index d5d8d59dbf..65076ad33e 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -95,16 +95,10 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-openapi-api-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>org.eclipse.microprofile.openapi</groupId>
+ <artifactId>microprofile-openapi-api</artifactId>
+ <version>${microprofile.openapi.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.microprofile.openapi</groupId>
- <artifactId>microprofile-openapi-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/tck/microprofile-tck/opentracing/pom.xml b/tck/microprofile-tck/opentracing/pom.xml
index 3829937d34..af5f5d96d6 100644
--- a/tck/microprofile-tck/opentracing/pom.xml
+++ b/tck/microprofile-tck/opentracing/pom.xml
@@ -83,16 +83,10 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-opentracing-api-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>${microprofile.opentracing.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.microprofile.opentracing</groupId>
- <artifactId>microprofile-opentracing-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index e1a433ed96..9755559886 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -113,20 +113,16 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-rest-client-api-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ <version>${microprofile.rest-client.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.eclipse.microprofile.rest.client</groupId>
- <artifactId>microprofile-rest-client-api</artifactId>
- </exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<dependency>
diff --git a/tomee/tomee-microprofile/mp-common/pom.xml b/tomee/tomee-microprofile/mp-common/pom.xml
index 8e4753ed19..a7146aa799 100644
--- a/tomee/tomee-microprofile/mp-common/pom.xml
+++ b/tomee/tomee-microprofile/mp-common/pom.xml
@@ -50,109 +50,79 @@
<!-- MicroProfile -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-config-api-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>microprofile-config-api</artifactId>
- </exclusion>
- </exclusions>
+ <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>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config</artifactId>
<version>${microprofile.config.impl.version}</version>
- <classifier>jakarta</classifier>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>microprofile-config-api</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-jwt-auth-api-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
<exclusion>
- <groupId>*</groupId>
- <artifactId>microprofile-jwt-auth-api</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mp-jwt</artifactId>
- <version>${microprofile.jwt.impl.version}</version>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>${microprofile.jwt.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>microprofile-fault-tolerance-api-shade</artifactId>
- <version>${project.version}</version>
+ <artifactId>mp-jwt</artifactId>
+ <version>${microprofile.jwt.impl.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
- <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>safeguard-impl-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.safeguard</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>${microprofile.fault-tolerance.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-health-api-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-fault-tolerance-core</artifactId>
+ <version>${microprofile.fault-tolerance.impl.version}</version>
<exclusions>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
<exclusion>
<groupId>*</groupId>
- <artifactId>microprofile-health-api</artifactId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-health</artifactId>
- <version>${microprofile.health.impl.version}</version>
- <classifier>jakarta</classifier>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>${microprofile.health.version}</version>
<exclusions>
<exclusion>
- <groupId>*</groupId>
- <artifactId>microprofile-health-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>geronimo-health-common</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-health-common</artifactId>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-health</artifactId>
<version>${microprofile.health.impl.version}</version>
- <classifier>jakarta</classifier>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -162,49 +132,32 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-metrics-api-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>microprofile-metrics-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>${microprofile.health.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-metrics</artifactId>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-metrics</artifactId>
<version>${microprofile.metrics.impl.version}</version>
- <classifier>jakarta</classifier>
<exclusions>
<exclusion>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-metrics-common</artifactId>
+ <groupId>*</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-metrics-common</artifactId>
- <version>${microprofile.metrics.impl.version}</version>
- <classifier>jakarta</classifier>
- </dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-rest-client-api-shade</artifactId>
- <version>${project.version}</version>
+ <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>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>microprofile-rest-client-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -222,9 +175,16 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-openapi-api-shade</artifactId>
- <version>${project.version}</version>
+ <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>
<groupId>*</groupId>
@@ -233,13 +193,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-openapi-impl</artifactId>
- <version>${microprofile.openapi.impl.version}</version>
- <classifier>jakarta</classifier>
- </dependency>
-
<!-- Jackson required by OpenAPI Impl -->
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -251,39 +204,22 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>microprofile-opentracing-api-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>microprofile-opentracing-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>${microprofile.opentracing.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-opentracing</artifactId>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-opentracing</artifactId>
<version>${microprofile.opentracing.impl.version}</version>
- <classifier>jakarta</classifier>
<exclusions>
<exclusion>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-opentracing-common</artifactId>
+ <groupId>*</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-opentracing-common</artifactId>
- <version>${microprofile.opentracing.impl.version}</version>
- <classifier>jakarta</classifier>
- </dependency>
<dependency>
<groupId>io.opentracing</groupId>
diff --git a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEOpenAPIExtension.java b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEOpenAPIExtension.java
deleted file mode 100644
index fbaeeed34d..0000000000
--- a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEOpenAPIExtension.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tomee.microprofile.config;
-
-import org.apache.geronimo.microprofile.openapi.cdi.GeronimoOpenAPIExtension;
-import org.apache.geronimo.microprofile.openapi.config.GeronimoOpenAPIConfig;
-import org.apache.geronimo.microprofile.openapi.impl.filter.FilterImpl;
-import org.apache.geronimo.microprofile.openapi.impl.loader.DefaultLoader;
-import org.apache.geronimo.microprofile.openapi.impl.loader.yaml.Yaml;
-import org.apache.geronimo.microprofile.openapi.impl.model.PathsImpl;
-import org.apache.geronimo.microprofile.openapi.impl.processor.AnnotatedMethodElement;
-import org.apache.geronimo.microprofile.openapi.impl.processor.AnnotatedTypeElement;
-import org.apache.geronimo.microprofile.openapi.impl.processor.AnnotationProcessor;
-import org.apache.geronimo.microprofile.openapi.impl.processor.spi.NamingStrategy;
-import org.apache.geronimo.microprofile.openapi.jaxrs.JacksonOpenAPIYamlBodyWriter;
-import org.eclipse.microprofile.openapi.OASConfig;
-import org.eclipse.microprofile.openapi.OASFilter;
-import org.eclipse.microprofile.openapi.OASModelReader;
-import org.eclipse.microprofile.openapi.models.OpenAPI;
-import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
-
-import jakarta.enterprise.event.Observes;
-import jakarta.enterprise.inject.Instance;
-import jakarta.enterprise.inject.spi.Annotated;
-import jakarta.enterprise.inject.spi.AnnotatedMethod;
-import jakarta.enterprise.inject.spi.Bean;
-import jakarta.enterprise.inject.spi.BeanManager;
-import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
-import jakarta.enterprise.inject.spi.CDI;
-import jakarta.enterprise.inject.spi.Extension;
-import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
-import jakarta.enterprise.inject.spi.ProcessBean;
-import jakarta.servlet.ServletContext;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.core.Application;
-import jakarta.ws.rs.core.MediaType;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static java.util.Optional.ofNullable;
-import static java.util.stream.Collectors.toSet;
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
-
-@SuppressWarnings("checkstyle:finalclass")
-public class TomEEOpenAPIExtension extends GeronimoOpenAPIExtension implements Extension {
-
- private final Collection<Bean<?>> endpoints = new ArrayList<>();
-
- private final Map<Application, OpenAPI> openapis = new HashMap<>();
-
- private GeronimoOpenAPIConfig config;
- private AnnotationProcessor processor;
- private boolean skipScan;
- private Collection<String> classes;
- private Collection<String> packages;
- private Collection<String> excludePackages;
- private Collection<String> excludeClasses;
- private boolean jacksonIsPresent;
-
- void init(@Observes final BeforeBeanDiscovery beforeBeanDiscovery) {
- config = GeronimoOpenAPIConfig.create();
- processor = new AnnotationProcessor(config, loadNamingStrategy(config), null);
- skipScan = Boolean.parseBoolean(config.read(OASConfig.SCAN_DISABLE, "false"));
- classes = getConfigCollection(OASConfig.SCAN_CLASSES);
- packages = getConfigCollection(OASConfig.SCAN_PACKAGES);
- excludePackages = getConfigCollection(OASConfig.SCAN_EXCLUDE_PACKAGES);
- excludeClasses = getConfigCollection(OASConfig.SCAN_EXCLUDE_CLASSES);
- try {
- Yaml.getObjectMapper();
- jacksonIsPresent = true;
- } catch (final Error | RuntimeException e) {
- // no-op
- }
- }
-
- public MediaType getDefaultMediaType() {
- return jacksonIsPresent ? new MediaType("text", "vnd.yaml") : APPLICATION_JSON_TYPE;
- }
-
- private NamingStrategy loadNamingStrategy(final GeronimoOpenAPIConfig config) {
- return ofNullable(config.read("model.operation.naming.strategy", null))
- .map(String::trim)
- .filter(it -> !it.isEmpty())
- .map(it -> {
- try {
- return Thread.currentThread().getContextClassLoader().loadClass(it).getConstructor().newInstance();
- } catch (final InstantiationException | IllegalAccessException | NoSuchMethodException | ClassNotFoundException e) {
- throw new IllegalArgumentException(e);
- } catch (final InvocationTargetException ite) {
- throw new IllegalArgumentException(ite.getTargetException());
- }
- })
- .map(NamingStrategy.class::cast)
- .orElseGet(NamingStrategy.Default::new);
- }
-
- void vetoJacksonIfNotHere(@Observes final ProcessAnnotatedType<JacksonOpenAPIYamlBodyWriter> event) {
- if (!jacksonIsPresent) {
- event.veto();
- }
- }
-
- // adds a check to not register endpoints that have @RegisterRestClient
- protected <T> void findEndpointsAndApplication(@Observes final ProcessBean<T> event) {
- final String typeName = event.getAnnotated().getBaseType().getTypeName();
- if (classes == null && !skipScan && event.getAnnotated().isAnnotationPresent(Path.class) &&
- !event.getAnnotated().isAnnotationPresent(RegisterRestClient.class) &&
- !typeName.startsWith("org.apache.geronimo.microprofile.openapi.") &&
- (packages == null || packages.stream().anyMatch(typeName::startsWith))) {
- endpoints.add(event.getBean());
- }
- }
-
- public OpenAPI getOrCreateOpenAPI(final Application application) {
- if (classes != null) {
- final ClassLoader loader = Thread.currentThread().getContextClassLoader();
- return openapis.computeIfAbsent(application,
- app -> createOpenApi(application.getClass(), classes.stream().map(c -> {
- try {
- return loader.loadClass(c);
- } catch (final ClassNotFoundException e) {
- throw new IllegalArgumentException(e);
- }
- })));
- }
- if (packages == null && (!application.getSingletons().isEmpty() || !application.getClasses().isEmpty())) {
- return openapis.computeIfAbsent(application,
- app -> createOpenApi(application.getClass(), Stream.concat(endpoints.stream().map(Bean::getBeanClass),
- Stream.concat(app.getClasses().stream(), app.getSingletons().stream().map(Object::getClass)))));
- }
- return openapis.computeIfAbsent(application,
- app -> createOpenApi(application.getClass(), endpoints.stream().map(Bean::getBeanClass)));
- }
-
- private Collection<String> getConfigCollection(final String key) {
- return ofNullable(config.read(key, null))
- .map(vals -> Stream.of(vals.split(",")).map(String::trim).filter(v -> !v.isEmpty()).collect(toSet()))
- .orElse(null);
- }
-
- private OpenAPI createOpenApi(final Class<?> application, final Stream<Class<?>> beans) {
- final CDI<Object> current = CDI.current();
- final OpenAPI api = ofNullable(config.read(OASConfig.MODEL_READER, null))
- .map(value -> newInstance(current, value))
- .map(it -> OASModelReader.class.cast(it).buildModel())
- .orElseGet(() -> current.select(DefaultLoader.class).get().loadDefaultApi());
-
- final BeanManager beanManager = current.getBeanManager();
- processor.processApplication(api, new ElementImpl(beanManager.createAnnotatedType(application)));
- if (skipScan) {
- return api.paths(new PathsImpl());
- }
-
- // adds the context path to the base
- final Instance<ServletContext> servletContextInstance = current.select(ServletContext.class);
- final boolean appendContextPath = Boolean.valueOf(config.read("application.append-context-path", "true"));
- String contextPath = "";
- if (appendContextPath && !servletContextInstance.isAmbiguous() && !servletContextInstance.isUnsatisfied()) {
- contextPath = servletContextInstance.get().getContextPath();
- }
-
- final String base = contextPath + processor.getApplicationBinding(application);
- processor.beforeProcessing();
- beans.filter(c -> (excludeClasses == null || !excludeClasses.contains(c.getName())))
- .filter(c -> (excludePackages == null || excludePackages.stream().noneMatch(it -> c.getName().startsWith(it))))
- .map(beanManager::createAnnotatedType)
- .forEach(at -> processor.processClass(
- base, api, new ElementImpl(at), at.getMethods().stream().map(MethodElementImpl::new)));
-
- return ofNullable(config.read(OASConfig.FILTER, null))
- .map(it -> newInstance(current, it))
- .map(i -> new FilterImpl(OASFilter.class.cast(i)).filter(api))
- .orElse(api);
- }
-
- private Object newInstance(final CDI<Object> current, final String value) {
- try {
- final Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass(value.trim());
- try {
- final Instance<?> instance = current.select(clazz);
- if (!instance.isAmbiguous() && !instance.isUnsatisfied()) { // isResolvable is not always there
- return instance.get();
- }
- } catch (final RuntimeException e) {
- // let do " new"
- }
- return clazz.getConstructor().newInstance();
- } catch (final Exception e) {
- throw new IllegalArgumentException("Can't load " + value, e);
- }
- }
-
- private static class MethodElementImpl extends ElementImpl implements AnnotatedMethodElement {
-
- private final AnnotatedMethod<?> delegate;
-
- private MethodElementImpl(final AnnotatedMethod<?> delegate) {
- super(delegate);
- this.delegate = delegate;
- }
-
- @Override
- public String getName() {
- return delegate.getJavaMember().getName();
- }
-
- @Override
- public Type getReturnType() {
- return delegate.getJavaMember().getGenericReturnType();
- }
-
- @Override
- public Class<?> getDeclaringClass() {
- return delegate.getDeclaringType().getJavaClass();
- }
-
- @Override
- public AnnotatedTypeElement[] getParameters() {
- return delegate.getParameters().stream().map(p -> new TypeElementImpl(p.getBaseType(), p)).toArray(TypeElementImpl[]::new);
- }
- }
-
- private static class TypeElementImpl extends ElementImpl implements AnnotatedTypeElement {
-
- private final Type type;
-
- private TypeElementImpl(final Type type, final Annotated delegate) {
- super(delegate);
- this.type = type;
- }
-
- @Override
- public Type getType() {
- return type;
- }
- }
-
- private static class ElementImpl implements AnnotatedElement {
-
- private final Annotated delegate;
-
- private ElementImpl(final Annotated annotated) {
- this.delegate = annotated;
- }
-
- @Override
- public <T extends Annotation> T getAnnotation(final Class<T> annotationClass) {
- return delegate.getAnnotation(annotationClass);
- }
-
- @Override
- public Annotation[] getAnnotations() {
- return delegate.getAnnotations().toArray(new Annotation[0]);
- }
-
- @Override
- public <T extends Annotation> T[] getAnnotationsByType(final Class<T> annotationClass) {
- return delegate.getAnnotations(annotationClass).toArray((T[]) Array.newInstance(annotationClass, 0));
- }
-
- @Override
- public Annotation[] getDeclaredAnnotations() {
- return getAnnotations();
- }
- }
-}
\ No newline at end of file
diff --git a/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
deleted file mode 100644
index 268028a056..0000000000
--- a/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-org.apache.tomee.microprofile.config.TomEEOpenAPIExtension
\ No newline at end of file