Merge pull request #454 from mkurz/ebean-15

[7.x] Ebean 15.0.1 / Upgrade sbt, Scala, Play to latest versions

Author: mkurz

.github/workflows/build-test.yml

@@ -53,7 +53,7 @@ jobs:
     uses: playframework/.github/.github/workflows/cmd.yml@v3
     with:
       java: 17, 11
-      scala: 2.13.12, 3.3.1
+      scala: 2.13.13, 3.3.3
       cmd: >-
         sbt "
           +publishLocal;

docs/build.sbt

@@ -21,8 +21,8 @@ lazy val docs = project
     // No resource directories shuts the ebean agent up about java sources in the classes directory
     Test / unmanagedResourceDirectories := Nil,
     Test / parallelExecution            := false,
-    scalaVersion                        := "2.13.12",
-    crossScalaVersions                  := Seq("2.13.12", "3.3.1"),
+    scalaVersion                        := "2.13.13",
+    crossScalaVersions                  := Seq("2.13.13", "3.3.3"),
   )
   .settings(
     Test / javafmt / sourceDirectories ++= (Test / unmanagedSourceDirectories).value,

docs/project/build.properties

@@ -1,3 +1,3 @@
 # Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
-sbt.version=1.9.8
+sbt.version=1.9.9

docs/project/plugins.sbt

@@ -6,7 +6,7 @@ lazy val sbtPlayEbean = ProjectRef(Path.fileProperty("user.dir").getParentFile,
 
 resolvers ++= DefaultOptions.resolvers(snapshot = true)
 
-addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.1"))
+addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.2"))
 
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
 

project/Dependencies.scala

@@ -9,22 +9,21 @@ import sbt._
 object Dependencies {
 
   object ScalaVersions {
-    val scala212 = "2.12.18"
-    val scala213 = "2.13.12"
-    val scala3   = "3.3.1"
+    val scala212 = "2.12.19"
+    val scala213 = "2.13.13"
+    val scala3   = "3.3.3"
   }
 
   object Versions {
-    val play: String   = "2.9.1"
-    val ebean          = "13.23.0"
-    val ebeanJakarta   = s"$ebean-jakarta"
+    val play: String   = "2.9.2"
+    val ebean          = "15.0.1"
     val typesafeConfig = "1.4.3"
   }
 
   val ebean = libraryDependencies ++= Seq(
-    "io.ebean"           % "ebean"                % Versions.ebeanJakarta,
-    "io.ebean"           % "ebean-ddl-generator"  % Versions.ebeanJakarta,
-    "io.ebean"           % "ebean-agent"          % Versions.ebean,
+    ("io.ebean" % "ebean"               % Versions.ebean).excludeAll(ExclusionRule("com.fasterxml.jackson.core")),
+    "io.ebean"  % "ebean-ddl-generator" % Versions.ebean,
+    "io.ebean"  % "ebean-agent"         % Versions.ebean,
     "com.typesafe.play" %% "play-java-jdbc"       % Versions.play,
     "com.typesafe.play" %% "play-jdbc-evolutions" % Versions.play,
     "com.typesafe.play" %% "play-guice"           % Versions.play % Test,
@@ -36,7 +35,7 @@ object Dependencies {
   )
 
   val plugin = libraryDependencies ++= Seq(
-    "io.ebean"     % "ebean"       % Versions.ebeanJakarta,
+    "io.ebean"     % "ebean"       % Versions.ebean,
     "io.ebean"     % "ebean-agent" % Versions.ebean,
     "com.typesafe" % "config"      % Versions.typesafeConfig,
   )

project/build.properties

@@ -1,3 +1,3 @@
 # Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
-sbt.version=1.9.8
+sbt.version=1.9.9

sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala

@@ -57,7 +57,7 @@ object PlayEbean extends AutoPlugin {
       libraryDependencies ++=
         Seq(
           "com.typesafe.play" %% "play-ebean"   % playEbeanVersion.value,
-          "org.glassfish.jaxb" % "jaxb-runtime" % "4.0.4"
+          "org.glassfish.jaxb" % "jaxb-runtime" % "4.0.5"
         )
     )