[incubator-pekko] branch main updated: Properly set sonatype repo settings for publishTo

[md...@apache.org]

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.git


The following commit(s) were added to refs/heads/main by this push:
     new beb13d23ef Properly set sonatype repo settings for publishTo
beb13d23ef is described below

commit beb13d23ef6902e782ec6118167f3bc133f7e149
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Thu Jan 26 12:22:57 2023 +0100

    Properly set sonatype repo settings for publishTo
---
 project/Publish.scala | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/project/Publish.scala b/project/Publish.scala
index 78187f2b77..92df8658e0 100644
--- a/project/Publish.scala
+++ b/project/Publish.scala
@@ -16,18 +16,20 @@ package org.apache.pekko
 import sbt._
 import sbt.Keys._
 import com.lightbend.sbt.publishrsync.PublishRsyncPlugin.autoImport.publishRsyncHost
-import xerial.sbt.Sonatype.autoImport.sonatypeProfileName
+import xerial.sbt.Sonatype.autoImport._
 
 object Publish extends AutoPlugin {
 
   override def trigger = allRequirements
 
+  private val apacheBaseRepo = "repository.apache.org"
+
   override lazy val projectSettings = Seq(
-    publishTo := Some(pekkoPublishTo.value),
     publishRsyncHost := "akkarepo@gustav.akka.io",
     credentials ++= apacheNexusCredentials,
     organizationName := "Apache Software Foundation",
     organizationHomepage := Some(url("https://www.apache.org")),
+    sonatypeCredentialHost := apacheBaseRepo,
     sonatypeProfileName := "org.apache.pekko",
     startYear := Some(2022),
     developers := List(
@@ -39,17 +41,10 @@ object Publish extends AutoPlugin {
     publishMavenStyle := true,
     pomIncludeRepository := (_ => false))
 
-  private def pekkoPublishTo = Def.setting {
-    if (isSnapshot.value)
-      "apache-snapshots".at("https://repository.apache.org/content/repositories/snapshots")
-    else
-      Opts.resolver.sonatypeStaging
-  }
-
   private def apacheNexusCredentials: Seq[Credentials] =
     (sys.env.get("NEXUS_USER"), sys.env.get("NEXUS_PW")) match {
       case (Some(user), Some(password)) =>
-        Seq(Credentials("Apache Nexus Repository Manager", "repository.apache.org", user, password))
+        Seq(Credentials("Apache Nexus Repository Manager", apacheBaseRepo, user, password))
       case _ =>
         Seq.empty
     }


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