Merge pull request #407 from mkurz/play30

Switch to `org.playframework`

README.md

@@ -11,7 +11,8 @@
 [![OpenCollective](https://img.shields.io/opencollective/all/playframework?label=financial%20contributors&logo=open-collective)](https://opencollective.com/playframework)
 
 [![Build Status](https://github.com/playframework/play-ebean/actions/workflows/build-test.yml/badge.svg)](https://github.com/playframework/play-ebean/actions/workflows/build-test.yml)
-[![Maven](https://img.shields.io/maven-central/v/com.typesafe.play/play-ebean_2.13.svg?logo=apache-maven)](https://mvnrepository.com/artifact/com.typesafe.play/play-ebean_2.13)
+[![Maven](https://img.shields.io/maven-central/v/org.playframework/play-ebean_2.13.svg?logo=apache-maven)](https://mvnrepository.com/artifact/
+org.playframework/play-ebean_2.13)
 [![Repository size](https://img.shields.io/github/repo-size/playframework/play-ebean.svg?logo=git)](https://github.com/playframework/play-ebean)
 [![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
 [![Mergify Status](https://img.shields.io/endpoint.svg?url=https://api.mergify.com/v1/badges/playframework/play-ebean&style=flat)](https://mergify.com)

build.sbt

@@ -19,12 +19,7 @@ Global / onLoad := (Global / onLoad).value.andThen { s =>
 }
 
 lazy val mimaSettings = Seq(
-  mimaPreviousArtifacts :=
-    Set(
-      organization.value %% name.value % previousStableVersion.value.getOrElse(
-        throw new Error("Unable to determine previous version")
-      )
-    ),
+  mimaPreviousArtifacts := Set.empty, // TODO: revert
   mimaBinaryIssueFilters ++= Seq(
   )
 )
@@ -70,9 +65,9 @@ lazy val plugin = project
   .enablePlugins(SbtPlugin)
   .settings(
     name         := "sbt-play-ebean",
-    organization := "com.typesafe.play",
+    organization := "org.playframework",
     Dependencies.plugin,
-    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % Versions.play),
+    addSbtPlugin("org.playframework" % "sbt-plugin" % Versions.play),
     scalaVersion          := scala212,
     crossScalaVersions    := Seq(scala212),
     mimaPreviousArtifacts := Set.empty,

docs/manual/working/javaGuide/main/sql/code/ebean.sbt

@@ -1,7 +1,7 @@
 // Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
 //#add-sbt-plugin
-addSbtPlugin("com.typesafe.play" % "sbt-play-ebean" % "6.2.0")
+addSbtPlugin("org.playframework" % "sbt-play-ebean" % "8.0.0")
 //#add-sbt-plugin
 
 //#enable-plugin

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.0-RC3"))
+addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.0-M3"))
 
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
 

project/Common.scala

@@ -24,7 +24,7 @@ object Common extends AutoPlugin {
   override def globalSettings: Seq[Setting[_]] =
     Seq(
       // organization
-      organization         := "com.typesafe.play",
+      organization         := "org.playframework",
       organizationName     := "The Play Framework Project",
       organizationHomepage := Some(url("https://playframework.com/")),
       scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-encoding", "utf8"),

project/Dependencies.scala

@@ -15,7 +15,7 @@ object Dependencies {
   }
 
   object Versions {
-    val play: String   = "2.9.0-RC2"
+    val play: String   = "3.0.0-M3"
     val ebean          = "13.17.3"
     val ebeanJakarta   = s"$ebean-jakarta"
     val typesafeConfig = "1.4.2"
@@ -25,11 +25,11 @@ object Dependencies {
     "io.ebean"           % "ebean"                % Versions.ebeanJakarta,
     "io.ebean"           % "ebean-ddl-generator"  % Versions.ebeanJakarta,
     "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,
-    "com.typesafe.play" %% "play-filters-helpers" % Versions.play % Test,
-    "com.typesafe.play" %% "play-test"            % Versions.play % Test,
+    "org.playframework" %% "play-java-jdbc"       % Versions.play,
+    "org.playframework" %% "play-jdbc-evolutions" % Versions.play,
+    "org.playframework" %% "play-guice"           % Versions.play % Test,
+    "org.playframework" %% "play-filters-helpers" % Versions.play % Test,
+    "org.playframework" %% "play-test"            % Versions.play % Test,
     ("org.reflections"   % "reflections"          % "0.10.2")
       .exclude("com.google.code.findbugs", "annotations")
       .classifier("")

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

@@ -56,7 +56,7 @@ object PlayEbean extends AutoPlugin {
       playEbeanVersion    := readResourceProperty("play-ebean.version.properties", "play-ebean.version"),
       libraryDependencies ++=
         Seq(
-          "com.typesafe.play" %% "play-ebean"   % playEbeanVersion.value,
+          "org.playframework" %% "play-ebean"   % playEbeanVersion.value,
           "org.glassfish.jaxb" % "jaxb-runtime" % "4.0.3"
         )
     )

sbt-play-ebean/src/sbt-test/sbt-ebean/enhancement/project/plugins.sbt

@@ -1,4 +1,4 @@
 // Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
 resolvers ++= DefaultOptions.resolvers(snapshot = true)
-addSbtPlugin("com.typesafe.play" % "sbt-play-ebean" % sys.props("project.version"))
+addSbtPlugin("org.playframework" % "sbt-play-ebean" % sys.props("project.version"))

sbt-play-ebean/src/sbt-test/sbt-ebean/model-loading/project/plugins.sbt

@@ -1,4 +1,4 @@
 // Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
 resolvers ++= DefaultOptions.resolvers(snapshot = true)
-addSbtPlugin("com.typesafe.play" % "sbt-play-ebean" % sys.props("project.version"))
+addSbtPlugin("org.playframework" % "sbt-play-ebean" % sys.props("project.version"))