From 4084822d2ccaaa3afbc425dfe6e8c4f26d0d02ad Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 31 Mar 2022 14:38:41 +1300
Subject: [PATCH] Bump to 13.0.0 and Java 11

---
 pom.xml                                | 17 +++++++++--------
 src/main/java/module-info.java         |  9 +++++++++
 src/test/java/org/example/Account.java |  2 ++
 src/test/java/org/example/Role.java    |  2 ++
 src/test/java/org/example/User.java    |  6 ++----
 5 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/module-info.java

diff --git a/pom.xml b/pom.xml
index cc92f616e..7448cb709 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>3.2</version>
+    <artifactId>java11-oss</artifactId>
+    <version>3.6</version>
   </parent>
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-spring-txn</artifactId>
-  <version>12.12.0</version>
+  <version>13.0.0</version>
 
   <name>ebean-spring-txn</name>
   <packaging>jar</packaging>
@@ -19,6 +19,7 @@
   <properties>
     <spring.framework.version>4.3.4.RELEASE</spring.framework.version>
     <spring.boot.version>1.4.2.RELEASE</spring.boot.version>
+    <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 
   <url>http://ebean-orm.github.io/</url>
@@ -39,14 +40,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>12.12.0</version>
+      <version>13.0.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.12.0</version>
+      <version>13.0.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -109,14 +110,14 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>1.4.199</version>
+      <version>2.1.210</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.11</version>
       <scope>test</scope>
     </dependency>
 
@@ -138,7 +139,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:12.12.0</tile>
+            <tile>io.ebean.tile:enhancement:13.0.0</tile>
           </tiles>
         </configuration>
       </plugin>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 000000000..52bb9ecf7
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+module io.ebean.spring.txn {
+
+    exports io.ebean.spring.txn;
+
+    requires io.ebean.api;
+    requires io.ebean.core;
+    requires spring.jdbc;
+    requires spring.tx;
+}
\ No newline at end of file
diff --git a/src/test/java/org/example/Account.java b/src/test/java/org/example/Account.java
index 6caf527e3..dea4c103d 100644
--- a/src/test/java/org/example/Account.java
+++ b/src/test/java/org/example/Account.java
@@ -3,7 +3,9 @@ package org.example;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
+@Table(name="o_account")
 @Entity
 public class Account {
 
diff --git a/src/test/java/org/example/Role.java b/src/test/java/org/example/Role.java
index 4f0a9434a..6fcee501e 100644
--- a/src/test/java/org/example/Role.java
+++ b/src/test/java/org/example/Role.java
@@ -4,7 +4,9 @@ import java.util.Set;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
+@Table(name="o_role")
 @Entity
 public class Role {
 
diff --git a/src/test/java/org/example/User.java b/src/test/java/org/example/User.java
index 604caacf9..337796f06 100644
--- a/src/test/java/org/example/User.java
+++ b/src/test/java/org/example/User.java
@@ -2,12 +2,10 @@ package org.example;
 
 import io.ebean.Model;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToOne;
+import javax.persistence.*;
 import java.util.Set;
 
+@Table(name="o_user")
 @Entity
 public class User extends Model {