diff --git a/pom.xml b/pom.xml
index bdf8320..cd3b008 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,23 +27,16 @@
   </parent>
 
   <groupId>org.apache.tomee</groupId>
-  <artifactId>javaee-api</artifactId>
-  <version>8.0-6-SNAPSHOT</version>
+  <artifactId>jakartaee-api</artifactId>
+  <version>9.1.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>TomEE :: JavaEE 8 Full API</name>
+  <name>Apache TomEE :: Jakarta EE 9 Full API</name>
 
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
 
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/tomee/javaee-api/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomee/javaee-api/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/tomee/javaee-api/trunk</url>
-  </scm>
-
   <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>
@@ -73,9 +66,10 @@
     <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>9.0.39</tomcat.version>
+    <tomcat.version>10.0.16</tomcat.version>
   </properties>
 
 
@@ -133,15 +127,15 @@
         <version>2.6</version>
         <executions>
           <execution>
-            <id>javaee-api-libs</id>
+            <id>jakartaee-api-libs</id>
             <phase>package</phase>
             <goals>
               <goal>attached</goal>
             </goals>
             <configuration>
-              <finalName>javaee-api-libs-${project.version}</finalName>
+              <finalName>jakartaee-api-libs-${project.version}</finalName>
               <appendAssemblyId>false</appendAssemblyId>
-              <descriptor>src/main/assembly/javaee-api-libs.xml</descriptor>
+              <descriptor>src/main/assembly/jakartaee-api-libs.xml</descriptor>
             </configuration>
           </execution>
         </executions>
@@ -153,7 +147,7 @@
         <version>3.2.1</version>
         <executions>
           <execution>
-            <id>javaee-api-tomcat</id>
+            <id>jakartaee-api-tomcat</id>
             <phase>package</phase>
             <goals>
               <goal>shade</goal>
@@ -191,11 +185,11 @@
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <manifestEntries>
                     <Export-Package>
-                      javax.xml,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.spi,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.soap,javax.xml.namespace,javax.xml.registry,javax.xml.registry.infomodel,javax.xml.rpc,javax.xml.rpc.encoding,javax.xml.rpc.handler,javax.xml.rpc.handler.soap,javax.xml.rpc.holders,javax.xml.rpc.server,javax.xml.rpc.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.annotation,javax.annotation.security,javax.ejb,javax.ejb.spi,javax.interceptor,javax.resource,javax.resource.cci,javax.resource.spi,javax.resource.spi.endpoint,javax.resource.spi.security,javax.resource.spi.work,javax.enterprise,javax.enterprise.deploy,javax.enterprise.deploy.model,javax.enterprise.deploy.model.exceptions,javax.enterprise.deploy.shared,javax.enterprise.deploy.shared.factories,javax.enterprise.deploy.spi,javax.enterprise.deploy.spi.exceptions,javax.enterprise.deploy.spi.factories,javax.enterprise.deploy.spi.status,javax.management,javax.management.j2ee,javax.management.j2ee.statistics,javax.security,javax.security.jacc,javax.jms,javax.persistence,javax.persistence.spi,javax.transaction,javax.transaction.xa,javax.jws,javax.jws.soap
+                      jakarta.xml,jakarta.xml.ws,jakarta.xml.ws.handler,jakarta.xml.ws.handler.soap,jakarta.xml.ws.spi,jakarta.xml.ws.http,jakarta.xml.ws.soap,jakarta.xml.soap,jakarta.xml.namespace,jakarta.xml.registry,jakarta.xml.registry.infomodel,jakarta.xml.rpc,jakarta.xml.rpc.encoding,jakarta.xml.rpc.handler,jakarta.xml.rpc.handler.soap,jakarta.xml.rpc.holders,jakarta.xml.rpc.server,jakarta.xml.rpc.soap,jakarta.xml.stream,jakarta.xml.stream.events,jakarta.xml.stream.util,jakarta.xml.bind,jakarta.xml.bind.annotation,jakarta.xml.bind.annotation.adapters,jakarta.xml.bind.attachment,jakarta.xml.bind.helpers,jakarta.xml.bind.util,jakarta.annotation,jakarta.annotation.security,jakarta.ejb,jakarta.ejb.spi,jakarta.interceptor,jakarta.resource,jakarta.resource.cci,jakarta.resource.spi,jakarta.resource.spi.endpoint,jakarta.resource.spi.security,jakarta.resource.spi.work,jakarta.enterprise,jakarta.enterprise.deploy,jakarta.enterprise.deploy.model,jakarta.enterprise.deploy.model.exceptions,jakarta.enterprise.deploy.shared,jakarta.enterprise.deploy.shared.factories,jakarta.enterprise.deploy.spi,jakarta.enterprise.deploy.spi.exceptions,jakarta.enterprise.deploy.spi.factories,jakarta.enterprise.deploy.spi.status,jakarta.management,jakarta.management.j2ee,jakarta.management.j2ee.statistics,jakarta.security,jakarta.security.jacc,jakarta.jms,jakarta.persistence,jakarta.persistence.spi,jakarta.transaction,jakarta.transaction.xa,jakarta.jws,jakarta.jws.soap
                     </Export-Package>
                     <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional</Import-Package>
                     <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
-                    <Bundle-Activator>org.apache.openejb.javaee.api.activator.MultiActivator</Bundle-Activator>
+                    <Bundle-Activator>org.apache.tomee.jakartaee.api.activator.MultiActivator</Bundle-Activator>
                     <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                     <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
                     <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton=true</Bundle-SymbolicName>
@@ -214,7 +208,7 @@
             </configuration>
           </execution>
           <execution>
-            <id>javaee-api</id>
+            <id>jakartaee-api</id>
             <phase>package</phase>
             <goals>
               <goal>shade</goal>
@@ -230,7 +224,7 @@
               </artifactSet>
               <filters>
                 <filter>
-                  <artifact>org.apache.geronimo.specs:*</artifact>
+                  <artifact>jakarta:*</artifact>
                   <excludes>
                     <exclude>META-INF/*.txt</exclude>
                     <exclude>META-INF/LICENSE</exclude>
@@ -250,12 +244,12 @@
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <manifestEntries>
                     <Export-Package>
-                      javax.xml,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.spi,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.soap,javax.xml.namespace,javax.xml.registry,javax.xml.registry.infomodel,javax.xml.rpc,javax.xml.rpc.encoding,javax.xml.rpc.handler,javax.xml.rpc.handler.soap,javax.xml.rpc.holders,javax.xml.rpc.server,javax.xml.rpc.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.activation,javax.annotation,javax.annotation.security,javax.ejb,javax.ejb.spi,javax.interceptor,javax.resource,javax.resource.cci,javax.resource.spi,javax.resource.spi.endpoint,javax.resource.spi.security,javax.resource.spi.work,javax.enterprise,javax.enterprise.deploy,javax.enterprise.deploy.model,javax.enterprise.deploy.model.exceptions,javax.enterprise.deploy.shared,javax.enterprise.deploy.shared.factories,javax.enterprise.deploy.spi,javax.enterprise.deploy.spi.exceptions,javax.enterprise.deploy.spi.factories,javax.enterprise.deploy.spi.status,javax.management,javax.management.j2ee,javax.management.j2ee.statistics,javax.security,javax.security.jacc,javax.jms,javax.persistence,javax.persistence.spi,javax.transaction,javax.transaction.xa,javax.servlet,javax.servlet.http,javax.servlet.resources,javax.jws,javax.ws.rs,javax.jws.soap
+                      jakarta.xml,jakarta.xml.ws,jakarta.xml.ws.handler,jakarta.xml.ws.handler.soap,jakarta.xml.ws.spi,jakarta.xml.ws.http,jakarta.xml.ws.soap,jakarta.xml.soap,jakarta.xml.namespace,jakarta.xml.registry,jakarta.xml.registry.infomodel,jakarta.xml.rpc,jakarta.xml.rpc.encoding,jakarta.xml.rpc.handler,jakarta.xml.rpc.handler.soap,jakarta.xml.rpc.holders,jakarta.xml.rpc.server,jakarta.xml.rpc.soap,jakarta.xml.stream,jakarta.xml.stream.events,jakarta.xml.stream.util,jakarta.xml.bind,jakarta.xml.bind.annotation,jakarta.xml.bind.annotation.adapters,jakarta.xml.bind.attachment,jakarta.xml.bind.helpers,jakarta.xml.bind.util,jakarta.activation,jakarta.annotation,jakarta.annotation.security,jakarta.ejb,jakarta.ejb.spi,jakarta.interceptor,jakarta.resource,jakarta.resource.cci,jakarta.resource.spi,jakarta.resource.spi.endpoint,jakarta.resource.spi.security,jakarta.resource.spi.work,jakarta.enterprise,jakarta.enterprise.deploy,jakarta.enterprise.deploy.model,jakarta.enterprise.deploy.model.exceptions,jakarta.enterprise.deploy.shared,jakarta.enterprise.deploy.shared.factories,jakarta.enterprise.deploy.spi,jakarta.enterprise.deploy.spi.exceptions,jakarta.enterprise.deploy.spi.factories,jakarta.enterprise.deploy.spi.status,jakarta.management,jakarta.management.j2ee,jakarta.management.j2ee.statistics,jakarta.security,jakarta.security.jacc,jakarta.jms,jakarta.persistence,jakarta.persistence.spi,jakarta.transaction,jakarta.transaction.xa,jakarta.servlet,jakarta.servlet.http,jakarta.servlet.resources,jakarta.jws,jakarta.ws.rs,jakarta.jws.soap
                     </Export-Package>
                     <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional</Import-Package>
-                    <Private-Package>org.apache.openejb.javaee.api.activator,org.apache.geronimo.osgi.locator
+                    <Private-Package>org.apache.tomee.jakartaee.api.activator,org.apache.geronimo.osgi.locator
                     </Private-Package>
-                    <Bundle-Activator>org.apache.openejb.javaee.api.activator.MultiActivator</Bundle-Activator>
+                    <Bundle-Activator>org.apache.tomee.jakartaee.api.activator.MultiActivator</Bundle-Activator>
                     <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                     <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
                     <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton=true</Bundle-SymbolicName>
@@ -292,7 +286,7 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>target/classes/javaee-api-feature.xml</file>
+                  <file>target/classes/jakartaee-api-feature.xml</file>
                   <type>xml</type>
                   <classifier>features</classifier>
                 </artifact>
@@ -329,30 +323,30 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-security_1.0_spec</artifactId>
-      <version>${geronimo-security_1.0_spec.version}</version>
-      <classifier>sources</classifier>
+      <groupId>jakarta.security.enterprise</groupId>
+      <artifactId>jakarta.security.enterprise-api</artifactId>
+      <version>2.0.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-security_1.0_spec</artifactId>
-      <version>${geronimo-security_1.0_spec.version}</version>
+      <groupId>jakarta.security.enterprise</groupId>
+      <artifactId>jakarta.security.enterprise-api</artifactId>
+      <version>2.0.0</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.3_spec</artifactId>
-      <version>${geronimo-annotation_1.3_spec.version}</version>
-      <classifier>sources</classifier>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>2.0.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.3_spec</artifactId>
-      <version>${geronimo-annotation_1.3_spec.version}</version>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>2.0.0</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
 
@@ -371,46 +365,32 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ejb_3.2_spec</artifactId>
-      <version>${geronimo-ejb_3.2_spec.version}</version>
-      <classifier>sources</classifier>
+      <groupId>jakarta.ejb</groupId>
+      <artifactId>jakarta.ejb-api</artifactId>
+      <version>4.0.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ejb_3.2_spec</artifactId>
-      <version>${geronimo-ejb_3.2_spec.version}</version>
+      <groupId>jakarta.ejb</groupId>
+      <artifactId>jakarta.ejb-api</artifactId>
+      <version>4.0.0</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-interceptor_1.2_spec</artifactId>
-      <version>${geronimo-interceptor_1.2_spec.version}</version>
+      <groupId>jakarta.resource</groupId>
+      <artifactId>jakarta.resource-api</artifactId>
+      <version>2.0.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.resource</groupId>
+      <artifactId>jakarta.resource-api</artifactId>
+      <version>2.0.0</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-interceptor_1.2_spec</artifactId>
-      <version>${geronimo-interceptor_1.2_spec.version}</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
-      <version>${geronimo-j2ee-connector_1.6_spec.version}</version>
-      <classifier>sources</classifier>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
-      <version>${geronimo-j2ee-connector_1.6_spec.version}</version>
-      <optional>true</optional>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -483,16 +463,16 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxrs_2.1_spec</artifactId>
-      <version>${geronimo-jaxrs_2.1_spec.version}</version>
-      <classifier>sources</classifier>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
+      <version>3.0.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxrs_2.1_spec</artifactId>
-      <version>${geronimo-jaxrs_2.1_spec.version}</version>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
+      <version>3.0.0</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
 
@@ -509,60 +489,72 @@
       <version>${geronimo-jaxws_2.2_spec.version}</version>
       <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>
+          <artifactId>jakarta.inject-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.enterprise</groupId>
+      <artifactId>jakarta.enterprise.cdi-api</artifactId>
+      <version>${jakarta.enterprise.cdi-api.version}</version>
+      <classifier>sources</classifier>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>jakarta.inject</groupId>
+          <artifactId>jakarta.inject-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jcdi_2.0_spec</artifactId>
-      <version>${geronimo-jcdi_2.0_spec.version}</version>
-      <classifier>sources</classifier>
+      <groupId>jakarta.jms</groupId>
+      <artifactId>jakarta.jms-api</artifactId>
+      <version>3.0.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jcdi_2.0_spec</artifactId>
-      <version>${geronimo-jcdi_2.0_spec.version}</version>
+      <groupId>jakarta.jms</groupId>
+      <artifactId>jakarta.jms-api</artifactId>
+      <version>3.0.0</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_2.0_spec</artifactId>
-      <version>${geronimo-jms_2.0_spec.version}</version>
-      <classifier>sources</classifier>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
+      <version>3.0.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_2.0_spec</artifactId>
-      <version>${geronimo-jms_2.0_spec.version}</version>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
+      <version>3.0.0</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jpa_2.2_spec</artifactId>
-      <version>${geronimo-jpa_2.2_spec.version}</version>
+      <groupId>jakarta.transaction</groupId>
+      <artifactId>jakarta.transaction-api</artifactId>
+      <version>2.0.0</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jpa_2.2_spec</artifactId>
-      <version>${geronimo-jpa_2.2_spec.version}</version>
-      <optional>false</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.2_spec</artifactId>
-      <version>${geronimo-jta_1.2_spec.version}</version>
-      <classifier>sources</classifier>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.2_spec</artifactId>
-      <version>${geronimo-jta_1.2_spec.version}</version>
+      <groupId>jakarta.transaction</groupId>
+      <artifactId>jakarta.transaction-api</artifactId>
+      <version>2.0.0</version>
       <optional>true</optional>
     </dependency>
 
@@ -595,16 +587,16 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-validation_2.0_spec</artifactId>
-      <version>${geronimo-validation_2.0_spec.version}</version>
-      <classifier>sources</classifier>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>3.0.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-validation_2.0_spec</artifactId>
-      <version>${geronimo-validation_2.0_spec.version}</version>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>3.0.0</version>
+      <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
 
@@ -651,43 +643,43 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-json_1.1_spec</artifactId>
-      <version>${geronimo-json_1.1_spec.version}</version>
+      <groupId>jakarta.json</groupId>
+      <artifactId>jakarta.json-api</artifactId>
+      <version>2.0.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-json_1.1_spec</artifactId>
-      <version>${geronimo-json_1.1_spec.version}</version>
+      <groupId>jakarta.json</groupId>
+      <artifactId>jakarta.json-api</artifactId>
+      <version>2.0.0</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>
-        <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>
-        <optional>true</optional>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-concurrent_1.0_spec</artifactId>
-      <version>${geronimo-concurrent_1.0_spec.version}</version>
+      <artifactId>geronimo-jsonb_1.0_spec</artifactId>
+      <version>${geronimo-jsonb_1.0_spec.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-concurrent_1.0_spec</artifactId>
-      <version>${geronimo-concurrent_1.0_spec.version}</version>
+      <artifactId>geronimo-jsonb_1.0_spec</artifactId>
+      <version>${geronimo-jsonb_1.0_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>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.enterprise.concurrent</groupId>
+      <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+      <version>2.0.0</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
diff --git a/src/main/assembly/javaee-api-libs.xml b/src/main/assembly/jakartaee-api-libs.xml
similarity index 97%
rename from src/main/assembly/javaee-api-libs.xml
rename to src/main/assembly/jakartaee-api-libs.xml
index 3521471..4533ed5 100644
--- a/src/main/assembly/javaee-api-libs.xml
+++ b/src/main/assembly/jakartaee-api-libs.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!-- $Rev: 699189 $ $Date: 2008-09-26 01:16:00 -0500 (Fri, 26 Sep 2008) $ -->
-
-<assembly>
-  <id>libs</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${basedir}/target/classes/META-INF</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>README.txt</include>
-      </includes>
-      <excludes>
-        <exclude>all</exclude>
-        <exclude>plus</exclude>
-      </excludes>
-    </fileSet>
-  </fileSets>
-  <files>
-    <file>
-      <source>${project.basedir}/src/main/legal/META-INF/all/LICENSE</source>
-      <outputDirectory>/</outputDirectory>
-      <destName>LICENSE</destName>
-    </file>
-    <file>
-      <source>${project.basedir}/src/main/legal/META-INF/all/NOTICE</source>
-      <outputDirectory>/</outputDirectory>
-      <destName>NOTICE</destName>
-    </file>
-  </files>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <excludes>
-        <exclude>org.apache.openejb:javaee-api</exclude>
-        <exclude>org.apache.geronimo.specs:geronimo-osgi-locator</exclude>
-        <exclude>*:*:sources</exclude>
-        <exclude>junit:junit</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 699189 $ $Date: 2008-09-26 01:16:00 -0500 (Fri, 26 Sep 2008) $ -->
+
+<assembly>
+  <id>libs</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}/target/classes/META-INF</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>README.txt</include>
+      </includes>
+      <excludes>
+        <exclude>all</exclude>
+        <exclude>plus</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+  <files>
+    <file>
+      <source>${project.basedir}/src/main/legal/META-INF/all/LICENSE</source>
+      <outputDirectory>/</outputDirectory>
+      <destName>LICENSE</destName>
+    </file>
+    <file>
+      <source>${project.basedir}/src/main/legal/META-INF/all/NOTICE</source>
+      <outputDirectory>/</outputDirectory>
+      <destName>NOTICE</destName>
+    </file>
+  </files>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+        <exclude>org.apache.tomee:jakartaee-api</exclude>
+        <exclude>org.apache.geronimo.specs:geronimo-osgi-locator</exclude>
+        <exclude>*:*:sources</exclude>
+        <exclude>junit:junit</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
+
diff --git a/src/main/filtered-resources/javaee-api-feature.xml b/src/main/filtered-resources/jakartaee-api-feature.xml
similarity index 98%
rename from src/main/filtered-resources/javaee-api-feature.xml
rename to src/main/filtered-resources/jakartaee-api-feature.xml
index 94ab7b6..4982791 100644
--- a/src/main/filtered-resources/javaee-api-feature.xml
+++ b/src/main/filtered-resources/jakartaee-api-feature.xml
@@ -18,7 +18,7 @@
 -->
 
 <features>
-  <feature name="javaee-api" version="${project.version}">
+  <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>
diff --git a/src/main/java/org/apache/openejb/javaee/api/activator/MultiActivator.java b/src/main/java/org/apache/tomee/jakartaee/api/activator/MultiActivator.java
similarity index 94%
rename from src/main/java/org/apache/openejb/javaee/api/activator/MultiActivator.java
rename to src/main/java/org/apache/tomee/jakartaee/api/activator/MultiActivator.java
index 288b56b..e3d70ea 100644
--- a/src/main/java/org/apache/openejb/javaee/api/activator/MultiActivator.java
+++ b/src/main/java/org/apache/tomee/jakartaee/api/activator/MultiActivator.java
@@ -17,16 +17,13 @@
  * under the License.
  */
 
-
-package org.apache.openejb.javaee.api.activator;
+package org.apache.tomee.jakartaee.api.activator;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
 /**
  * This exists only to call the 3 BundleActivators present in the un-amalgamated jars.
- *
- * @version $Rev$ $Date$
  */
 public class MultiActivator implements BundleActivator {
 
diff --git a/src/main/java/org/apache/openejb/javaee/api/activator/org/apache/openejb/javaee/api/locator/ProviderLocator.java b/src/main/java/org/apache/tomee/jakartaee/api/locator/ProviderLocator.java
similarity index 99%
rename from src/main/java/org/apache/openejb/javaee/api/activator/org/apache/openejb/javaee/api/locator/ProviderLocator.java
rename to src/main/java/org/apache/tomee/jakartaee/api/locator/ProviderLocator.java
index 1c445b6..95a9eaf 100644
--- a/src/main/java/org/apache/openejb/javaee/api/activator/org/apache/openejb/javaee/api/locator/ProviderLocator.java
+++ b/src/main/java/org/apache/tomee/jakartaee/api/locator/ProviderLocator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openejb.javaee.api.activator.org.apache.openejb.javaee.api.locator;
+package org.apache.tomee.jakartaee.api.locator;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/main/resources/META-INF/README.txt b/src/main/resources/META-INF/README.txt
index ebb097f..57df438 100644
--- a/src/main/resources/META-INF/README.txt
+++ b/src/main/resources/META-INF/README.txt
@@ -1,10 +1,10 @@
-These are the archives used to create the Apache TomEE javaee-api-8.0-x.jar.
-
-This archive exists as a way to replace the single javaee-api-8.0-x.jar for users
-who would rather have the individual API jars rather than one large
-jar.  This can be useful in situations where one or more spec versions
-need to be upgraded or changed.
-
-Simply delete the javaee-api-8.0-x.jar and unzip this zip in its
-place.  Typically this will be inside the 'lib' directory of the
-TomEE Standalone server or TomEE Webapp.
+These are the archives used to create the Apache TomEE jakartaee-api-9.0-x.jar.
+
+This archive exists as a way to replace the single javaee-api-8.0-x.jar for users
+who would rather have the individual API jars rather than one large
+jar.  This can be useful in situations where one or more spec versions
+need to be upgraded or changed.
+
+Simply delete the javaee-api-8.0-x.jar and unzip this zip in its
+place.  Typically this will be inside the 'lib' directory of the
+TomEE Standalone server or TomEE Webapp.