diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 57f14a27d..c5621372b 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -37,26 +37,26 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsr305</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>persistence-api</artifactId>
-      <version>2.2.4</version>
+      <version>2.2.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>7.2</version>
+      <version>7.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-types</artifactId>
-      <version>2.1</version>
+      <version>2.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 32b24bd01..e6ac7c932 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-runner</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>classpath-scanner</artifactId>
-      <version>6.0</version>
+      <version>6.1</version>
     </dependency>
 
     <dependency>
@@ -68,8 +68,8 @@
     -->
     <dependency>
       <groupId>io.avaje</groupId>
-      <artifactId>avaje-jsr305</artifactId>
-      <version>1.0</version>
+      <artifactId>avaje-jsr305-x</artifactId>
+      <version>1.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -84,8 +84,15 @@
 
     <dependency>
       <groupId>javax.transaction</groupId>
-      <artifactId>jta</artifactId>
-      <version>1.1</version>
+      <artifactId>javax.transaction-api</artifactId>
+      <version>1.3</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.naming</groupId>
+      <artifactId>jndi</artifactId>
+      <version>1.2.1</version>
       <optional>true</optional>
     </dependency>
 
@@ -93,7 +100,7 @@
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>
-      <version>1.1.0.Final</version>
+      <version>2.0.1.Final</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -110,12 +117,12 @@
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <version>1.3.2</version>
-      <optional>true</optional>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>javax.annotation</groupId>-->
+<!--      <artifactId>javax.annotation-api</artifactId>-->
+<!--      <version>1.3.2</version>-->
+<!--      <optional>true</optional>-->
+<!--    </dependency>-->
 
     <!-- Jackson core used internally by Ebean -->
     <dependency>