Merge pull request #4 from ebean-orm/feature/3-update-for-16

#3 Update to support version 16.1.0 and higher

Author: rbygrave

ebean-autotune/pom.xml

@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.0</version>
+      <version>16.1.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -52,21 +52,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.0</version>
+      <version>16.1.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.4</version>
+      <version>1.6</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.0</version>
+      <version>16.1.0</version>
       <scope>test</scope>
     </dependency>
 

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

@@ -52,7 +52,7 @@ public boolean tuneQuery(SpiQuery<?> query) {
     if (query.isDetailEmpty()) {
       tuned = true;
       // tune by 'replacement'
-      query.setDetail(tunedDetail.copy());
+      query.setDetail(tunedDetail.copy(null));
     } else {
       // tune by 'addition'
       tuned = query.tuneFetchProperties(tunedDetail);

ebean-autotune/src/test/java/org/tests/autofetch/MainAutoQueryTune1.java

@@ -23,7 +23,7 @@ void tuneJoin() {
       .where()
       .eq("status", Order.Status.NEW)
       .eq("customer.name", "Rob")
-      .order().asc("id")
+      .orderBy().asc("id")
       .findList();
 
     for (Order order : list) {

ebean-csv-reader/pom.xml

@@ -14,28 +14,28 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.0</version>
+      <version>16.1.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.0</version>
+      <version>16.1.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.0</version>
+      <version>16.1.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.4</version>
+      <version>1.6</version>
       <scope>test</scope>
     </dependency>
 

ebean-externalmapping-xml/pom.xml

@@ -68,28 +68,28 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.0</version>
+      <version>16.1.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.0</version>
+      <version>16.1.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.0</version>
+      <version>16.1.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.4</version>
+      <version>1.6</version>
       <scope>test</scope>
     </dependency>
 

ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java

@@ -34,7 +34,7 @@ public void namedQuery() {
   public void namedQuery_withStatus() {
 
     Query<Customer> name = server().createNamedQuery(Customer.class, "withStatus");
-    name.order().clear().asc("status");
+    name.orderBy().clear().asc("status");
     name.findList();
 
     assertThat(sqlOf(name)).contains("select t0.id, t0.name, t0.status from o_customer t0 order by t0.status");

ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java

@@ -34,7 +34,7 @@ public void testNamedRawSql_with_extraPredicates() {
     query
       .where().gt("order.id", 1)
       .having().gt("totalItems", 1)
-      .order().desc("totalAmount")
+      .orderBy().desc("totalAmount")
       .findList();
 
     assertSql(query).contains("count(*) as total_items, sum(order_qty*unit_price) as total_amount, max(order_qty*unit_price) as maxAmount from o_order_detail");
@@ -49,7 +49,7 @@ public void testNamedRawSql_with_param() {
       .setParameter("minId", 2)
       .where().isNotNull("order.id")
       .having().lt("totalAmount", 100)
-      .order().desc("totalAmount")
+      .orderBy().desc("totalAmount")
       .setMaxRows(10)
       .findList();
 

ebean-jackson-jsonnode/pom.xml

@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.0.0</version>
+      <version>16.1.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.4</version>
+      <version>1.6</version>
       <scope>test</scope>
     </dependency>
 

ebean-joda-time/pom.xml

@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.0.0</version>
+      <version>16.1.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.4</version>
+      <version>1.6</version>
       <scope>test</scope>
     </dependency>
 

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java11-oss</artifactId>
-    <version>4.0</version>
+    <version>5.1</version>
   </parent>
 
   <groupId>io.ebean</groupId>
@@ -34,7 +34,7 @@
     <jackson.version>2.15.0</jackson.version>
     <h2database.version>2.1.214</h2database.version>
     <ebean-types.version>3.0</ebean-types.version>
-    <ebean-datasource.version>8.12</ebean-datasource.version>
+    <ebean-datasource.version>10.1</ebean-datasource.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>