Skip to content

Commit 678f6a2

Browse files
Nico Huysamenjknack
Nico Huysamen
authored and
jknack
committed
Updates Ebean to latest versions (10.x)
1 parent 70494cf commit 678f6a2

8 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎coverage-report/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,8 @@
569569
</dependency>
570570

571571
<dependency>
572-
<groupId>org.avaje.ebeanorm</groupId>
573-
<artifactId>avaje-ebeanorm-agent</artifactId>
572+
<groupId>io.ebean</groupId>
573+
<artifactId>ebean-agent</artifactId>
574574
<exclusions>
575575
<exclusion>
576576
<groupId>javax.persistence</groupId>

‎jooby-ebean/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747

4848
<!-- Ebean -->
4949
<dependency>
50-
<groupId>org.avaje.ebeanorm</groupId>
51-
<artifactId>avaje-ebeanorm</artifactId>
50+
<groupId>io.ebean</groupId>
51+
<artifactId>ebean</artifactId>
5252
<exclusions>
5353
<exclusion>
5454
<groupId>org.jetbrains</groupId>
@@ -62,8 +62,8 @@
6262
</dependency>
6363

6464
<dependency>
65-
<groupId>org.avaje.ebeanorm</groupId>
66-
<artifactId>avaje-ebeanorm-agent</artifactId>
65+
<groupId>io.ebean</groupId>
66+
<artifactId>ebean-agent</artifactId>
6767
<optional>true</optional>
6868
</dependency>
6969

‎jooby-ebean/src/main/java/org/jooby/ebean/Ebeanby.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,21 @@
1818
*/
1919
package org.jooby.ebean;
2020

21-
import java.util.Arrays;
22-
import java.util.HashSet;
23-
import java.util.Properties;
24-
import java.util.Set;
25-
21+
import com.google.inject.Binder;
22+
import com.typesafe.config.Config;
23+
import com.typesafe.config.ConfigFactory;
24+
import io.ebean.EbeanServer;
25+
import io.ebean.config.ContainerConfig;
26+
import io.ebean.config.ServerConfig;
2627
import org.jooby.Env;
2728
import org.jooby.internal.ebean.EbeanEnhancer;
2829
import org.jooby.internal.ebean.EbeanManaged;
2930
import org.jooby.jdbc.Jdbc;
3031

31-
import com.avaje.ebean.EbeanServer;
32-
import com.avaje.ebean.config.ContainerConfig;
33-
import com.avaje.ebean.config.ServerConfig;
34-
import com.google.inject.Binder;
35-
import com.typesafe.config.Config;
36-
import com.typesafe.config.ConfigFactory;
32+
import java.util.Arrays;
33+
import java.util.HashSet;
34+
import java.util.Properties;
35+
import java.util.Set;
3736

3837
/**
3938
* <h1>ebean module</h1>

‎jooby-ebean/src/main/java/org/jooby/internal/ebean/EbeanEnhancer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void run(final Set<String> packages) {
3737
}
3838

3939
public static EbeanEnhancer newEnhancer() {
40-
return newEnhancer("/com/avaje/ebean/enhance/agent/Transformer.class",
40+
return newEnhancer("/io/ebean/enhance/agent/Transformer.class",
4141
"/org/avaje/agentloader/AgentLoader.class");
4242
}
4343

‎jooby-ebean/src/main/java/org/jooby/internal/ebean/EbeanManaged.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
import javax.inject.Provider;
2424

25-
import com.avaje.ebean.EbeanServer;
26-
import com.avaje.ebean.EbeanServerFactory;
27-
import com.avaje.ebean.config.ServerConfig;
25+
import io.ebean.EbeanServer;
26+
import io.ebean.EbeanServerFactory;
27+
import io.ebean.config.ServerConfig;
2828
import com.google.common.base.Supplier;
2929
import com.google.common.base.Suppliers;
3030
import com.typesafe.config.Config;

‎jooby-ebean/src/test/java/org/jooby/ebean/EbeanbyTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import org.powermock.core.classloader.annotations.PrepareForTest;
1919
import org.powermock.modules.junit4.PowerMockRunner;
2020

21-
import com.avaje.ebean.EbeanServer;
22-
import com.avaje.ebean.config.ContainerConfig;
23-
import com.avaje.ebean.config.ServerConfig;
21+
import io.ebean.EbeanServer;
22+
import io.ebean.config.ContainerConfig;
23+
import io.ebean.config.ServerConfig;
2424
import com.google.common.collect.Sets;
2525
import com.google.inject.Binder;
2626
import com.google.inject.Key;

‎jooby-ebean/src/test/java/org/jooby/internal/ebean/EbeanManagedTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import org.powermock.core.classloader.annotations.PrepareForTest;
1111
import org.powermock.modules.junit4.PowerMockRunner;
1212

13-
import com.avaje.ebean.EbeanServer;
14-
import com.avaje.ebean.EbeanServerFactory;
15-
import com.avaje.ebean.config.ServerConfig;
13+
import io.ebean.EbeanServer;
14+
import io.ebean.EbeanServerFactory;
15+
import io.ebean.config.ServerConfig;
1616
import com.typesafe.config.Config;
1717

1818
@RunWith(PowerMockRunner.class)

‎pom.xml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,8 +1289,8 @@
12891289

12901290
<!-- Ebean -->
12911291
<dependency>
1292-
<groupId>org.avaje.ebeanorm</groupId>
1293-
<artifactId>avaje-ebeanorm</artifactId>
1292+
<groupId>io.ebean</groupId>
1293+
<artifactId>ebean</artifactId>
12941294
<version>${ebean.version}</version>
12951295
</dependency>
12961296

@@ -1301,9 +1301,9 @@
13011301
</dependency>
13021302

13031303
<dependency>
1304-
<groupId>org.avaje.ebeanorm</groupId>
1305-
<artifactId>avaje-ebeanorm-agent</artifactId>
1306-
<version>${avaje-ebeanorm-agent.version}</version>
1304+
<groupId>io.ebean</groupId>
1305+
<artifactId>ebean-agent</artifactId>
1306+
<version>${ebean-agent.version}</version>
13071307
</dependency>
13081308

13091309
<!-- jooq -->
@@ -1764,9 +1764,9 @@
17641764

17651765
<!-- avaje-enchancer -->
17661766
<plugin>
1767-
<groupId>org.avaje.ebeanorm</groupId>
1768-
<artifactId>avaje-ebeanorm-mavenenhancer</artifactId>
1769-
<version>${avaje-ebeanorm-agent.version}</version>
1767+
<groupId>org.avaje.ebean</groupId>
1768+
<artifactId>ebean-maven-plugin</artifactId>
1769+
<version>${ebean-maven-plugin.version}</version>
17701770
<executions>
17711771
<execution>
17721772
<phase>process-classes</phase>
@@ -2418,8 +2418,8 @@
24182418
<dependencies>
24192419
<!-- ebean-runtime-enchancer -->
24202420
<dependency>
2421-
<groupId>org.avaje.ebeanorm</groupId>
2422-
<artifactId>avaje-ebeanorm-agent</artifactId>
2421+
<groupId>io.ebean</groupId>
2422+
<artifactId>ebean-agent</artifactId>
24232423
<scope>test</scope>
24242424
</dependency>
24252425

@@ -2433,8 +2433,8 @@
24332433
<plugins>
24342434
<!-- ebean-enchancer -->
24352435
<plugin>
2436-
<groupId>org.avaje.ebeanorm</groupId>
2437-
<artifactId>avaje-ebeanorm-mavenenhancer</artifactId>
2436+
<artifactId>ebean-maven-plugin</artifactId>
2437+
<version>${ebean-maven-plugin.version}</version>
24382438
</plugin>
24392439
</plugins>
24402440
</build>
@@ -2779,7 +2779,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
27792779
<handlebars.version>4.0.5</handlebars.version>
27802780
<h2.version>1.4.190</h2.version>
27812781
<mysql-connector-java.version>5.1.38</mysql-connector-java.version>
2782-
<hikariCP.version>2.5.1</hikariCP.version>
2782+
<hikariCP.version>2.6.0</hikariCP.version>
27832783
<hibernate.version>5.2.1.Final</hibernate.version>
27842784
<hibernate4.version>4.3.9.Final</hibernate4.version>
27852785
<jsr305.version>3.0.0</jsr305.version>
@@ -2817,9 +2817,10 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
28172817
<flyway.version>4.0</flyway.version>
28182818
<hazelcast.version>3.6.1</hazelcast.version>
28192819
<less4j.version>1.13.0</less4j.version>
2820-
<ebean.version>7.5.1</ebean.version>
2820+
<ebean.version>10.1.6</ebean.version>
28212821
<avaje-agentloader.version>2.1.2</avaje-agentloader.version>
2822-
<avaje-ebeanorm-agent.version>4.9.2</avaje-ebeanorm-agent.version>
2822+
<ebean-agent.version>10.1.2</ebean-agent.version>
2823+
<ebean-maven-plugin.version>10.1.4</ebean-maven-plugin.version>
28232824
<akka.version>2.4.11</akka.version>
28242825
<yuicompressor.version>2.4.8</yuicompressor.version>
28252826
<closure-compiler.version>v20150901</closure-compiler.version>

0 commit comments

Comments
 (0)