diff --git a/jakartaee-api/pom.xml b/jakartaee-api/pom.xml
index c6f707b..90e4c42 100644
--- a/jakartaee-api/pom.xml
+++ b/jakartaee-api/pom.xml
@@ -335,16 +335,16 @@
     </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>
 
@@ -378,20 +378,6 @@
 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-interceptor_1.2_spec</artifactId>
-      <version>${geronimo-interceptor_1.2_spec.version}</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>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index c9e5ae1..9932412 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -415,6 +415,12 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>2.0.0</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -515,7 +521,7 @@
             <source>${project.basedir}/../../transform/src/patch/java/</source>
           </patchSources>
           <sourceExcludes>
-<!--            <exclude>org/apache/cxf/jaxrs</exclude>-->
+            <!--            <exclude>org/apache/cxf/jaxrs</exclude>-->
             <exclude>org/apache/bval</exclude>
           </sourceExcludes>
           <transformSources>true</transformSources>