You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2023/03/27 20:00:45 UTC

[incubator-pekko-projection] branch main updated: Integrate sbt-apache-sonatype and sbt-dynver

This is an automated email from the ASF dual-hosted git repository.

mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-projection.git


The following commit(s) were added to refs/heads/main by this push:
     new e2e9ca9  Integrate sbt-apache-sonatype and sbt-dynver
e2e9ca9 is described below

commit e2e9ca919e8a45e37dd79cf7c326f71cb791c86d
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Mon Mar 27 21:45:55 2023 +0200

    Integrate sbt-apache-sonatype and sbt-dynver
---
 build.sbt                            |  1 +
 project/AddMetaInfLicenseFiles.scala | 16 ++++++++++++++++
 project/Common.scala                 | 16 +++++++---------
 project/plugins.sbt                  |  3 ++-
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/build.sbt b/build.sbt
index c3d11a8..329d218 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,5 +1,6 @@
 import org.apache.pekko.projections.Dependencies
 
+ThisBuild / apacheSonatypeProjectProfile := "pekko"
 ThisBuild / resolvers += "Apache Nexus Snapshots".at("https://repository.apache.org/content/repositories/snapshots/")
 
 lazy val core =
diff --git a/project/AddMetaInfLicenseFiles.scala b/project/AddMetaInfLicenseFiles.scala
new file mode 100644
index 0000000..a22a1e5
--- /dev/null
+++ b/project/AddMetaInfLicenseFiles.scala
@@ -0,0 +1,16 @@
+import sbt.AutoPlugin
+
+import sbt.Keys._
+import sbt._
+import org.mdedetrich.apache.sonatype.SonatypeApachePlugin
+import org.mdedetrich.apache.sonatype.SonatypeApachePlugin.autoImport._
+
+object AddMetaInfLicenseFiles extends AutoPlugin {
+  override def trigger = allRequirements
+
+  override def requires = SonatypeApachePlugin
+
+  override lazy val projectSettings = Seq(
+    apacheSonatypeDisclaimerFile := Some((LocalRootProject / baseDirectory).value / "DISCLAIMER"))
+
+}
diff --git a/project/Common.scala b/project/Common.scala
index c49b35f..cc87f9d 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -1,26 +1,23 @@
 import org.apache.pekko.projections.Dependencies
-import com.geirsson.CiReleasePlugin
 import sbtdynver.DynVerPlugin.autoImport._
 import com.lightbend.paradox.projectinfo.ParadoxProjectInfoPluginKeys._
+import org.mdedetrich.apache.sonatype.SonatypeApachePlugin
 import sbt.Keys._
 import sbt._
 import sbt.plugins.JvmPlugin
 import com.typesafe.tools.mima.plugin.MimaKeys._
+import sbtdynver.DynVerPlugin
 import xerial.sbt.Sonatype.autoImport.sonatypeProfileName
 
 object Common extends AutoPlugin {
 
   override def trigger = allRequirements
 
-  override def requires = JvmPlugin && CiReleasePlugin
+  override def requires = JvmPlugin && SonatypeApachePlugin && DynVerPlugin
 
   override def globalSettings =
     Seq(
-      organization := "org.apache.pekko",
-      organizationName := "Apache Software Foundation",
-      organizationHomepage := Some(url("https://www.apache.org/")),
       startYear := Some(2022),
-      homepage := Some(url("https://pekko.apache.org/")),
       // apiURL defined in projectSettings because version.value is not correct here
       scmInfo := Some(
         ScmInfo(
@@ -31,7 +28,6 @@ object Common extends AutoPlugin {
         "Contributors",
         "dev@pekko.apache.org",
         url("https://github.com/apache/incubator-pekko-projection/graphs/contributors")),
-      licenses := Seq(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))),
       description := "Apache Pekko Projection.")
 
   override lazy val projectSettings = Seq(
@@ -64,7 +60,9 @@ object Common extends AutoPlugin {
     Test / testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v", "-q"),
     Test / logBuffered := false,
     // temporarily disable mima checks
-    mimaPreviousArtifacts := Set.empty,
-    sonatypeProfileName := "org.apache.pekko")
+    mimaPreviousArtifacts := Set.empty)
+
+  override lazy val buildSettings = Seq(
+    dynverSonatypeSnapshots := true)
 
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
index f351ff9..5234eed 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,7 +2,8 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")
 
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
+addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
+addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.6")
 
 // Documentation
 // We have to deliberately use older versions of sbt-paradox because current Pekko sbt build


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org