diff --git a/pom.xml b/pom.xml
index 7d41345..d1d69a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@
 
     For APIs available in Tomcat such as Servlet, JSP, EL, we want to give Tomcat the priority.
     -->
-    <geronimo-annotation_1.3_spec.version>1.2</geronimo-annotation_1.3_spec.version>
-    <geronimo-atinject_1.0_spec.version>1.1</geronimo-atinject_1.0_spec.version>
+    <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>
@@ -70,24 +70,24 @@
     <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.1</geronimo-jcdi_2.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.0</geronimo-jpa_2.2_spec.version>
-    <geronimo-json_1.1_spec.version>1.2</geronimo-json_1.1_spec.version>
-    <geronimo-jsonb_1.0_spec.version>1.1</geronimo-jsonb_1.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.0</geronimo-security_1.0_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.0</geronimo-validation_2.0_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.1</geronimo-interceptor_1.2_spec.version>
+    <geronimo-interceptor_1.2_spec.version>1.2</geronimo-interceptor_1.2_spec.version>
 
     <!-- Jakarta APIs -->
 
     <!-- We use servlet, jsp, jaspic, websocket, el straight from Tomcat APIs -->
-    <tomcat.version>9.0.31</tomcat.version>
+    <tomcat.version>9.0.39</tomcat.version>
   </properties>