Replace JakarteEE 10 BOM with indvidual component versions to simplif…

…y patching and minor updates
apache · Oct 31, 2023 · cff6f3c · cff6f3c
1 parent b06c530
commit cff6f3c
Show file tree

Hide file tree

Showing 13 changed files with 149 additions and 10 deletions.
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
@@ -348,6 +348,7 @@
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
+            <version>${cxf.persistence-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>

diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml
@@ -320,6 +320,7 @@
         <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
+            <version>${cxf.jakarta.wsapi.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
@@ -328,10 +329,12 @@
         <dependency>
             <groupId>jakarta.jws</groupId>
             <artifactId>jakarta.jws-api</artifactId>
+            <version>${cxf.jakarta.jwsapi.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.soap</groupId>
             <artifactId>jakarta.xml.soap-api</artifactId>
+            <version>${cxf.jakarta.soapapi.version}</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml
@@ -52,6 +52,7 @@
         <dependency>
             <groupId>jakarta.inject</groupId>
             <artifactId>jakarta.inject-api</artifactId>
+            <version>${cxf.jakarta.injectapi.version}</version>
         </dependency> 
         <dependency>
             <groupId>junit</groupId>

diff --git a/integration/spring-boot/autoconfigure/pom.xml b/integration/spring-boot/autoconfigure/pom.xml
@@ -122,6 +122,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
+            <version>${cxf.servlet-api.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -98,7 +98,7 @@
         <cxf.atmosphere.version>3.0.3</cxf.atmosphere.version>
         <cxf.bcprov.version>1.70</cxf.bcprov.version>
         <cxf.brave.version>5.16.0</cxf.brave.version>
-        <cxf.cdi.api.version>3.0.0</cxf.cdi.api.version>
+        <cxf.cdi.api.version>4.0.1</cxf.cdi.api.version>
         <cxf.classgraph.version>4.8.25</cxf.classgraph.version>
         <cxf.classmate.version>1.5.1</cxf.classmate.version>
         <cxf.commons-codec.version>1.16.0</cxf.commons-codec.version>
@@ -112,6 +112,7 @@
         <cxf.dropwizard3.version>3.2.6</cxf.dropwizard3.version>
         <cxf.dropwizard4.version>4.2.21</cxf.dropwizard4.version>
         <cxf.ehcache3.version>3.10.8</cxf.ehcache3.version>
+        <cxf.el-api.version>5.0.1</cxf.el-api.version>
         <cxf.findbugs.version>3.0.2</cxf.findbugs.version>
         <cxf.hisrc.basicjaxb.version>2.1.1</cxf.hisrc.basicjaxb.version>
         <cxf.geronimo.jta.version>1.1.1</cxf.geronimo.jta.version>
@@ -135,13 +136,24 @@
         <cxf.jackson.databind.version>2.15.3</cxf.jackson.databind.version>
         <cxf.jacorb.version>3.9</cxf.jacorb.version>
         <cxf.jaeger.version>1.8.1</cxf.jaeger.version>
-        <cxf.jakarta.ee.version>10.0.0</cxf.jakarta.ee.version>
+        <cxf.jakarta.activation.version>2.1.2</cxf.jakarta.activation.version>
+        <cxf.jakarta.mail.version>2.1.2</cxf.jakarta.mail.version>
+        <cxf.jakarta.injectapi.version>2.0.1</cxf.jakarta.injectapi.version>
+        <cxf.jakarta.interceptorapi.version>2.1.0</cxf.jakarta.interceptorapi.version>
         <cxf.jakarta.jwsapi.version>3.0.0</cxf.jakarta.jwsapi.version>
+        <cxf.jakarta.soapapi.version>3.0.1</cxf.jakarta.soapapi.version>
+        <cxf.jakarta.wsapi.version>4.0.1</cxf.jakarta.wsapi.version>
+        <cxf.jakarta.jms.version>3.1.0</cxf.jakarta.jms.version>
+        <cxf.jakarta.transaction.version>2.0.1</cxf.jakarta.transaction.version>
+        <cxf.jakarta.ejb.version>4.0.1</cxf.jakarta.ejb.version>
+        <cxf.jakarta.resource.version>2.1.0</cxf.jakarta.resource.version>
         <cxf.jakarta.management.j2ee-api.version>1.1.4</cxf.jakarta.management.j2ee-api.version>
         <cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
         <cxf.javassist.version>3.29.2-GA</cxf.javassist.version>
+        <cxf.jakarta.annotation-api.version>2.1.1</cxf.jakarta.annotation-api.version>
+        <cxf.jakarta.ws.rs.version>3.1.0</cxf.jakarta.ws.rs.version>
         <cxf.jaxb.runtime.version>4.0.2</cxf.jaxb.runtime.version>
-        <cxf.jaxb.version>4.0.0</cxf.jaxb.version>
+        <cxf.jaxb.version>4.0.1</cxf.jaxb.version>
         <cxf.jaxb.xjc.version>${cxf.jaxb.runtime.version}</cxf.jaxb.xjc.version>
         <cxf.jaxen.version>2.0.0</cxf.jaxen.version>
         <cxf.jboss.logging.version>3.5.3.Final</cxf.jboss.logging.version>
@@ -155,6 +167,8 @@
         <cxf.jexl.version>3.3</cxf.jexl.version>
         <cxf.joda.time.version>2.10.10</cxf.joda.time.version>
         <cxf.johnzon.version>1.2.20</cxf.johnzon.version>
+        <cxf.json.api.version>2.1.3</cxf.json.api.version>
+        <cxf.json.bind-api.version>3.0.0</cxf.json.bind-api.version>
         <cxf.jsr250.api.version>1.0</cxf.jsr250.api.version>
         <cxf.junit.version>4.13.2</cxf.junit.version>
         <cxf.junit5.version>5.10.0</cxf.junit5.version>
@@ -182,6 +196,7 @@
         <cxf.opentelemetry.semconv.version>1.22.0-alpha</cxf.opentelemetry.semconv.version>
         <cxf.opentracing.version>0.33.0</cxf.opentracing.version>
         <cxf.openwebbeans.version>2.0.27</cxf.openwebbeans.version>
+        <cxf.persistence-api.version>3.1.0</cxf.persistence-api.version>
         <cxf.plexus-archiver.version>4.8.0</cxf.plexus-archiver.version>
         <cxf.plexus-utils.version>3.5.1</cxf.plexus-utils.version>
         <cxf.reactivestreams.version>1.0.4</cxf.reactivestreams.version>
@@ -193,6 +208,7 @@
         <cxf.saaj-impl.version>3.0.0</cxf.saaj-impl.version>
         <cxf.servlet-api.artifact>jakarta.servlet-api</cxf.servlet-api.artifact>
         <cxf.servlet-api.group>jakarta.servlet</cxf.servlet-api.group>
+        <cxf.servlet-api.version>6.0.0</cxf.servlet-api.version>
         <cxf.slf4j.version>2.0.9</cxf.slf4j.version>
         <cxf.snakeyaml.version>2.2</cxf.snakeyaml.version>
         <cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
@@ -208,6 +224,12 @@
         <cxf.tomcat.version>10.1.14</cxf.tomcat.version>
         <cxf.tomitribe.http.signature.version>1.8</cxf.tomitribe.http.signature.version>
         <cxf.undertow.version>2.3.5.Final</cxf.undertow.version>
+
+        <!-- the Export-Package is the same as the Maven artifact
+             version (with the Final), but we don't want an import package with a version
+             with a qualifier. We do want a range. -->
+        <cxf.validation.api.package.version>[3,4)</cxf.validation.api.package.version>
+        <cxf.validation.api.version>3.0.2</cxf.validation.api.version>
         <cxf.velocity.version>2.3</cxf.velocity.version>
         <cxf.wildfly.common.version>1.6.0.Final</cxf.wildfly.common.version>
         <cxf.wiremock.version>3.2.0</cxf.wiremock.version>
@@ -745,15 +767,27 @@
                 <artifactId>logback-classic</artifactId>
                 <version>${cxf.logback.classic.version}</version>
             </dependency>
-
             <dependency>
-                <groupId>jakarta.platform</groupId>
-                <artifactId>jakarta.jakartaee-bom</artifactId>
-                <version>${cxf.jakarta.ee.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
+                <groupId>jakarta.transaction</groupId>
+                <artifactId>jakarta.transaction-api</artifactId>
+                <version>${cxf.jakarta.transaction.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.ws.rs</groupId>
+                <artifactId>jakarta.ws.rs-api</artifactId>
+                <version>${cxf.jakarta.ws.rs.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>${cxf.jaxb.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.sun.activation</groupId>
+                        <artifactId>jakarta.activation</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
-
             <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-nodep</artifactId>
@@ -1011,6 +1045,35 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>jakarta.validation</groupId>
+                <artifactId>jakarta.validation-api</artifactId>
+                <version>${cxf.validation.api.version}</version>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.enterprise</groupId>
+                <artifactId>jakarta.enterprise.cdi-api</artifactId>
+                <version>${cxf.cdi.api.version}</version>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.inject</groupId>
+                <artifactId>jakarta.inject-api</artifactId>
+                <version>${cxf.jakarta.injectapi.version}</version>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.json</groupId>
+                <artifactId>jakarta.json-api</artifactId>
+                <version>${cxf.json.api.version}</version>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.json.bind</groupId>
+                <artifactId>jakarta.json.bind-api</artifactId>
+                <version>${cxf.json.bind-api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish</groupId>
                 <artifactId>jakarta.json</artifactId>
@@ -1571,11 +1634,43 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${cxf.jakarta.annotation-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.xml.ws</groupId>
+                <artifactId>jakarta.xml.ws-api</artifactId>
+                <version>${cxf.jakarta.wsapi.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.sun.activation</groupId>
+                        <artifactId>jakarta.activation</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>jakarta.jws</groupId>
                 <artifactId>jakarta.jws-api</artifactId>
                 <version>${cxf.jakarta.jwsapi.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.xml.soap</groupId>
+                <artifactId>jakarta.xml.soap-api</artifactId>
+                <version>${cxf.jakarta.soapapi.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.sun.activation</groupId>
+                        <artifactId>jakarta.activation</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>${cxf.servlet-api.group}</groupId>
+                <artifactId>${cxf.servlet-api.artifact}</artifactId>
+                <version>${cxf.servlet-api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.sun.xml.messaging.saaj</groupId>
                 <artifactId>saaj-impl</artifactId>
@@ -1587,11 +1682,21 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>jakarta.activation</groupId>
+                <artifactId>jakarta.activation-api</artifactId>
+                <version>${cxf.jakarta.activation.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.angus</groupId>
                 <artifactId>angus-activation</artifactId>
                 <version>${cxf.jakarta.angus.activation.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.mail</groupId>
+                <artifactId>jakarta.mail-api</artifactId>
+                <version>${cxf.jakarta.mail.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.angus</groupId>
                 <artifactId>angus-mail</artifactId>
@@ -1602,6 +1707,21 @@
                 <artifactId>jakarta.management.j2ee-api</artifactId>
                 <version>${cxf.jakarta.management.j2ee-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.jms</groupId>
+                <artifactId>jakarta.jms-api</artifactId>
+                <version>${cxf.jakarta.jms.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.resource</groupId>
+                <artifactId>jakarta.resource-api</artifactId>
+                <version>${cxf.jakarta.resource.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.ejb</groupId>
+                <artifactId>jakarta.ejb-api</artifactId>
+                <version>${cxf.jakarta.ejb.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>artemis-jakarta-server</artifactId>

diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
@@ -64,6 +64,7 @@
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
+            <version>${cxf.persistence-api.version}</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>

diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml
@@ -98,10 +98,12 @@
         <dependency>
             <groupId>jakarta.inject</groupId>
             <artifactId>jakarta.inject-api</artifactId>
+            <version>${cxf.jakarta.injectapi.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.interceptor</groupId>
             <artifactId>jakarta.interceptor-api</artifactId>
+            <version>${cxf.jakarta.interceptorapi.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.json</groupId>

diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -72,6 +72,7 @@
     <dependency>
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
+      <version>${cxf.persistence-api.version}</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
@@ -51,6 +51,7 @@
     <dependency>
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
+      <version>${cxf.persistence-api.version}</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

diff --git a/systests/microprofile/client/async/pom.xml b/systests/microprofile/client/async/pom.xml
@@ -49,6 +49,7 @@
             <dependency>
                 <groupId>jakarta.ws.rs</groupId>
                 <artifactId>jakarta.ws.rs-api</artifactId>
+                <version>${cxf.jakarta.ws.rs.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.weld.se</groupId>
@@ -78,11 +79,13 @@
             <dependency>
                 <groupId>jakarta.json.bind</groupId>
                 <artifactId>jakarta.json.bind-api</artifactId>
+                <version>${cxf.json.bind-api.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>jakarta.json</groupId>
                 <artifactId>jakarta.json-api</artifactId>
+                <version>${cxf.json.api.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

diff --git a/systests/microprofile/client/nocdi/pom.xml b/systests/microprofile/client/nocdi/pom.xml
@@ -49,6 +49,7 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>${cxf.jakarta.ws.rs.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile.rest.client</groupId>
@@ -66,11 +67,13 @@
         <dependency>
             <groupId>jakarta.json.bind</groupId>
             <artifactId>jakarta.json.bind-api</artifactId>
+            <version>${cxf.json.bind-api.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.json</groupId>
             <artifactId>jakarta.json-api</artifactId>
+            <version>${cxf.json.api.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml
@@ -206,6 +206,7 @@
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
+            <version>${cxf.persistence-api.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/tools/common/pom.xml b/tools/common/pom.xml
@@ -41,6 +41,7 @@
         <dependency>
             <groupId>jakarta.jws</groupId>
             <artifactId>jakarta.jws-api</artifactId>
+            <version>${cxf.jakarta.jwsapi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>