Upgrade to Ebean 10.4.7

Signed-off-by: Thibault Meyer <[email protected]>
payintech · Sep 13, 2017 · e1eb095 · e1eb095
1 parent 23763a6
commit e1eb095
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -22,24 +22,25 @@ using an older version of Play Framework, think to use the right plugin version.
 
 ### Play Framework 2.6.x
 
-| Plugin | Play Framework | Ebean ORM | Ebean Agent |
-|--------|----------------|-----------|-------------|
-| 17.08  | 2.6.1          | 10.4.2    | 10.3.1      |
-| 17.07  | 2.6.1          | 10.4.1    | 10.3.1      |
-| 17.06  | 2.6.0          | 10.3.1    | 10.2.1      |
+| Plugin | Play Framework | Ebean ORM | Ebean Agent | Ebean Migration |
+|--------|----------------|-----------|-------------|-----------------|
+| 17.09  | 2.6.3          | 10.4.7    | 10.4.1      | 10.3.1          |
+| 17.08  | 2.6.1          | 10.4.2    | 10.3.1      | 10.1.11         |
+| 17.07  | 2.6.1          | 10.4.1    | 10.3.1      | 10.1.11         |
+| 17.06  | 2.6.0          | 10.3.1    | 10.2.1      | 10.1.8          |
 
 
 ### Play Framework 2.5.x
 
-| Plugin | Play Framework | Ebean ORM | Ebean Agent |
-|--------|----------------|-----------|-------------|
-| 17.05  | 2.5.15         | 10.3.1    | 10.2.1      |
-| 17.04  | 2.5.13         | 10.2.1    | 10.1.7      |
-| 17.03  | 2.5.12         | 10.1.7    | 10.1.6      |
-| 17.02  | 2.5.12         | 10.1.6    | 10.1.2      |
-| 17.01  | 2.5.10         | 10.1.3    | 10.1.2      |
-| 16.12  | 2.5.10         | 9.3.1     | 8.2.1       |
-| 16.11  | 2.5.10         | 9.1.2     | 8.1.1       |
+| Plugin | Play Framework | Ebean ORM | Ebean Agent | Ebean Migration |
+|--------|----------------|-----------|-------------|-----------------|
+| 17.05  | 2.5.15         | 10.3.1    | 10.2.1      | 10.1.8          |
+| 17.04  | 2.5.13         | 10.2.1    | 10.1.7      | 10.1.5          |
+| 17.03  | 2.5.12         | 10.1.7    | 10.1.6      | 10.1.4          |
+| 17.02  | 2.5.12         | 10.1.6    | 10.1.2      | 10.1.3          |
+| 17.01  | 2.5.10         | 10.1.3    | 10.1.2      | -               |
+| 16.12  | 2.5.10         | 9.3.1     | 8.2.1       | -               |
+| 16.11  | 2.5.10         | 9.1.2     | 8.1.1       | -               |
 
 
 ## How to use

diff --git a/build.sbt b/build.sbt
@@ -3,11 +3,12 @@ import sbt.Keys.{publishMavenStyle, publishTo}
 import sbt.inc.Analysis
 import interplay.ScalaVersions._
 
-val PlayVersion = playVersion(sys.props.getOrElse("play.version", "2.6.1"))
+val PlayVersion = playVersion(sys.props.getOrElse("play.version", "2.6.3"))
 val PlayEnhancerVersion = "1.2.1"
-val EbeanVersion = "10.4.2"
-val EbeanAgentVersion = "10.3.1"
-val EbeanDBMigrationVersion = "10.1.11"
+val EbeanVersion = "10.4.7"
+val EbeanAgentVersion = "10.4.1"
+val EbeanDBMigrationVersion = "10.3.1"
+val TypesageConfigVersion = "1.3.1"
 
 lazy val root = project
   .in(file("."))
@@ -176,13 +177,13 @@ def playEbeanDeps = Seq(
   "com.typesafe.play" %% "play-jdbc-evolutions" % PlayVersion,
   "io.ebean" % "ebean" % EbeanVersion,
   "io.ebean" % "ebean-agent" % EbeanAgentVersion,
-  "io.ebean" % "ebean-dbmigration" % EbeanDBMigrationVersion,
+  "io.ebean" % "ebean-migration" % EbeanDBMigrationVersion,
   "com.typesafe.play" %% "play-test" % PlayVersion % Test
 )
 
 def sbtPlayEbeanDeps = Seq(
   "io.ebean" % "ebean-agent" % EbeanAgentVersion,
-  "com.typesafe" % "config" % "1.3.1"
+  "com.typesafe" % "config" % TypesageConfigVersion
 )
 
 // Ebean enhancement

diff --git a/play-ebean/src/main/java/play/db/ebean/dbmigration/EbeanToolbox.scala b/play-ebean/src/main/java/play/db/ebean/dbmigration/EbeanToolbox.scala
@@ -4,8 +4,8 @@ import java.sql.SQLException
 import javax.persistence.PersistenceException
 
 import io.ebean.Ebean
-import io.ebean.dbmigration.runner.LocalMigrationResource
-import io.ebean.dbmigration.{MigrationConfig, MigrationRunner}
+import io.ebean.migration.runner.LocalMigrationResource
+import io.ebean.migration.{MigrationConfig, MigrationRunner}
 import play.api.Environment
 
 import scala.collection.JavaConverters._

diff --git a/sbt-play-ebean-test/build.sbt b/sbt-play-ebean-test/build.sbt
@@ -5,6 +5,7 @@ version := "TEST-SNAPSHOT"
 lazy val root = (project in file(".")).enablePlugins(PlayJava, PlayEbean)
 
 libraryDependencies ++= Seq(
+  "com.h2database" % "h2" % "1.4.196",
   "io.ebean" % "ebean-elastic" % "2.1.1",
   "io.ebean" % "ebean-cluster" % "2.1.1"
 )