From 5aa0fb62d282dbb0073629e06995628d89e3de45 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 11 Mar 2024 16:05:57 +0100 Subject: [PATCH 1/2] Ebean 15.0.1 --- project/Dependencies.scala | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9cb60f5..7c30b23 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -16,14 +16,13 @@ object Dependencies { object Versions { val play: String = "3.0.1" - val ebean = "13.23.0" - val ebeanJakarta = s"$ebean-jakarta" + 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" % Versions.ebean, + "io.ebean" % "ebean-ddl-generator" % Versions.ebean, "io.ebean" % "ebean-agent" % Versions.ebean, "org.playframework" %% "play-java-jdbc" % Versions.play, "org.playframework" %% "play-jdbc-evolutions" % Versions.play, @@ -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, ) From 5a7fbec036fb645f8c8953b65e630fadc87c6227 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 11 Mar 2024 16:22:15 +0100 Subject: [PATCH 2/2] Exclude jackson core dependencies from ebean and use Play's --- project/Dependencies.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 7c30b23..219346d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -21,9 +21,9 @@ object Dependencies { } val ebean = libraryDependencies ++= Seq( - "io.ebean" % "ebean" % Versions.ebean, - "io.ebean" % "ebean-ddl-generator" % Versions.ebean, - "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, "org.playframework" %% "play-java-jdbc" % Versions.play, "org.playframework" %% "play-jdbc-evolutions" % Versions.play, "org.playframework" %% "play-guice" % Versions.play % Test,