diff --git a/pom.xml b/pom.xml
index 8215109..0e188bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>23</version>
+    <version>24</version>
     <relativePath><!--Resolve on repository--></relativePath>
   </parent>
 
@@ -38,11 +38,10 @@
   </prerequisites>
 
   <properties>
-    <geronimo-concurrent_1.0_spec.version>1.0-alpha-1</geronimo-concurrent_1.0_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-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-jcache_1.0_spec.version>1.0-alpha-1</geronimo-jcache_1.0_spec.version>
@@ -50,38 +49,44 @@
     <geronimo-stax-api_1.2_spec.version>1.2</geronimo-stax-api_1.2_spec.version>
 
     <!-- Web Profile -->
+    <jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
+    <jakarta.authentication-api.version>2.0.0</jakarta.authentication-api.version>
+    <jakarta.ejb-api.version>4.0.0</jakarta.ejb-api.version>
+    <jakarta.el-api.version>4.0.0</jakarta.el-api.version>
+    <jakarta.enterprise.cdi-api.version>3.0.0</jakarta.enterprise.cdi-api.version>
+    <jakarta.faces-api.version>3.0.0</jakarta.faces-api.version>
+    <jakarta.inject.version>2.0.0</jakarta.inject.version>
+    <jakarta.interceptor-api.version>2.0.0</jakarta.interceptor-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.persistence-api.version>3.0.0</jakarta.persistence-api.version>
+    <jakarta.security.enterprise-api.version>2.0.0</jakarta.security.enterprise-api.version>
     <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.websocket-api.version>2.0.0</jakarta.websocket-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.authorization-api.version>2.0.0</jakarta.authorization-api.version>
+    <jakarta.batch-api.version>2.0.0</jakarta.batch-api.version>
+    <jakarta.enterprise.concurrent-api.version>2.0.0</jakarta.enterprise.concurrent-api.version>
+    <jakarta.jms-api.version>3.0.0</jakarta.jms-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>
+    <jakarta.xml.bind-api.version>3.0.1</jakarta.xml.bind-api.version>
+    <jakarta.xml.soap-api.version>2.0.1</jakarta.xml.soap-api.version>
+    <jakarta.xml.ws-api.version>3.0.1</jakarta.xml.ws-api.version>
+
+    <!-- Reproducible builds see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
+    <!-- project.build.outputTimestamp is updated by maven-release-plugin during release -->
+    <project.build.outputTimestamp>2022-02-21T09:00:00Z</project.build.outputTimestamp>
   </properties>
 
 
@@ -107,6 +112,7 @@
       </plugin>
 
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
         <version>3.1.0</version>
         <executions>
@@ -136,18 +142,21 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.6</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>jakartaee-api-libs</id>
             <phase>package</phase>
             <goals>
-              <goal>attached</goal>
+              <goal>single</goal>
             </goals>
             <configuration>
               <finalName>jakartaee-api-libs-${project.version}</finalName>
               <appendAssemblyId>false</appendAssemblyId>
-              <descriptor>src/main/assembly/jakartaee-api-libs.xml</descriptor>
+              <attach>true</attach>
+              <descriptors>
+                <descriptor>src/main/assembly/jakartaee-api-libs.xml</descriptor>
+              </descriptors>
             </configuration>
           </execution>
         </executions>
@@ -156,7 +165,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.1</version>
+        <version>3.2.4</version>
         <executions>
           <execution>
             <id>jakartaee-api-tomcat</id>
@@ -287,7 +296,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>attach-artifacts</id>
diff --git a/src/main/filtered-resources/jakartaee-api-feature.xml b/src/main/filtered-resources/jakartaee-api-feature.xml
index 4982791..843bde7 100644
--- a/src/main/filtered-resources/jakartaee-api-feature.xml
+++ b/src/main/filtered-resources/jakartaee-api-feature.xml
@@ -20,35 +20,44 @@
 <features>
   <feature name="jakartaee-api" version="${project.version}">
 
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta_1.1_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo-activation_1.1_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation_1.1_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/${geronimo-atinject_1.0_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-ejb_3.1_spec/${geronimo-ejb_3.1_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-interceptor_1.1_spec/${geronimo-interceptor_1.1_spec.version}</bundle>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.6_spec/${geronimo-j2ee-connector_1.6_spec.version}</bundle>
     <bundle>wrap:mvn:org.apache.geronimo.specs/geronimo-j2ee-deployment_1.1_spec/${geronimo-j2ee-deployment_1.1_spec.version}</bundle>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo-j2ee-management_1.1_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jacc_1.4_spec/${geronimo-jacc_1.4_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxb_2.2_spec/${geronimo-jaxb_2.2_spec.version}</bundle>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxr_1.0_spec/${geronimo-jaxr_1.0_spec.version}</bundle>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxrpc_1.1_spec/${geronimo-jaxrpc_1.1_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxrs_1.1_spec/${geronimo-jaxrs_1.1_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxws_2.2_spec/${geronimo-jaxws_2.2_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jcdi_1.0_spec/${geronimo-jcdi_1.0_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms_1.1_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa_2.0_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-saaj_1.3_spec/${geronimo-saaj_1.3_spec.version}</bundle>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-stax-api_1.2_spec/${geronimo-stax-api_1.2_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-validation_1.0_spec/${geronimo-validation_1.0_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata_2.0_spec.version}</bundle>
 
     <!-- Jakarta APIs -->
+    <bundle>wrap:mvn:jakarta.activation/jakarta.activation-api/${jakarta.activation-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.annotation/jakarta.annotation-api/${jakarta.annotation-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.authentication/jakarta.authentication-api/${jakarta.authentication-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.authorization/jakarta.authorization-api/${jakarta.authorization-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.batch/jakarta.batch-api/${jakarta.batch-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.ejb/jakarta.ejb-api/${jakarta.ejb-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.el/jakarta.el-api/${jakarta.el-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.enterprise.concurrent/jakarta.enterprise.concurrent-api/${jakarta.enterprise.concurrent-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.enterprise/jakarta.enterprise.cdi-api/${jakarta.enterprise.cdi-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.faces/jakarta.faces-api/${jakarta.faces-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.inject/jakarta.inject-api/${jakarta.inject.version}</bundle>
+    <bundle>wrap:mvn:jakarta.interceptor/jakarta.interceptor-api/${jakarta.interceptor-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.jms/jakarta.jms-api/${jakarta.jms-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.json.bind/jakarta.json.bind-api/${jakarta.json.bind-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.json/jakarta.json-api/${jakarta.json-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.jws/jakarta.jws-api/${jakarta.jws-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.mail/jakarta.mail-api/${jakarta.mail-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.persistence/jakarta.persistence-api/${jakarta.persistence-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.resource/jakarta.resource-api/${jakarta.resource-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.security.enterprise/jakarta.security.enterprise-api/${jakarta.security.enterprise-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.servlet.jsp.jstl/jakarta.servlet.jsp.jstl-api/${jakarta.servlet.jsp.jstl-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.servlet.jsp/jakarta.servlet.jsp-api/${jakarta.servlet.jsp-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.servlet/jakarta.servlet-api/${jakarta.servlet-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.transaction/jakarta.transaction-api/${jakarta.transaction-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.validation/jakarta.validation-api/${jakarta.validation-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.websocket/jakarta.websocket-api/${jakarta.websocket-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jakarta.ws.rs-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.xml.bind/jakarta.xml.bind-api/${jakarta.xml.bind-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.xml.soap/jakarta.xml.soap-api/${jakarta.xml.soap-api.version}</bundle>
+    <bundle>wrap:mvn:jakarta.xml.ws/jakarta.xml.ws-api/${jakarta.xml.ws-api.version}</bundle>
 
-    <!-- from Tomcat too -->
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet_3.0_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.2_spec/${geronimo-jsp_2.2_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-el_2.2_spec/${geronimo-el_2.2_spec.version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/${geronimo-jaspic_1.0_spec.version}</bundle>
   </feature>
 </features>