Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Akka 2.9.3-M3 and publish to Akka repo #1209

Merged
merged 2 commits into from
Oct 6, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ jobs:
- name: Publish artifacts for all Scala versions
env:
PGP_SECRET: ${{ secrets.PGP_SECRET }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
run: sbt ci-release
PUBLISH_USER: ${{ secrets.PUBLISH_USER }}
PUBLISH_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }}
run: sbt +publishSigned

documentation:
# runs on main repo only
Expand Down
42 changes: 33 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import com.typesafe.sbt.packager.docker.{ Cmd, ExecCmd }
import sbt.Keys.parallelExecution

ThisBuild / resolvers += "Akka library repository".at("https://repo.akka.io/maven")
ThisBuild / resolvers += Resolver.jcenterRepo
Global / excludeLintKeys += autoAPIMappings
Global / excludeLintKeys += projectInfoVersion
Expand All @@ -10,7 +11,7 @@ Global / excludeLintKeys += previewPath
lazy val `akka-management-root` = project
.in(file("."))
.enablePlugins(ScalaUnidocPlugin)
.disablePlugins(MimaPlugin)
.disablePlugins(MimaPlugin, com.geirsson.CiReleasePlugin)
.aggregate(
// When this aggregate is updated the list of modules in ManifestInfo.checkSameVersion
// in AkkaManagement should also be updated
Expand Down Expand Up @@ -52,6 +53,7 @@ lazy val mimaPreviousArtifactsSet =
lazy val `akka-discovery-kubernetes-api` = project
.in(file("discovery-kubernetes-api"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "akka-discovery-kubernetes-api",
organization := "com.lightbend.akka.discovery",
Expand All @@ -63,6 +65,7 @@ lazy val `akka-discovery-kubernetes-api` = project
lazy val `akka-discovery-marathon-api` = project
.in(file("discovery-marathon-api"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "akka-discovery-marathon-api",
organization := "com.lightbend.akka.discovery",
Expand All @@ -73,6 +76,7 @@ lazy val `akka-discovery-marathon-api` = project
lazy val `akka-discovery-aws-api` = project
.in(file("discovery-aws-api"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "akka-discovery-aws-api",
organization := "com.lightbend.akka.discovery",
Expand All @@ -83,6 +87,7 @@ lazy val `akka-discovery-aws-api` = project
lazy val `akka-discovery-aws-api-async` = project
.in(file("discovery-aws-api-async"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "akka-discovery-aws-api-async",
organization := "com.lightbend.akka.discovery",
Expand All @@ -93,6 +98,7 @@ lazy val `akka-discovery-aws-api-async` = project
lazy val `akka-discovery-consul` = project
.in(file("discovery-consul"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "akka-discovery-consul",
organization := "com.lightbend.akka.discovery",
Expand All @@ -104,6 +110,7 @@ lazy val `akka-discovery-consul` = project
lazy val `akka-management` = project
.in(file("management"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "akka-management",
libraryDependencies := Dependencies.ManagementHttp,
Expand All @@ -113,6 +120,7 @@ lazy val `akka-management` = project
lazy val `akka-management-pki` = project
.in(file("management-pki"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "akka-management-pki",
libraryDependencies := Dependencies.ManagementPki,
Expand All @@ -122,6 +130,7 @@ lazy val `akka-management-pki` = project
lazy val `loglevels-logback` = project
.in(file("loglevels-logback"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "akka-management-loglevels-logback",
libraryDependencies := Dependencies.LoglevelsLogback,
Expand All @@ -132,6 +141,7 @@ lazy val `loglevels-logback` = project
lazy val `loglevels-log4j2` = project
.in(file("loglevels-log4j2"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.disablePlugins(MimaPlugin)
.settings(
name := "akka-management-loglevels-log4j2",
Expand All @@ -142,6 +152,7 @@ lazy val `loglevels-log4j2` = project
lazy val `cluster-http` = project
.in(file("cluster-http"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "akka-management-cluster-http",
libraryDependencies := Dependencies.ClusterHttp,
Expand All @@ -152,6 +163,7 @@ lazy val `cluster-http` = project
lazy val `cluster-bootstrap` = project
.in(file("cluster-bootstrap"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "akka-management-cluster-bootstrap",
libraryDependencies := Dependencies.ClusterBootstrap,
Expand All @@ -162,6 +174,7 @@ lazy val `cluster-bootstrap` = project
lazy val `rolling-update-kubernetes` = project
.in(file("rolling-update-kubernetes"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "akka-rolling-update-kubernetes",
libraryDependencies := Dependencies.RollingUpdateKubernetes,
Expand All @@ -176,6 +189,7 @@ lazy val `rolling-update-kubernetes` = project
lazy val `lease-kubernetes` = project
.in(file("lease-kubernetes"))
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "akka-lease-kubernetes",
libraryDependencies := Dependencies.LeaseKubernetes,
Expand All @@ -190,6 +204,7 @@ lazy val `lease-kubernetes` = project
lazy val `lease-kubernetes-int-test` = project
.in(file("lease-kubernetes-int-test"))
.enablePlugins(JavaAppPackaging, DockerPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.dependsOn(`lease-kubernetes`)
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(MimaPlugin)
Expand All @@ -213,8 +228,9 @@ lazy val `lease-kubernetes-int-test` = project

lazy val `integration-test-kubernetes-api` = project
.in(file("integration-test/kubernetes-api"))
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(MimaPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
publish / skip := true,
doc / sources := Seq.empty,
Expand All @@ -224,8 +240,9 @@ lazy val `integration-test-kubernetes-api` = project

lazy val `integration-test-kubernetes-api-java` = project
.in(file("integration-test/kubernetes-api-java"))
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(MimaPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
publish / skip := true,
doc / sources := Seq.empty,
Expand All @@ -240,8 +257,9 @@ lazy val `integration-test-kubernetes-api-java` = project

lazy val `integration-test-kubernetes-dns` = project
.in(file("integration-test/kubernetes-dns"))
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(MimaPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
publish / skip := true,
doc / sources := Seq.empty,
Expand All @@ -256,8 +274,9 @@ lazy val `integration-test-kubernetes-dns` = project
lazy val `integration-test-aws-api-ec2-tag-based` = project
.in(file("integration-test/aws-api-ec2"))
.configs(IntegrationTest)
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(MimaPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
publish / skip := true,
doc / sources := Seq.empty,
Expand All @@ -272,8 +291,9 @@ lazy val `integration-test-aws-api-ec2-tag-based` = project

lazy val `integration-test-marathon-api-docker` = project
.in(file("integration-test/marathon-api-docker"))
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(MimaPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "integration-test-marathon-api-docker",
publish / skip := true,
Expand All @@ -288,8 +308,9 @@ lazy val `integration-test-marathon-api-docker` = project

lazy val `integration-test-aws-api-ecs` = project
.in(file("integration-test/aws-api-ecs"))
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(MimaPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
publish / skip := true,
doc / sources := Seq.empty
Expand All @@ -309,8 +330,9 @@ lazy val `integration-test-aws-api-ecs` = project

lazy val `integration-test-local` = project
.in(file("integration-test/local"))
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(MimaPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "integration-test-local",
publish / skip := true,
Expand All @@ -326,8 +348,9 @@ lazy val `integration-test-local` = project

lazy val `integration-test-rollingupdate-kubernetes` = project
.in(file("integration-test/rollingupdate-kubernetes"))
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(MimaPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
publish / skip := true,
doc / sources := Seq.empty,
Expand All @@ -345,6 +368,7 @@ lazy val docs = project
.in(file("docs"))
.enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin, PublishRsyncPlugin)
.disablePlugins(MimaPlugin)
.disablePlugins(com.geirsson.CiReleasePlugin)
.settings(
name := "Akka Management",
publish / skip := true,
Expand Down
6 changes: 3 additions & 3 deletions docs/release-train-issue-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ Variables to be expanded in this template:
- [ ] Make sure all important PRs have been merged
- [ ] Wait until [main build finished](https://github.com/akka/akka-management/actions) after merging the latest PR
- [ ] Update the [draft release](https://github.com/akka/akka-management/releases) with the next tag version `v$VERSION$`, title and release description. Use the `Publish release` button, which will create the tag.
- [ ] Check that GitHub Actions release build has executed successfully (GitHub Actions will start a [CI build](https://github.com/akka/akka-management/actions) for the new tag and publish artifacts to Maven central via Sonatype)
- [ ] Check that GitHub Actions release build has executed successfully (GitHub Actions will start a [CI build](https://github.com/akka/akka-management/actions) for the new tag and publish artifacts to https://repo.akka.io/maven)

### Check availability

- [ ] Check [API](https://doc.akka.io/api/akka-management/$VERSION$/) documentation
- [ ] Check [reference](https://doc.akka.io/docs/akka-management/$VERSION$/) documentation. Check that the reference docs were deployed and show a version warning (see section below on how to fix the version warning).
- [ ] Check the release on [Maven central](https://repo1.maven.org/maven2/com/lightbend/akka/management/akka-management_2.13/$VERSION$/)
- [ ] Check the release on https://repo.akka.io/maven/com/lightbend/akka/management/akka-management_2.13/$VERSION$/akka-management-cluster-http_2.13-$VERSION$.pom

### When everything is on maven central
### When everything is on https://repo.akka.io/maven
- [ ] Log into `gustav.akka.io` as `akkarepo`
- [ ] If this updates the `current` version, run `./update-akka-management-current-version.sh $VERSION$`
- [ ] otherwise check changes and commit the new version to the local git repository
Expand Down
2 changes: 2 additions & 0 deletions integration-test/aws-api-ec2/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
enablePlugins(JavaAppPackaging)

resolvers += "Akka library repository".at("https://repo.akka.io/maven")

Universal / packageName := "app" // should produce app.zip

libraryDependencies += "com.amazonaws" % "aws-java-sdk-cloudformation" % "1.12.561" % IntegrationTest
Expand Down
3 changes: 3 additions & 0 deletions integration-test/dns-api-mesos/build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
enablePlugins(JavaAppPackaging)

resolvers += "Akka library repository".at("https://repo.akka.io/maven")

name := "bootstrap-demo-dns-api"

scalaVersion := "2.13.12"
Expand Down
8 changes: 8 additions & 0 deletions integration-test/kubernetes-api-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@
<scala.binary.version>2.13</scala.binary.version>
</properties>

<repositories>
<repository>
<id>akka-repository</id>
<name>Akka library repository</name>
<url>https://repo.akka.io/maven</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>com.typesafe.akka</groupId>
Expand Down
2 changes: 2 additions & 0 deletions integration-test/kubernetes-api/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import com.typesafe.sbt.packager.docker._

enablePlugins(JavaServerAppPackaging)

resolvers += "Akka library repository".at("https://repo.akka.io/maven")

version := "1.3.3.7" // we hard-code the version here, it could be anything really

dockerCommands :=
Expand Down
3 changes: 3 additions & 0 deletions integration-test/kubernetes-dns/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import com.typesafe.sbt.packager.docker._

enablePlugins(JavaServerAppPackaging)

resolvers += "Akka library repository".at("https://repo.akka.io/maven")

version := "1.3.3.7" // we hard-code the version here, it could be anything really
dockerCommands :=
dockerCommands.value.flatMap {
Expand All @@ -16,3 +18,4 @@ dockerCommands ++= Seq(
Cmd("USER", "root"),
Cmd("RUN", "chgrp -R 0 . && chmod -R g=u .")
)

2 changes: 2 additions & 0 deletions integration-test/marathon-api-docker/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ scalaVersion := "2.13.12"

enablePlugins(JavaServerAppPackaging)

resolvers += "Akka library repository".at("https://repo.akka.io/maven")

version := "1.0"

dockerUsername := sys.env.get("DOCKER_USER")
Expand Down
2 changes: 2 additions & 0 deletions integration-test/marathon-api/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ enablePlugins(JavaServerAppPackaging)

name := "bootstrap-demo-marathon-api"

resolvers += "Akka library repository".at("https://repo.akka.io/maven")

version := "0.1.0"

scalaVersion := "2.13.12"
Expand Down
2 changes: 2 additions & 0 deletions integration-test/rollingupdate-kubernetes/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

enablePlugins(JavaAppPackaging, DockerPlugin)

resolvers += "Akka library repository".at("https://repo.akka.io/maven")

version := "1.3.3.7" // we hard-code the version here, it could be anything really

dockerExposedPorts := Seq(8080, 8558, 2552)
Expand Down
6 changes: 2 additions & 4 deletions project/Common.scala
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import com.geirsson.CiReleasePlugin
import com.lightbend.paradox.projectinfo.ParadoxProjectInfoPluginKeys._
import org.scalafmt.sbt.ScalafmtPlugin.autoImport._
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
Expand All @@ -10,7 +9,7 @@ import xerial.sbt.Sonatype.autoImport.sonatypeProfileName
object Common extends AutoPlugin {

override def trigger = allRequirements
override def requires = plugins.JvmPlugin && HeaderPlugin && CiReleasePlugin
override def requires = plugins.JvmPlugin && HeaderPlugin

val currentYear = "2023"

Expand Down Expand Up @@ -89,8 +88,7 @@ object Common extends AutoPlugin {
// -v Log "test run started" / "test started" / "test run finished" events on log level "info" instead of "debug".
// -a Show stack traces and exception class name for AssertionErrors.
testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
scalaVersion := Dependencies.CrossScalaVersions.head,
sonatypeProfileName := "com.lightbend"
scalaVersion := Dependencies.CrossScalaVersions.head
)

val isJdk11orHigher: Boolean = {
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ object Dependencies {
val CrossScalaVersions = Seq(Scala213, Scala3)

// Align the versions in integration-test/kubernetes-api-java/pom.xml
val AkkaVersion = "2.9.0-M2"
val AkkaVersion = "2.9.0-M3"
val AkkaBinaryVersion = "2.9"
// Align the versions in integration-test/kubernetes-api-java/pom.xml
val AkkaHttpVersion = "10.6.0-M1"
val AkkaHttpVersion = "10.6.0-M2"
val AkkaHttpBinaryVersion = "10.6"

val ScalaTestVersion = "3.2.17"
Expand Down
Loading
Loading