This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new be59561ccb Fixed exclusions (related to TOMEE-4294) (#1092)
be59561ccb is described below
commit be59561ccbb2b7451530164899f795154dfc927b
Author: Thomas Andraschko <[email protected]>
AuthorDate: Mon Jan 15 18:30:22 2024 +0100
Fixed exclusions (related to TOMEE-4294) (#1092)
* Fixed exclusions (related to TOMEE-4294)
* Fixed exclusions (related to TOMEE-4294)
---
tomee/tomee-microprofile/mp-common/pom.xml | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/tomee/tomee-microprofile/mp-common/pom.xml
b/tomee/tomee-microprofile/mp-common/pom.xml
index e818ccc998..fb4623153e 100644
--- a/tomee/tomee-microprofile/mp-common/pom.xml
+++ b/tomee/tomee-microprofile/mp-common/pom.xml
@@ -149,10 +149,7 @@
<groupId>org.eclipse.microprofile.health</groupId>
<artifactId>microprofile-health-api</artifactId>
<exclusions>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
+
</exclusions>
</dependency>
@@ -180,10 +177,7 @@
<groupId>org.eclipse.microprofile.rest.client</groupId>
<artifactId>microprofile-rest-client-api</artifactId>
<exclusions>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
+
</exclusions>
</dependency>
@@ -235,6 +229,14 @@
<groupId>io.smallrye</groupId>
<artifactId>smallrye-health</artifactId>
<exclusions>
+ <exclusion>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ </exclusion>
<exclusion>
<groupId>*</groupId>
<artifactId>microprofile-health-api</artifactId>
@@ -313,22 +315,10 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
</exclusion>
- <exclusion>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- </exclusion>
<exclusion>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </exclusion>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>