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/02/15 10:04:31 UTC

[tomee-jakartaee-api] branch master updated: Use all jakarta deps

This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakartaee-api.git


The following commit(s) were added to refs/heads/master by this push:
     new 620c98d  Use all jakarta deps
620c98d is described below

commit 620c98d5786019b782bd42206c4f6a99deb43b0d
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Tue Feb 15 11:04:19 2022 +0100

    Use all jakarta deps
---
 pom.xml | 561 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 310 insertions(+), 251 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd3b008..aefff0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,38 +38,50 @@
   </prerequisites>
 
   <properties>
-    <geronimo-annotation_1.3_spec.version>1.3</geronimo-annotation_1.3_spec.version>
-    <geronimo-atinject_1.0_spec.version>1.2</geronimo-atinject_1.0_spec.version>
     <geronimo-concurrent_1.0_spec.version>1.0-alpha-1</geronimo-concurrent_1.0_spec.version>
-    <geronimo-ejb_3.2_spec.version>1.0-alpha-1</geronimo-ejb_3.2_spec.version>
     <geronimo-j2ee-connector_1.6_spec.version>1.0</geronimo-j2ee-connector_1.6_spec.version>
     <geronimo-j2ee-deployment_1.1_spec.version>1.1</geronimo-j2ee-deployment_1.1_spec.version>
     <geronimo-j2ee-management_1.1_spec.version>1.0.1</geronimo-j2ee-management_1.1_spec.version>
-    <geronimo-jacc_1.4_spec.version>1.0</geronimo-jacc_1.4_spec.version>
     <geronimo-jaxb_2.2_spec.version>1.0.1</geronimo-jaxb_2.2_spec.version>
     <geronimo-jaxr_1.0_spec.version>2.1</geronimo-jaxr_1.0_spec.version>
     <geronimo-jaxrpc_1.1_spec.version>2.1</geronimo-jaxrpc_1.1_spec.version>
-    <geronimo-jaxrs_2.1_spec.version>1.1</geronimo-jaxrs_2.1_spec.version>
-    <geronimo-jaxws_2.2_spec.version>1.2</geronimo-jaxws_2.2_spec.version>
-    <geronimo-jbatch_1.0_spec.version>1.1</geronimo-jbatch_1.0_spec.version>
     <geronimo-jcache_1.0_spec.version>1.0-alpha-1</geronimo-jcache_1.0_spec.version>
-    <geronimo-jcdi_2.0_spec.version>1.3</geronimo-jcdi_2.0_spec.version>
-    <geronimo-jms_2.0_spec.version>1.0-alpha-2</geronimo-jms_2.0_spec.version>
-    <geronimo-jpa_2.2_spec.version>1.1</geronimo-jpa_2.2_spec.version>
-    <geronimo-json_1.1_spec.version>1.5</geronimo-json_1.1_spec.version>
-    <geronimo-jsonb_1.0_spec.version>1.4</geronimo-jsonb_1.0_spec.version>
-    <geronimo-jta_1.2_spec.version>1.0-alpha-1</geronimo-jta_1.2_spec.version>
     <geronimo-osgi.version>1.1</geronimo-osgi.version>
-    <geronimo-saaj_1.3_spec.version>1.1</geronimo-saaj_1.3_spec.version>
-    <geronimo-security_1.0_spec.version>1.1</geronimo-security_1.0_spec.version>
     <geronimo-stax-api_1.2_spec.version>1.2</geronimo-stax-api_1.2_spec.version>
-    <geronimo-validation_2.0_spec.version>1.1</geronimo-validation_2.0_spec.version>
-    <geronimo-ws-metadata_2.0_spec.version>1.1.3</geronimo-ws-metadata_2.0_spec.version>
-    <geronimo-interceptor_1.2_spec.version>1.2</geronimo-interceptor_1.2_spec.version>
-    <jakarta.enterprise.cdi-api.version>3.0.0</jakarta.enterprise.cdi-api.version>
 
-    <!-- We use servlet, jsp, jaspic, websocket, el straight from Tomcat APIs -->
-    <tomcat.version>10.0.16</tomcat.version>
+    <!-- Web Profile -->
+    <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
+    <jakarta.servlet.jsp-api.version>3.0.0</jakarta.servlet.jsp-api.version>
+    <jakarta.servlet.jsp.jstl-api.version>2.0.0</jakarta.servlet.jsp.jstl-api.version>
+    <jakarta.faces-api.version>3.0.0</jakarta.faces-api.version>
+    <jakarta.el-api.version>4.0.0</jakarta.el-api.version>
+    <jakarta.websocket-api.version>2.0.0</jakarta.websocket-api.version>
+    <jakarta.json-api.version>2.0.1</jakarta.json-api.version>
+    <jakarta.json.bind-api.version>2.0.0</jakarta.json.bind-api.version>
+    <jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
+    <jakarta.ejb-api.version>4.0.0</jakarta.ejb-api.version>
+    <jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
+    <jakarta.persistence-api.version>3.0.0</jakarta.persistence-api.version>
+    <jakarta.validation-api.version>3.0.0</jakarta.validation-api.version>
+    <jakarta.interceptor-api.version>2.0.0</jakarta.interceptor-api.version>
+    <jakarta.enterprise.cdi-api.version>3.0.0</jakarta.enterprise.cdi-api.version>
+    <jakarta.inject.version>2.0.0</jakarta.inject.version>
+    <jakarta.authentication-api.version>2.0.0</jakarta.authentication-api.version>
+    <jakarta.security.enterprise-api.version>2.0.0</jakarta.security.enterprise-api.version>
+    <jakarta.ws.rs-api.version>3.0.0</jakarta.ws.rs-api.version>
+    <!--  Full platform -->
+    <jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
+    <jakarta.activation-api.version>2.0.1</jakarta.activation-api.version>
+    <jakarta.mail-api.version>2.0.1</jakarta.mail-api.version>
+    <jakarta.resource-api.version>2.0.0</jakarta.resource-api.version>
+    <jakarta.authorization-api.version>2.0.0</jakarta.authorization-api.version>
+    <jakarta.enterprise.concurrent-api.version>2.0.0</jakarta.enterprise.concurrent-api.version>
+    <jakarta.batch-api.version>2.0.0</jakarta.batch-api.version>
+    <!-- Optional APIs -->
+    <jakarta.xml.bind-api.version>3.0.1</jakarta.xml.bind-api.version>
+    <jakarta.xml.ws-api.version>3.0.1</jakarta.xml.ws-api.version>
+    <jakarta.xml.soap-api.version>2.0.1</jakarta.xml.soap-api.version>
+    <jakarta.jws-api.version>3.0.0</jakarta.jws-api.version>
   </properties>
 
 
@@ -299,202 +311,206 @@
     </plugins>
   </build>
 
+  <dependencyManagement>
+    <dependencies>
+      <!-- This makes it possible to then import only the dependencies without caring about the versions -->
+      <dependency>
+        <groupId>jakarta.platform</groupId>
+        <artifactId>jakarta.jakartaee-bom</artifactId>
+        <version>9.1.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
 
+    <!-- Web Profile -->
     <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>4.2.0</version>
-      <scope>provided</scope>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>${jakarta.servlet-api.version}</version>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jcache_1.0_spec</artifactId>
-      <version>${geronimo-jcache_1.0_spec.version}</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>${jakarta.servlet-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jcache_1.0_spec</artifactId>
-      <version>${geronimo-jcache_1.0_spec.version}</version>
-      <optional>true</optional>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <version>${jakarta.servlet.jsp-api.version}</version>
     </dependency>
-
     <dependency>
-      <groupId>jakarta.security.enterprise</groupId>
-      <artifactId>jakarta.security.enterprise-api</artifactId>
-      <version>2.0.0</version>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <version>${jakarta.servlet.jsp-api.version}</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>jakarta.security.enterprise</groupId>
-      <artifactId>jakarta.security.enterprise-api</artifactId>
-      <version>2.0.0</version>
+      <groupId>jakarta.el</groupId>
+      <artifactId>jakarta.el-api</artifactId>
+      <version>${jakarta.el-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.el</groupId>
+      <artifactId>jakarta.el-api</artifactId>
+      <version>${jakarta.el-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
-
     <dependency>
-      <groupId>jakarta.annotation</groupId>
-      <artifactId>jakarta.annotation-api</artifactId>
-      <version>2.0.0</version>
-      <optional>true</optional>
+      <groupId>jakarta.servlet.jsp.jstl</groupId>
+      <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+      <version>${jakarta.servlet.jsp.jstl-api.version}</version>
     </dependency>
     <dependency>
-      <groupId>jakarta.annotation</groupId>
-      <artifactId>jakarta.annotation-api</artifactId>
-      <version>2.0.0</version>
+      <groupId>jakarta.servlet.jsp.jstl</groupId>
+      <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+      <version>${jakarta.servlet.jsp.jstl-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-atinject_1.0_spec</artifactId>
-      <version>${geronimo-atinject_1.0_spec.version}</version>
-      <classifier>sources</classifier>
-      <optional>true</optional>
+      <groupId>jakarta.faces</groupId>
+      <artifactId>jakarta.faces-api</artifactId>
+      <version>${jakarta.faces-api.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-atinject_1.0_spec</artifactId>
-      <version>${geronimo-atinject_1.0_spec.version}</version>
+      <groupId>jakarta.faces</groupId>
+      <artifactId>jakarta.faces-api</artifactId>
+      <version>${jakarta.faces-api.version}</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
-
     <dependency>
-      <groupId>jakarta.ejb</groupId>
-      <artifactId>jakarta.ejb-api</artifactId>
-      <version>4.0.0</version>
-      <optional>true</optional>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
+      <version>${jakarta.ws.rs-api.version}</version>
     </dependency>
     <dependency>
-      <groupId>jakarta.ejb</groupId>
-      <artifactId>jakarta.ejb-api</artifactId>
-      <version>4.0.0</version>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
+      <version>${jakarta.ws.rs-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
-
     <dependency>
-      <groupId>jakarta.resource</groupId>
-      <artifactId>jakarta.resource-api</artifactId>
-      <version>2.0.0</version>
-      <optional>true</optional>
+      <groupId>jakarta.websocket</groupId>
+      <artifactId>jakarta.websocket-api</artifactId>
+      <version>${jakarta.websocket-api.version}</version>
     </dependency>
     <dependency>
-      <groupId>jakarta.resource</groupId>
-      <artifactId>jakarta.resource-api</artifactId>
-      <version>2.0.0</version>
+      <groupId>jakarta.websocket</groupId>
+      <artifactId>jakarta.websocket-api</artifactId>
+      <version>${jakarta.websocket-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-      <version>${geronimo-j2ee-deployment_1.1_spec.version}</version>
+      <groupId>jakarta.json</groupId>
+      <artifactId>jakarta.json-api</artifactId>
+      <version>${jakarta.json-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.json</groupId>
+      <artifactId>jakarta.json-api</artifactId>
+      <version>${jakarta.json-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-      <version>${geronimo-j2ee-deployment_1.1_spec.version}</version>
-      <optional>true</optional>
+      <groupId>jakarta.json.bind</groupId>
+      <artifactId>jakarta.json.bind-api</artifactId>
+      <version>${jakarta.json.bind-api.version}</version>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-      <version>${geronimo-j2ee-management_1.1_spec.version}</version>
+      <groupId>jakarta.json.bind</groupId>
+      <artifactId>jakarta.json.bind-api</artifactId>
+      <version>${jakarta.json.bind-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-      <version>${geronimo-j2ee-management_1.1_spec.version}</version>
-      <optional>true</optional>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>${jakarta.annotation-api.version}</version>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jacc_1.4_spec</artifactId>
-      <version>${geronimo-jacc_1.4_spec.version}</version>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>${jakarta.annotation-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jacc_1.4_spec</artifactId>
-      <version>${geronimo-jacc_1.4_spec.version}</version>
-      <optional>true</optional>
+      <groupId>jakarta.ejb</groupId>
+      <artifactId>jakarta.ejb-api</artifactId>
+      <version>${jakarta.ejb-api.version}</version>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxr_1.0_spec</artifactId>
-      <version>${geronimo-jaxr_1.0_spec.version}</version>
+      <groupId>jakarta.ejb</groupId>
+      <artifactId>jakarta.ejb-api</artifactId>
+      <version>${jakarta.ejb-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxr_1.0_spec</artifactId>
-      <version>${geronimo-jaxr_1.0_spec.version}</version>
-      <optional>true</optional>
+      <groupId>jakarta.transaction</groupId>
+      <artifactId>jakarta.transaction-api</artifactId>
+      <version>${jakarta.transaction-api.version}</version>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-      <version>${geronimo-jaxrpc_1.1_spec.version}</version>
+      <groupId>jakarta.transaction</groupId>
+      <artifactId>jakarta.transaction-api</artifactId>
+      <version>${jakarta.transaction-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-      <version>${geronimo-jaxrpc_1.1_spec.version}</version>
-      <optional>true</optional>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
+      <version>${jakarta.persistence-api.version}</version>
     </dependency>
-
     <dependency>
-      <groupId>jakarta.ws.rs</groupId>
-      <artifactId>jakarta.ws.rs-api</artifactId>
-      <version>3.0.0</version>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
+      <version>${jakarta.persistence-api.version}</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>jakarta.ws.rs</groupId>
-      <artifactId>jakarta.ws.rs-api</artifactId>
-      <version>3.0.0</version>
-      <classifier>sources</classifier>
-      <optional>true</optional>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>${jakarta.validation-api.version}</version>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-      <version>${geronimo-jaxws_2.2_spec.version}</version>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>${jakarta.validation-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-      <version>${geronimo-jaxws_2.2_spec.version}</version>
+      <groupId>jakarta.interceptor</groupId>
+      <artifactId>jakarta.interceptor-api</artifactId>
+      <version>${jakarta.interceptor-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.interceptor</groupId>
+      <artifactId>jakarta.interceptor-api</artifactId>
+      <version>${jakarta.interceptor-api.version}</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
-    
     <dependency>
       <groupId>jakarta.enterprise</groupId>
       <artifactId>jakarta.enterprise.cdi-api</artifactId>
       <version>${jakarta.enterprise.cdi-api.version}</version>
-      <optional>true</optional>
       <exclusions>
         <exclusion>
           <groupId>jakarta.inject</groupId>
@@ -515,245 +531,288 @@
         </exclusion>
       </exclusions>
     </dependency>
-
     <dependency>
-      <groupId>jakarta.jms</groupId>
-      <artifactId>jakarta.jms-api</artifactId>
-      <version>3.0.0</version>
-      <optional>true</optional>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+      <version>${jakarta.inject.version}</version>
     </dependency>
     <dependency>
-      <groupId>jakarta.jms</groupId>
-      <artifactId>jakarta.jms-api</artifactId>
-      <version>3.0.0</version>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+      <version>${jakarta.inject.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
-
     <dependency>
-      <groupId>jakarta.persistence</groupId>
-      <artifactId>jakarta.persistence-api</artifactId>
-      <version>3.0.0</version>
+      <groupId>jakarta.authentication</groupId>
+      <artifactId>jakarta.authentication-api</artifactId>
+      <version>${jakarta.authentication-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.authentication</groupId>
+      <artifactId>jakarta.authentication-api</artifactId>
+      <version>${jakarta.authentication-api.version}</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>jakarta.persistence</groupId>
-      <artifactId>jakarta.persistence-api</artifactId>
-      <version>3.0.0</version>
+      <groupId>jakarta.security.enterprise</groupId>
+      <artifactId>jakarta.security.enterprise-api</artifactId>
+      <version>${jakarta.security.enterprise-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.security.enterprise</groupId>
+      <artifactId>jakarta.security.enterprise-api</artifactId>
+      <version>${jakarta.security.enterprise-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
 
+    <!-- Full Platform -->
     <dependency>
-      <groupId>jakarta.transaction</groupId>
-      <artifactId>jakarta.transaction-api</artifactId>
-      <version>2.0.0</version>
+      <groupId>jakarta.jms</groupId>
+      <artifactId>jakarta.jms-api</artifactId>
+      <version>${jakarta.jms-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.jms</groupId>
+      <artifactId>jakarta.jms-api</artifactId>
+      <version>${jakarta.jms-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>jakarta.transaction</groupId>
-      <artifactId>jakarta.transaction-api</artifactId>
-      <version>2.0.0</version>
-      <optional>true</optional>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <version>${jakarta.activation-api.version}</version>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-saaj_1.3_spec</artifactId>
-      <version>${geronimo-saaj_1.3_spec.version}</version>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <version>${jakarta.activation-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-saaj_1.3_spec</artifactId>
-      <version>${geronimo-saaj_1.3_spec.version}</version>
-      <optional>true</optional>
+      <groupId>jakarta.mail</groupId>
+      <artifactId>jakarta.mail-api</artifactId>
+      <version>${jakarta.mail-api.version}</version>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-      <version>${geronimo-stax-api_1.2_spec.version}</version>
+      <groupId>jakarta.mail</groupId>
+      <artifactId>jakarta.mail-api</artifactId>
+      <version>${jakarta.mail-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
+    <!-- we use Geronimo here because there is an implementation part
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-      <version>${geronimo-stax-api_1.2_spec.version}</version>
-      <optional>true</optional>
+      <groupId>com.sun.mail</groupId>
+      <artifactId>jakarta.mail</artifactId>
+      <version>${jakarta.mail-api.version}</version>
     </dependency>
-
+    -->
     <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
-      <version>3.0.0</version>
-      <optional>true</optional>
+      <groupId>jakarta.resource</groupId>
+      <artifactId>jakarta.resource-api</artifactId>
+      <version>${jakarta.resource-api.version}</version>
     </dependency>
     <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
-      <version>3.0.0</version>
+      <groupId>jakarta.resource</groupId>
+      <artifactId>jakarta.resource-api</artifactId>
+      <version>${jakarta.resource-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-      <version>${geronimo-ws-metadata_2.0_spec.version}</version>
+      <groupId>jakarta.authorization</groupId>
+      <artifactId>jakarta.authorization-api</artifactId>
+      <version>${jakarta.authorization-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.authorization</groupId>
+      <artifactId>jakarta.authorization-api</artifactId>
+      <version>${jakarta.authorization-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-      <version>${geronimo-ws-metadata_2.0_spec.version}</version>
-      <optional>true</optional>
+      <groupId>jakarta.enterprise.concurrent</groupId>
+      <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+      <version>${jakarta.enterprise.concurrent-api.version}</version>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-osgi-locator</artifactId>
-      <version>${geronimo-osgi.version}</version>
+      <groupId>jakarta.enterprise.concurrent</groupId>
+      <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+      <version>${jakarta.enterprise.concurrent-api.version}</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-osgi-locator</artifactId>
-      <version>${geronimo-osgi.version}</version>
+      <groupId>jakarta.batch</groupId>
+      <artifactId>jakarta.batch-api</artifactId>
+      <version>${jakarta.batch-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.batch</groupId>
+      <artifactId>jakarta.batch-api</artifactId>
+      <version>${jakarta.batch-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
 
+    <!-- Optional APIs -->
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jbatch_1.0_spec</artifactId>
-      <version>${geronimo-jbatch_1.0_spec.version}</version>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>${jakarta.xml.bind-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>${jakarta.xml.bind-api.version}</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jbatch_1.0_spec</artifactId>
-      <version>${geronimo-jbatch_1.0_spec.version}</version>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <version>${jakarta.xml.ws-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <version>${jakarta.xml.ws-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
-
     <dependency>
-      <groupId>jakarta.json</groupId>
-      <artifactId>jakarta.json-api</artifactId>
-      <version>2.0.0</version>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+      <version>${jakarta.jws-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+      <version>${jakarta.jws-api.version}</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>jakarta.json</groupId>
-      <artifactId>jakarta.json-api</artifactId>
-      <version>2.0.0</version>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+      <version>${jakarta.xml.soap-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+      <version>${jakarta.xml.soap-api.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
 
     <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>4.2.0</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jsonb_1.0_spec</artifactId>
-      <version>${geronimo-jsonb_1.0_spec.version}</version>
+      <artifactId>geronimo-jcache_1.0_spec</artifactId>
+      <version>${geronimo-jcache_1.0_spec.version}</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jsonb_1.0_spec</artifactId>
-      <version>${geronimo-jsonb_1.0_spec.version}</version>
-      <classifier>sources</classifier>
+      <artifactId>geronimo-jcache_1.0_spec</artifactId>
+      <version>${geronimo-jcache_1.0_spec.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>jakarta.enterprise.concurrent</groupId>
-      <artifactId>jakarta.enterprise.concurrent-api</artifactId>
-      <version>2.0.0</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+      <version>${geronimo-j2ee-deployment_1.1_spec.version}</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>jakarta.enterprise.concurrent</groupId>
-      <artifactId>jakarta.enterprise.concurrent-api</artifactId>
-      <version>2.0.0</version>
-      <classifier>sources</classifier>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+      <version>${geronimo-j2ee-deployment_1.1_spec.version}</version>
       <optional>true</optional>
     </dependency>
 
-    <!-- Jakarta APIs -->
-
-    <!-- APIs from Tomcat -->
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-websocket-api</artifactId>
-      <version>${tomcat.version}</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+      <version>${geronimo-j2ee-management_1.1_spec.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-websocket-api</artifactId>
-      <version>${tomcat.version}</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+      <version>${geronimo-j2ee-management_1.1_spec.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-servlet-api</artifactId>
-      <version>${tomcat.version}</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+      <version>${geronimo-jaxr_1.0_spec.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-servlet-api</artifactId>
-      <version>${tomcat.version}</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+      <version>${geronimo-jaxr_1.0_spec.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-jaspic-api</artifactId>
-      <version>${tomcat.version}</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+      <version>${geronimo-jaxrpc_1.1_spec.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-jaspic-api</artifactId>
-      <version>${tomcat.version}</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+      <version>${geronimo-jaxrpc_1.1_spec.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-jsp-api</artifactId>
-      <version>${tomcat.version}</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+      <version>${geronimo-stax-api_1.2_spec.version}</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-jsp-api</artifactId>
-      <version>${tomcat.version}</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+      <version>${geronimo-stax-api_1.2_spec.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-el-api</artifactId>
-      <version>${tomcat.version}</version>
-      <classifier>sources</classifier>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-osgi-locator</artifactId>
+      <version>${geronimo-osgi.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-el-api</artifactId>
-      <version>${tomcat.version}</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-osgi-locator</artifactId>
+      <version>${geronimo-osgi.version}</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>