Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
17 changes: 2 additions & 15 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
name := "stream-loader"

ThisBuild / organization := "com.adform"
ThisBuild / organizationName := "Adform"
ThisBuild / scalaVersion := "2.13.15"
ThisBuild / scalacOptions := Seq(
"-unchecked",
Expand All @@ -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", "[email protected]", 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 := {
Expand Down Expand Up @@ -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:[email protected]:$gitRepo.git"))
)
)

lazy val copyDocAssets = taskKey[File]("Copy unidoc resources")
Expand Down
4 changes: 4 additions & 0 deletions project/BuildSettings.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
object BuildSettings {
val gitRepo = "adform/stream-loader"
val gitRepoUrl = s"https://github.com/$gitRepo"
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.11.3
2 changes: 0 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
37 changes: 37 additions & 0 deletions publish.sbt
Original file line number Diff line number Diff line change
@@ -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 = "[email protected]",
url = url("https://github.com/sauliusvl")
)
)

ThisBuild / scmInfo := Some(
ScmInfo(url(gitRepoUrl), s"scm:git:[email protected]:$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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down