Merge pull request #514 from mkurz/play_jakarta

Play milestone that switches to jakarta

Author: mkurz

build.sbt

@@ -18,12 +18,12 @@ Global / onLoad := (Global / onLoad).value.andThen { s =>
   s
 }
 
-val previousVersion: Option[String] = Some("8.0.0")
+val previousVersion: Option[String] = Some("8.3.0")
 
 lazy val mimaSettings = Seq(
   mimaPreviousArtifacts := previousVersion.map(organization.value %% moduleName.value % _).toSet,
   mimaBinaryIssueFilters ++= Seq(
-    ProblemFilters.exclude[ReversedMissingMethodProblem]("play.db.ebean.EbeanConfig.generateEvolutionsScripts"),
+    ProblemFilters.exclude[MissingTypesProblem]("play.db.ebean.DefaultEbeanConfig$EbeanConfigParser"),
   )
 )
 

docs/project/plugins.sbt

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

play-ebean/src/main/java/play/db/ebean/DefaultEbeanConfig.java

@@ -7,10 +7,10 @@
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigException;
 import io.ebean.config.DatabaseConfig;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 import java.util.*;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
 import org.reflections.Reflections;
 import org.reflections.scanners.Scanners;
 import org.reflections.scanners.TypeElementsScanner;

play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java

@@ -8,15 +8,15 @@
 import io.ebean.DatabaseFactory;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.model.CurrentModel;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import play.Environment;
 import play.api.db.evolutions.DynamicEvolutions;
 import play.api.db.evolutions.Evolutions$;

project/Dependencies.scala

@@ -15,7 +15,7 @@ object Dependencies {
   }
 
   object Versions {
-    val play: String   = "3.0.6"
+    val play: String   = "3.1.0-M1"
     val ebean          = "15.8.1"
     val typesafeConfig = "1.4.3"
   }