Merge pull request #2 from ebean-orm/feature/update-14

Update for ebean 14.x

Author: rbygrave

ebean-autotune/pom.xml

@@ -4,10 +4,9 @@
   <parent>
     <artifactId>ebean-components-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.25.0</version>
+    <version>14.0.0</version>
   </parent>
 
-
   <name>ebean autotune</name>
   <description>ebean automatic query tuning module</description>
   <artifactId>ebean-autotune</artifactId>
@@ -17,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.25.0</version>
+      <version>14.0.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -53,21 +52,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.25.0</version>
+      <version>14.0.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.1</version>
+      <version>1.4</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.25.0</version>
+      <version>14.0.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -82,7 +81,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:13.25.0</tile>
+            <tile>io.ebean.tile:enhancement:14.0.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java

@@ -10,7 +10,6 @@
 import io.ebeaninternal.server.autotune.model.Origin;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 
-import javax.persistence.PersistenceException;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
@@ -190,7 +189,7 @@ private boolean useTuning(SpiQuery<?> query) {
           return query.isDetailEmpty();
 
         default:
-          throw new PersistenceException("Invalid AutoTuneMode " + mode);
+          throw new IllegalArgumentException("Invalid AutoTuneMode " + mode);
       }
     }
   }

ebean-autotune/src/test/java/org/tests/model/basic/Address.java

@@ -1,7 +1,7 @@
 package org.tests.model.basic;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "o_address")

ebean-autotune/src/test/java/org/tests/model/basic/BaseModel.java

@@ -4,9 +4,9 @@
 import io.ebean.annotation.WhenCreated;
 import io.ebean.annotation.WhenModified;
 
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Version;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Version;
 import java.time.Instant;
 
 @MappedSuperclass

ebean-autotune/src/test/java/org/tests/model/basic/Customer.java

@@ -2,10 +2,10 @@
 
 import io.ebean.annotation.NotNull;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "o_customer")

ebean-autotune/src/test/java/org/tests/model/basic/Order.java

@@ -1,6 +1,6 @@
 package org.tests.model.basic;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDate;
 
 @Entity

ebean-csv-reader/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-components-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.25.0</version>
+    <version>14.0.0</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,28 +14,28 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.25.0</version>
+      <version>14.0.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.25.0</version>
+      <version>14.0.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.25.0</version>
+      <version>14.0.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.1</version>
+      <version>1.4</version>
       <scope>test</scope>
     </dependency>
 
@@ -52,7 +52,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:13.17.1</tile>
+            <tile>io.ebean.tile:enhancement:14.0.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-csv-reader/src/test/java/org/example/BaseEntity.java

@@ -2,9 +2,9 @@
 
 import io.ebean.annotation.WhenCreated;
 
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Version;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Version;
 import java.time.Instant;
 
 @MappedSuperclass

ebean-csv-reader/src/test/java/org/example/Country.java

@@ -1,7 +1,7 @@
 package org.example;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class Country {

ebean-csv-reader/src/test/java/org/example/Customer.java

@@ -1,9 +1,9 @@
 package org.example;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDate;
 
-import static javax.persistence.CascadeType.PERSIST;
+import static jakarta.persistence.CascadeType.PERSIST;
 
 @Entity
 public class Customer extends BaseEntity {