From f0dfcbf6c4bf06c3f81d842f37e11273f82cf95b Mon Sep 17 00:00:00 2001 From: Thomas Andraschko Date: Mon, 15 Jan 2024 18:12:09 +0100 Subject: [PATCH 1/2] 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 e818ccc998d..cfafa4a72ba 100644 --- a/tomee/tomee-microprofile/mp-common/pom.xml +++ b/tomee/tomee-microprofile/mp-common/pom.xml @@ -149,10 +149,7 @@ org.eclipse.microprofile.health microprofile-health-api - - javax.inject - javax.inject - + @@ -180,10 +177,7 @@ org.eclipse.microprofile.rest.client microprofile-rest-client-api - - javax.inject - javax.inject - + @@ -235,6 +229,14 @@ io.smallrye smallrye-health + + jakarta.enterprise + jakarta.enterprise.cdi-api + + + jakarta.json + jakarta.json-api + * microprofile-health-api @@ -313,22 +315,10 @@ org.glassfish.jaxb jaxb-xjc - - javax.json - javax.json-api - - - javax.ws.rs - javax.ws.rs-api - jakarta.ws.rs jakarta.ws.rs-api - - javax.annotation - javax.annotation-api - jakarta.activation jakarta.activation-api From 5c55dec82ab9ebe8f968363164c7d71c8c5b0537 Mon Sep 17 00:00:00 2001 From: Thomas Andraschko Date: Mon, 15 Jan 2024 18:13:40 +0100 Subject: [PATCH 2/2] Fixed exclusions (related to TOMEE-4294) --- tomee/tomee-microprofile/mp-common/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomee/tomee-microprofile/mp-common/pom.xml b/tomee/tomee-microprofile/mp-common/pom.xml index cfafa4a72ba..fb4623153e2 100644 --- a/tomee/tomee-microprofile/mp-common/pom.xml +++ b/tomee/tomee-microprofile/mp-common/pom.xml @@ -233,7 +233,7 @@ jakarta.enterprise jakarta.enterprise.cdi-api - + jakarta.json jakarta.json-api