Merge pull request #57 from adform/migrate-to-central-portal

Use Maven Central Publisher Portal

Author: Srb1996

.github/workflows/publish.yml

@@ -42,12 +42,12 @@ jobs:
         gpg_private_key: ${{ secrets.PGP_SECRET }}
         passphrase: ${{ secrets.PGP_PASSPHRASE }}
 
-    - name: Publish to Sonatype
+    - name: Publish to Central Portal
       env:
         SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
         SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
       run: |
-          sbt -Dsbt.color=always -Dsbt.supershell=false publishSigned sonatypeBundleRelease
+        sbt -Dsbt.color=always -Dsbt.supershell=false publishSigned sonaRelease
 
     - name: Publish API docs to GitHub Pages
       run: |

build.sbt

@@ -1,7 +1,5 @@
 name := "stream-loader"
 
-ThisBuild / organization := "com.adform"
-ThisBuild / organizationName := "Adform"
 ThisBuild / scalaVersion := "2.13.15"
 ThisBuild / scalacOptions := Seq(
   "-unchecked",
@@ -14,17 +12,9 @@ ThisBuild / scalacOptions := Seq(
   "-Wconf:msg=While parsing annotations in:silent"
 )
 
-ThisBuild / startYear := Some(2020)
-ThisBuild / licenses += ("MPL-2.0", url("http://mozilla.org/MPL/2.0/"))
-
-ThisBuild / developers := List(
-  Developer("sauliusvl", "Saulius Valatka", "saulius.vl@gmail.com", url("https://github.com/sauliusvl"))
-)
-
 enablePlugins(GitVersioning)
 
-val gitRepo = "adform/stream-loader"
-val gitRepoUrl = s"https://github.com/$gitRepo"
+import BuildSettings._
 
 ThisBuild / git.useGitDescribe := true
 ThisBuild / git.remoteRepo := {
@@ -290,10 +280,7 @@ lazy val commonSettings = Seq(
         .getMethod("getLogger", cl.loadClass("java.lang.String"))
         .invoke(null, "ROOT") // Prevents slf4j replay warnings during tests
     )
-  ),
-  publishTo := sonatypePublishToBundle.value,
-  homepage := Some(url(gitRepoUrl)),
-  scmInfo := Some(ScmInfo(url(gitRepoUrl), s"scm:git:git@github.com:$gitRepo.git"))
+  )
 )
 
 lazy val copyDocAssets = taskKey[File]("Copy unidoc resources")

project/BuildSettings.scala

@@ -0,0 +1,4 @@
+object BuildSettings {
+  val gitRepo = "adform/stream-loader"
+  val gitRepoUrl = s"https://github.com/$gitRepo"
+}

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.11.3

project/plugins.sbt

@@ -21,5 +21,3 @@ libraryDependencies += "net.sourceforge.plantuml" % "plantuml" % "1.2024.8"
 addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0")
 
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0")
-
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")

publish.sbt

@@ -0,0 +1,37 @@
+ThisBuild / organization := "com.adform"
+ThisBuild / organizationName := "Adform"
+ThisBuild / organizationHomepage := Some(url("https://www.adform.com"))
+
+import BuildSettings._
+
+ThisBuild / startYear := Some(2020)
+ThisBuild / description := "Stream Loader: load data from Kafka into multiple backends"
+ThisBuild / homepage := Some(url(gitRepoUrl))
+
+ThisBuild / licenses := List(
+  "MPL-2.0" -> url("http://mozilla.org/MPL/2.0/")
+)
+
+ThisBuild / developers := List(
+  Developer(
+    id = "sauliusvl",
+    name = "Saulius Valatka",
+    email = "saulius.vl@gmail.com",
+    url = url("https://github.com/sauliusvl")
+  )
+)
+
+ThisBuild / scmInfo := Some(
+  ScmInfo(url(gitRepoUrl), s"scm:git:git@github.com:$gitRepo.git")
+)
+
+// Remove all additional repository other than Maven Central from POM
+ThisBuild / pomIncludeRepository := { _ => false }
+ThisBuild / publishMavenStyle := true
+
+// Use Central Portal instead of OSSRH
+ThisBuild / publishTo := {
+  val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/"
+  if (isSnapshot.value) Some("central-snapshots" at centralSnapshots)
+  else localStaging.value
+}

stream-loader-tests/src/test/scala/com/adform/streamloader/VerticaIntegrationTests.scala

@@ -12,6 +12,7 @@ import com.adform.streamloader.behaviors.BasicLoaderBehaviors
 import com.adform.streamloader.fixtures._
 import com.adform.streamloader.storage._
 import com.zaxxer.hikari.{HikariConfig, HikariDataSource}
+import org.scalatest.Ignore
 import org.scalatest.concurrent.Eventually
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.should.Matchers
@@ -21,6 +22,9 @@ import org.scalatestplus.scalacheck.Checkers
 import scala.concurrent.ExecutionContext
 
 @Slow
+// Temporarily ignore Vertica tests, vertica-ce image is not available on DockerHub
+// https://github.com/vertica/vertica-containers/issues/64
+@Ignore
 class VerticaIntegrationTests
     extends AnyFunSpec
     with Matchers