From fbaab9396ea39d4c12cfdbddbea7f685f6fa2718 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 19 Oct 2023 00:11:25 +0200 Subject: [PATCH 1/2] Switch to org.playframework --- README.md | 3 ++- build.sbt | 4 ++-- .../manual/working/javaGuide/main/sql/code/ebean.sbt | 2 +- docs/project/plugins.sbt | 2 +- project/Common.scala | 2 +- project/Dependencies.scala | 12 ++++++------ .../src/main/scala/play/ebean/sbt/PlayEbean.scala | 2 +- .../sbt-ebean/enhancement/project/plugins.sbt | 2 +- .../sbt-ebean/model-loading/project/plugins.sbt | 2 +- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 150baf97..90010d32 100644 --- a/README.md +++ b/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) diff --git a/build.sbt b/build.sbt index 81a4fad2..0d6b3c91 100644 --- a/build.sbt +++ b/build.sbt @@ -70,9 +70,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, diff --git a/docs/manual/working/javaGuide/main/sql/code/ebean.sbt b/docs/manual/working/javaGuide/main/sql/code/ebean.sbt index 737edf17..59503848 100644 --- a/docs/manual/working/javaGuide/main/sql/code/ebean.sbt +++ b/docs/manual/working/javaGuide/main/sql/code/ebean.sbt @@ -1,7 +1,7 @@ // Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. //#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 diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt index f3cac60e..f6c7a46e 100644 --- a/docs/project/plugins.sbt +++ b/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") diff --git a/project/Common.scala b/project/Common.scala index 37213f6c..0f8230a1 100644 --- a/project/Common.scala +++ b/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"), diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 90a77cfd..ef8bae61 100644 --- a/project/Dependencies.scala +++ b/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("") diff --git a/sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala b/sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala index b64768db..3a1eddf0 100644 --- a/sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala +++ b/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" ) ) diff --git a/sbt-play-ebean/src/sbt-test/sbt-ebean/enhancement/project/plugins.sbt b/sbt-play-ebean/src/sbt-test/sbt-ebean/enhancement/project/plugins.sbt index 69e24cff..ffaa76e1 100644 --- a/sbt-play-ebean/src/sbt-test/sbt-ebean/enhancement/project/plugins.sbt +++ b/sbt-play-ebean/src/sbt-test/sbt-ebean/enhancement/project/plugins.sbt @@ -1,4 +1,4 @@ // Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. 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")) diff --git a/sbt-play-ebean/src/sbt-test/sbt-ebean/model-loading/project/plugins.sbt b/sbt-play-ebean/src/sbt-test/sbt-ebean/model-loading/project/plugins.sbt index 69e24cff..ffaa76e1 100644 --- a/sbt-play-ebean/src/sbt-test/sbt-ebean/model-loading/project/plugins.sbt +++ b/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 , 2011-2021 Lightbend Inc. 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")) From add128a31855925084f945540929afca2d750224 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 19 Oct 2023 00:16:28 +0200 Subject: [PATCH 2/2] Temporary disable MiMa --- build.sbt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 0d6b3c91..806e55e6 100644 --- a/build.sbt +++ b/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( ) )