This is an automated email from the ASF dual-hosted git repository.
nvollmar pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-management.git
The following commit(s) were added to refs/heads/main by this push:
new ee005c8 Use Pekko name (#10)
ee005c8 is described below
commit ee005c8866edf397d43f02ad62f732d752102500
Author: Nicolas Vollmar <[email protected]>
AuthorDate: Mon Feb 27 14:37:10 2023 +0100
Use Pekko name (#10)
---
.github/workflows/format.yml | 2 +-
.scalafmt.conf | 2 +-
build.sbt | 240 ++++++++++++-------------
docs/src/main/paradox/akka-management.md | 2 +-
docs/src/main/paradox/discovery/aws.md | 2 +-
docs/src/main/paradox/discovery/consul.md | 2 +-
docs/src/main/paradox/discovery/kubernetes.md | 2 +-
docs/src/main/paradox/discovery/marathon.md | 2 +-
integration-test/kubernetes-api-java/pom.xml | 22 +--
integration-test/kubernetes-api-java/test.sh | 4 +-
integration-test/marathon-api-docker/build.sbt | 6 +-
integration-test/marathon-api/build.sbt | 4 +-
lease-kubernetes-int-test/kubernetes/job.yml | 2 +-
project/Common.scala | 29 +--
project/project-info.conf | 12 +-
15 files changed, 162 insertions(+), 171 deletions(-)
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 9ce98e5..0cd8e56 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -20,5 +20,5 @@ jobs:
- name: Check project is formatted
uses: jrouly/scalafmt-native-action@v2
with:
- version: '3.6.1'
+ version: '3.7.1'
arguments: '--list --mode diff-ref=origin/main'
diff --git a/.scalafmt.conf b/.scalafmt.conf
index efa297e..1aae8a4 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.6.1
+version = 3.7.1
runner.dialect = scala213
project.git = true
style = defaultWithAlign
diff --git a/build.sbt b/build.sbt
index f723ea6..3d5bdaa 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,171 +4,164 @@ import sbt.Keys.parallelExecution
ThisBuild / resolvers += Resolver.jcenterRepo
// root
-lazy val `akka-management-root` = project
+lazy val root = project
.in(file("."))
.enablePlugins(ScalaUnidocPlugin)
.disablePlugins(MimaPlugin)
.aggregate(
// When this aggregate is updated the list of modules in
ManifestInfo.checkSameVersion
- // in AkkaManagement should also be updated
- `akka-discovery-aws-api`,
- `akka-discovery-aws-api-async`,
- `akka-discovery-consul`,
- `akka-discovery-kubernetes-api`,
- `akka-discovery-marathon-api`,
- `akka-management`,
- `akka-management-pki`,
- `loglevels-logback`,
- `loglevels-log4j2`,
- `integration-test-aws-api-ec2-tag-based`,
- `integration-test-local`,
- `integration-test-aws-api-ecs`,
- `integration-test-kubernetes-api`,
- `integration-test-kubernetes-api-java`,
- `integration-test-kubernetes-dns`,
- `integration-test-marathon-api-docker`,
- `cluster-http`,
- `cluster-bootstrap`,
- `lease-kubernetes`,
- `lease-kubernetes-int-test`,
+ // in management should also be updated
+ discoveryAwsApi,
+ discoveryAwsApiAsync,
+ discoveryConsul,
+ discoveryKubernetesApi,
+ discoveryMarathonApi,
+ management,
+ managementPki,
+ loglevelsLogback,
+ loglevelsLog4j2,
+ integrationTestAwsApiEc2TagBased,
+ integrationTestLocal,
+ integrationTestAwsApiEcs,
+ integrationTestKubernetesApi,
+ integrationTestKubernetesApiJava,
+ integrationTestKubernetesDns,
+ integrationTestMarathonApiDocker,
+ clusterHttp,
+ clusterBootstrap,
+ leaseKubernetes,
+ leaseKubernetesIntTest,
docs)
.settings(
GlobalScope / parallelExecution := false,
publish / skip := true)
-lazy val mimaPreviousArtifactsSet =
- mimaPreviousArtifacts := Set.empty // temporarily disable mima checks
+lazy val mimaPreviousArtifactsSet = mimaPreviousArtifacts := Set.empty //
temporarily disable mima checks
-lazy val `akka-discovery-kubernetes-api` = project
- .in(file("discovery-kubernetes-api"))
+lazy val discoveryKubernetesApi = pekkoModule("discovery-kubernetes-api")
.enablePlugins(AutomateHeaderPlugin)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(
- name := "akka-discovery-kubernetes-api",
- organization := "com.lightbend.akka.discovery",
+ name := "pekko-discovery-kubernetes-api",
libraryDependencies := Dependencies.DiscoveryKubernetesApi,
mimaPreviousArtifactsSet)
.settings(MetaInfLicenseNoticeCopy.settings)
- .dependsOn(`akka-management-pki`)
+ .dependsOn(managementPki)
-lazy val `akka-discovery-marathon-api` = project
- .in(file("discovery-marathon-api"))
+lazy val discoveryMarathonApi = pekkoModule("discovery-marathon-api")
.enablePlugins(AutomateHeaderPlugin)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(
- name := "akka-discovery-marathon-api",
- organization := "com.lightbend.akka.discovery",
+ name := "pekko-discovery-marathon-api",
libraryDependencies := Dependencies.DiscoveryMarathonApi,
mimaPreviousArtifactsSet)
.settings(MetaInfLicenseNoticeCopy.settings)
-lazy val `akka-discovery-aws-api` = project
- .in(file("discovery-aws-api"))
+lazy val discoveryAwsApi = pekkoModule("discovery-aws-api")
.enablePlugins(AutomateHeaderPlugin)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(
- name := "akka-discovery-aws-api",
- organization := "com.lightbend.akka.discovery",
+ name := "pekko-discovery-aws-api",
libraryDependencies := Dependencies.DiscoveryAwsApi,
mimaPreviousArtifactsSet)
.settings(MetaInfLicenseNoticeCopy.settings)
-lazy val `akka-discovery-aws-api-async` = project
- .in(file("discovery-aws-api-async"))
+lazy val discoveryAwsApiAsync = pekkoModule("discovery-aws-api-async")
.enablePlugins(AutomateHeaderPlugin)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(
- name := "akka-discovery-aws-api-async",
- organization := "com.lightbend.akka.discovery",
+ name := "pekko-discovery-aws-api-async",
libraryDependencies := Dependencies.DiscoveryAwsApiAsync,
mimaPreviousArtifactsSet)
.settings(MetaInfLicenseNoticeCopy.settings)
-lazy val `akka-discovery-consul` = project
- .in(file("discovery-consul"))
+lazy val discoveryConsul = pekkoModule("discovery-consul")
.enablePlugins(AutomateHeaderPlugin)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(
- name := "akka-discovery-consul",
- organization := "com.lightbend.akka.discovery",
+ name := "pekko-discovery-consul",
libraryDependencies := Dependencies.DiscoveryConsul,
mimaPreviousArtifactsSet)
.settings(MetaInfLicenseNoticeCopy.settings)
// gathers all enabled routes and serves them (HTTP or otherwise)
-lazy val `akka-management` = project
- .in(file("management"))
+lazy val management = pekkoModule("management")
.enablePlugins(AutomateHeaderPlugin)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(
- name := "akka-management",
+ name := "pekko-management",
libraryDependencies := Dependencies.ManagementHttp,
mimaPreviousArtifactsSet)
.settings(MetaInfLicenseNoticeCopy.settings)
-lazy val `akka-management-pki` = project
- .in(file("management-pki"))
+lazy val managementPki = pekkoModule("management-pki")
.enablePlugins(AutomateHeaderPlugin)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(
- name := "akka-management-pki",
+ name := "pekko-management-pki",
libraryDependencies := Dependencies.ManagementPki,
mimaPreviousArtifactsSet)
.settings(MetaInfLicenseNoticeCopy.settings)
-lazy val `loglevels-logback` = project
- .in(file("loglevels-logback"))
+lazy val loglevelsLogback = pekkoModule("loglevels-logback") // todo: rename
project/folder to management-loglevels-logback
.enablePlugins(AutomateHeaderPlugin)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(
- name := "akka-management-loglevels-logback",
+ name := "pekko-management-loglevels-logback",
libraryDependencies := Dependencies.LoglevelsLogback,
mimaPreviousArtifactsSet)
.settings(MetaInfLicenseNoticeCopy.settings)
- .dependsOn(`akka-management`)
+ .dependsOn(management)
-lazy val `loglevels-log4j2` = project
- .in(file("loglevels-log4j2"))
+lazy val loglevelsLog4j2 = pekkoModule("loglevels-log4j2") // todo: rename
project/folder to management-loglevels-log4j2
.enablePlugins(AutomateHeaderPlugin)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.disablePlugins(MimaPlugin)
.settings(
- name := "akka-management-loglevels-log4j2",
+ name := "pekko-management-loglevels-log4j2",
libraryDependencies := Dependencies.LoglevelsLog4j2)
.settings(MetaInfLicenseNoticeCopy.settings)
- .dependsOn(`akka-management`)
+ .dependsOn(management)
-lazy val `cluster-http` = project
- .in(file("cluster-http"))
+lazy val clusterHttp = pekkoModule("cluster-http") // todo: rename
project/folder to management-cluster-http
.enablePlugins(AutomateHeaderPlugin)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(
- name := "akka-management-cluster-http",
+ name := "pekko-management-cluster-http",
libraryDependencies := Dependencies.ClusterHttp,
mimaPreviousArtifactsSet)
.settings(MetaInfLicenseNoticeCopy.settings)
- .dependsOn(`akka-management`)
+ .dependsOn(management)
-lazy val `cluster-bootstrap` = project
- .in(file("cluster-bootstrap"))
+lazy val clusterBootstrap = pekkoModule("cluster-bootstrap") // todo: rename
project/folder to management-cluster-bootstrap
.enablePlugins(AutomateHeaderPlugin)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(
- name := "akka-management-cluster-bootstrap",
+ name := "pekko-management-cluster-bootstrap",
libraryDependencies := Dependencies.ClusterBootstrap,
mimaPreviousArtifactsSet)
.settings(MetaInfLicenseNoticeCopy.settings)
- .dependsOn(`akka-management`)
+ .dependsOn(management)
-lazy val `lease-kubernetes` = project
- .in(file("lease-kubernetes"))
+lazy val leaseKubernetes = pekkoModule("lease-kubernetes")
.enablePlugins(AutomateHeaderPlugin)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(
- name := "akka-lease-kubernetes",
+ name := "pekko-lease-kubernetes",
libraryDependencies := Dependencies.LeaseKubernetes,
mimaPreviousArtifactsSet)
.settings(Defaults.itSettings)
.settings(MetaInfLicenseNoticeCopy.settings)
.configs(IntegrationTest)
- .dependsOn(`akka-management-pki`)
+ .dependsOn(managementPki)
-lazy val `lease-kubernetes-int-test` = project
- .in(file("lease-kubernetes-int-test"))
+lazy val leaseKubernetesIntTest = pekkoModule("lease-kubernetes-int-test")
.enablePlugins(JavaAppPackaging, DockerPlugin)
- .dependsOn(`lease-kubernetes`)
+ .dependsOn(leaseKubernetes)
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(MimaPlugin)
.settings(
- name := "akka-lease-kubernetes-int-test",
+ name := "pekko-lease-kubernetes-int-test",
publish / skip := true,
libraryDependencies := Dependencies.LeaseKubernetesTest,
version ~= (_.replace('+', '-')),
@@ -182,11 +175,10 @@ lazy val `lease-kubernetes-int-test` = project
Cmd("USER", "root"),
Cmd("RUN", "chgrp -R 0 . && chmod -R g=u ."),
Cmd("RUN", "/sbin/apk", "add", "--no-cache", "bash", "bind-tools",
"busybox-extras", "curl", "strace"),
- Cmd("RUN", "chmod +x /opt/docker/bin/akka-lease-kubernetes-int-test")))
+ Cmd("RUN", "chmod +x /opt/docker/bin/pekko-lease-kubernetes-int-test")))
.settings(MetaInfLicenseNoticeCopy.settings)
-lazy val `integration-test-kubernetes-api` = project
- .in(file("integration-test/kubernetes-api"))
+lazy val integrationTestKubernetesApi = pekkoIntTestModule("kubernetes-api")
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.settings(
@@ -194,10 +186,9 @@ lazy val `integration-test-kubernetes-api` = project
doc / sources := Seq.empty,
libraryDependencies := Dependencies.BootstrapDemos)
.settings(MetaInfLicenseNoticeCopy.settings)
- .dependsOn(`akka-management`, `cluster-http`, `cluster-bootstrap`,
`akka-discovery-kubernetes-api`)
+ .dependsOn(management, clusterHttp, clusterBootstrap, discoveryKubernetesApi)
-lazy val `integration-test-kubernetes-api-java` = project
- .in(file("integration-test/kubernetes-api-java"))
+lazy val integrationTestKubernetesApiJava =
pekkoIntTestModule("kubernetes-api-java")
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.settings(
@@ -206,13 +197,12 @@ lazy val `integration-test-kubernetes-api-java` = project
libraryDependencies := Dependencies.BootstrapDemos)
.settings(MetaInfLicenseNoticeCopy.settings)
.dependsOn(
- `akka-management`,
- `cluster-http`,
- `cluster-bootstrap`,
- `akka-discovery-kubernetes-api`)
+ management,
+ clusterHttp,
+ clusterBootstrap,
+ discoveryKubernetesApi)
-lazy val `integration-test-kubernetes-dns` = project
- .in(file("integration-test/kubernetes-dns"))
+lazy val integrationTestKubernetesDns = pekkoIntTestModule("kubernetes-dns")
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.settings(
@@ -221,12 +211,11 @@ lazy val `integration-test-kubernetes-dns` = project
libraryDependencies := Dependencies.BootstrapDemos)
.settings(MetaInfLicenseNoticeCopy.settings)
.dependsOn(
- `akka-management`,
- `cluster-http`,
- `cluster-bootstrap`)
+ management,
+ clusterHttp,
+ clusterBootstrap)
-lazy val `integration-test-aws-api-ec2-tag-based` = project
- .in(file("integration-test/aws-api-ec2"))
+lazy val integrationTestAwsApiEc2TagBased = pekkoIntTestModule("aws-api-ec2")
.configs(IntegrationTest)
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
@@ -236,13 +225,12 @@ lazy val `integration-test-aws-api-ec2-tag-based` =
project
Defaults.itSettings)
.settings(MetaInfLicenseNoticeCopy.settings)
.dependsOn(
- `akka-management`,
- `cluster-http`,
- `akka-discovery-aws-api`,
- `cluster-bootstrap`)
+ management,
+ clusterHttp,
+ discoveryAwsApi,
+ clusterBootstrap)
-lazy val `integration-test-marathon-api-docker` = project
- .in(file("integration-test/marathon-api-docker"))
+lazy val integrationTestMarathonApiDocker =
pekkoIntTestModule("marathon-api-docker")
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.settings(
@@ -251,13 +239,12 @@ lazy val `integration-test-marathon-api-docker` = project
doc / sources := Seq.empty)
.settings(MetaInfLicenseNoticeCopy.settings)
.dependsOn(
- `akka-management`,
- `cluster-http`,
- `cluster-bootstrap`,
- `akka-discovery-marathon-api`)
+ management,
+ clusterHttp,
+ clusterBootstrap,
+ discoveryMarathonApi)
-lazy val `integration-test-aws-api-ecs` = project
- .in(file("integration-test/aws-api-ecs"))
+lazy val integrationTestAwsApiEcs = pekkoIntTestModule("aws-api-ecs")
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.settings(
@@ -265,18 +252,17 @@ lazy val `integration-test-aws-api-ecs` = project
doc / sources := Seq.empty)
.settings(MetaInfLicenseNoticeCopy.settings)
.dependsOn(
- `akka-management`,
- `cluster-http`,
- `cluster-bootstrap`,
- `akka-discovery-aws-api-async`)
+ management,
+ clusterHttp,
+ clusterBootstrap,
+ discoveryAwsApiAsync)
.enablePlugins(JavaAppPackaging, AshScriptPlugin, DockerPlugin)
.settings(
dockerBaseImage := "openjdk:10-jre-slim",
Docker / com.typesafe.sbt.SbtNativePackager.autoImport.packageName :=
"ecs-integration-test-app",
Docker / version := "1.0")
-lazy val `integration-test-local` = project
- .in(file("integration-test/local"))
+lazy val integrationTestLocal = pekkoIntTestModule("local")
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.settings(
@@ -286,9 +272,9 @@ lazy val `integration-test-local` = project
libraryDependencies := Dependencies.BootstrapDemos)
.settings(MetaInfLicenseNoticeCopy.settings)
.dependsOn(
- `akka-management`,
- `cluster-http`,
- `cluster-bootstrap`)
+ management,
+ clusterHttp,
+ clusterBootstrap)
.enablePlugins(JavaAppPackaging, AshScriptPlugin)
lazy val docs = project
@@ -296,32 +282,38 @@ lazy val docs = project
.enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin,
PublishRsyncPlugin)
.disablePlugins(MimaPlugin)
.settings(
- name := "Akka Management",
+ name := "Pekko Management",
publish / skip := true,
makeSite := makeSite.dependsOn(LocalRootProject / ScalaUnidoc / doc).value,
- Preprocess / siteSubdirName := s"api/akka-management/${if
(isSnapshot.value) "snapshot" else version.value}",
+ Preprocess / siteSubdirName := s"api/pekko-management/${if
(isSnapshot.value) "snapshot" else version.value}",
Preprocess / sourceDirectory := (LocalRootProject / ScalaUnidoc / unidoc /
target).value,
Preprocess / preprocessRules := Seq(
("\\.java\\.scala".r, _ => ".java")),
previewPath := (Paradox / siteSubdirName).value,
paradoxGroups := Map("Language" -> Seq("Java", "Scala")),
- Paradox / siteSubdirName := s"docs/akka-management/${if (isSnapshot.value)
"snapshot" else version.value}",
+ Paradox / siteSubdirName := s"docs/pekko-management/${if
(isSnapshot.value) "snapshot" else version.value}",
Compile / paradoxProperties ++= Map(
"date.year" -> Common.currentYear,
- "project.url" -> "https://doc.akka.io/docs/akka-management/current/";,
- "canonical.base_url" ->
"https://doc.akka.io/docs/akka-management/current";,
+ "project.url" ->
"https://pekko.apache.org/docs/pekko-management/current/";,
+ "canonical.base_url" ->
"https://pekko.apache.org/docs/pekko-management/current";,
"scala.binary.version" -> scalaBinaryVersion.value,
"akka.version" -> Dependencies.AkkaVersion,
- "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/current/%s";,
- "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/current/";,
- "extref.akka-http.base_url" ->
s"https://doc.akka.io/docs/akka-http/${Dependencies.AkkaHttpBinaryVersion}/%s";,
- "scaladoc.akka.http.base_url" ->
s"https://doc.akka.io/api/akka-http/${Dependencies.AkkaHttpBinaryVersion}/";,
- "extref.akka-grpc.base_url" ->
s"https://doc.akka.io/docs/akka-grpc/current/%s";,
- "extref.akka-enhancements.base_url" ->
s"https://doc.akka.io/docs/akka-enhancements/current/%s";,
+ "extref.akka.base_url" ->
s"https://pekko.apache.org/docs/pekko/current/%s";,
+ "scaladoc.akka.base_url" ->
s"https://pekko.apache.org/api/pekko/current/";,
+ "extref.akka-http.base_url" ->
s"https://pekko.apache.org/docs/pekko-http/${Dependencies.AkkaHttpBinaryVersion}/%s";,
+ "scaladoc.akka.http.base_url" ->
s"https://pekko.apache.org/api/pekko-http/${Dependencies.AkkaHttpBinaryVersion}/";,
+ "extref.akka-grpc.base_url" ->
s"https://pekko.apache.org/docs/pekko-grpc/current/%s";,
+ "extref.akka-enhancements.base_url" ->
s"https://pekko.apache.org/docs/pekko-enhancements/current/%s";,
"scaladoc.akka.management.base_url" -> s"/${(Preprocess /
siteSubdirName).value}/"),
publishRsyncArtifacts += makeSite.value -> "www/",
publishRsyncHost := "[email protected]")
+def pekkoModule(moduleName: String): Project =
+ Project(id = moduleName, base = file(moduleName))
+
+def pekkoIntTestModule(moduleName: String): Project =
+ Project(id = s"integration-test-$moduleName", base =
file(s"integration-test/$moduleName"))
+
TaskKey[Unit]("verifyCodeFmt") := {
scalafmtCheckAll.all(ScopeFilter(inAnyProject)).result.value.toEither.left.foreach
{ _ =>
throw new MessageOnlyException(
diff --git a/docs/src/main/paradox/akka-management.md
b/docs/src/main/paradox/akka-management.md
index b261f30..79e45dd 100644
--- a/docs/src/main/paradox/akka-management.md
+++ b/docs/src/main/paradox/akka-management.md
@@ -5,7 +5,7 @@ management extensions.
## Project Info
-@@project-info{ projectId="akka-management" }
+@@project-info{ projectId="management" }
## Dependencies
diff --git a/docs/src/main/paradox/discovery/aws.md
b/docs/src/main/paradox/discovery/aws.md
index 2d8d03c..52be1d7 100644
--- a/docs/src/main/paradox/discovery/aws.md
+++ b/docs/src/main/paradox/discovery/aws.md
@@ -25,7 +25,7 @@ instead.
## Project Info
-@@project-info{ projectId="akka-discovery-aws-api" }
+@@project-info{ projectId="discovery-aws-api" }
### Discovery Method: AWS API - EC2 Tag-Based Discovery
diff --git a/docs/src/main/paradox/discovery/consul.md
b/docs/src/main/paradox/discovery/consul.md
index 3fa389f..c853ae3 100644
--- a/docs/src/main/paradox/discovery/consul.md
+++ b/docs/src/main/paradox/discovery/consul.md
@@ -14,7 +14,7 @@ If you are using Consul to do the service discovery this
would allow you to base
## Project Info
-@@project-info{ projectId="akka-discovery-consul" }
+@@project-info{ projectId="discovery-consul" }
@@dependency[sbt,Gradle,Maven] {
symbol1=AkkaManagementVersion
diff --git a/docs/src/main/paradox/discovery/kubernetes.md
b/docs/src/main/paradox/discovery/kubernetes.md
index a220d9a..496cbe4 100644
--- a/docs/src/main/paradox/discovery/kubernetes.md
+++ b/docs/src/main/paradox/discovery/kubernetes.md
@@ -6,7 +6,7 @@ The typical way to consume a service in Kubernetes is to
discover it through DNS
## Project Info
-@@project-info{ projectId="akka-discovery-kubernetes-api" }
+@@project-info{ projectId="discovery-kubernetes-api" }
### Dependencies and usage
diff --git a/docs/src/main/paradox/discovery/marathon.md
b/docs/src/main/paradox/discovery/marathon.md
index 94597a9..f0761d2 100644
--- a/docs/src/main/paradox/discovery/marathon.md
+++ b/docs/src/main/paradox/discovery/marathon.md
@@ -19,7 +19,7 @@ is bound to this port.
## Project Info
-@@project-info{ projectId="akka-discovery-marathon-api" }
+@@project-info{ projectId="discovery-marathon-api" }
### Dependencies and usage
diff --git a/integration-test/kubernetes-api-java/pom.xml
b/integration-test/kubernetes-api-java/pom.xml
index d63f2bc..39a7f69 100644
--- a/integration-test/kubernetes-api-java/pom.xml
+++ b/integration-test/kubernetes-api-java/pom.xml
@@ -1,6 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>com.lightbend</groupId>
+ <groupId>org.apache.pekko</groupId>
<artifactId>integration-test-kubernetes-api-java</artifactId>
<version>1.0-SNAPSHOT</version>
<name>${project.artifactId}</name>
@@ -18,9 +18,9 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<encoding>UTF-8</encoding>
- <akka.version>2.6.14</akka.version>
- <akka.http.version>10.2.0</akka.http.version>
- <akka-management.version>1.0.5</akka-management.version>
+ <akka.version>2.6.20</akka.version>
+ <akka.http.version>10.2.10</akka.http.version>
+ <pekko-management.version>0.0.0</pekko-management.version> <!-- set by
build -->
<scala.binary.version>2.12</scala.binary.version>
</properties>
@@ -46,14 +46,14 @@
<version>1.2.3</version>
</dependency>
<dependency>
- <groupId>com.lightbend.akka.management</groupId>
-
<artifactId>akka-management-cluster-bootstrap_${scala.binary.version}</artifactId>
- <version>${akka-management.version}</version>
+ <groupId>org.apache.pekko</groupId>
+
<artifactId>pekko-management-cluster-bootstrap_${scala.binary.version}</artifactId>
+ <version>${pekko-management.version}</version>
</dependency>
<dependency>
- <groupId>com.lightbend.akka.discovery</groupId>
-
<artifactId>akka-discovery-kubernetes-api_${scala.binary.version}</artifactId>
- <version>${akka-management.version}</version>
+ <groupId>org.apache.pekko</groupId>
+
<artifactId>pekko-discovery-kubernetes-api_${scala.binary.version}</artifactId>
+ <version>${pekko-management.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
@@ -154,7 +154,7 @@
<dependencySet>
<useProjectAttachments>true</useProjectAttachments>
<includes>
-
<include>com.lightbend:integration-test-kubernetes-api-java:jar:allinone</include>
+
<include>org.apache.pekko:integration-test-kubernetes-api-java:jar:allinone</include>
</includes>
<outputFileNameMapping>integration-test-kubernetes-api-java-allinone.jar</outputFileNameMapping>
</dependencySet>
diff --git a/integration-test/kubernetes-api-java/test.sh
b/integration-test/kubernetes-api-java/test.sh
index 29fd1ba..63edf8f 100755
--- a/integration-test/kubernetes-api-java/test.sh
+++ b/integration-test/kubernetes-api-java/test.sh
@@ -2,12 +2,12 @@
set -exu
-VERSION=`sbt publishM2 | grep akka-management-cluster-bootstrap_2.12 | tail -1
| cut -d "/" -f 11`
+VERSION=`sbt publishM2 | grep pekko-management-cluster-bootstrap_2.12 | tail
-1 | cut -d "/" -f 10`
cd integration-test/kubernetes-api-java
eval $(minikube -p minikube docker-env)
-mvn -Dakka-management.version=$VERSION clean package docker:build
+mvn -Dpekko-management.version=$VERSION clean package docker:build
export NAMESPACE=akka-bootstrap-demo-ns
diff --git a/integration-test/marathon-api-docker/build.sbt
b/integration-test/marathon-api-docker/build.sbt
index 68e0f0f..7e5dac3 100644
--- a/integration-test/marathon-api-docker/build.sbt
+++ b/integration-test/marathon-api-docker/build.sbt
@@ -2,17 +2,15 @@ import com.typesafe.sbt.packager.docker._
name := "bootstrap-demo-marathon-api-docker"
-version := "0.1.0"
+version := "1.1.4"
scalaVersion := "2.12.16"
enablePlugins(JavaServerAppPackaging)
-version := "1.0"
-
dockerUsername := sys.env.get("DOCKER_USER")
-val akkaManagementVersion = "0.10.0"
+val akkaManagementVersion = "1.1.4"
libraryDependencies ++= Vector(
"com.lightbend.akka.management" %% "akka-management-cluster-bootstrap" %
akkaManagementVersion,
diff --git a/integration-test/marathon-api/build.sbt
b/integration-test/marathon-api/build.sbt
index abdfb6c..faad6cb 100644
--- a/integration-test/marathon-api/build.sbt
+++ b/integration-test/marathon-api/build.sbt
@@ -2,11 +2,11 @@ enablePlugins(JavaServerAppPackaging)
name := "bootstrap-demo-marathon-api"
-version := "0.1.0"
+version := "1.1.4"
scalaVersion := "2.12.16"
-val akkaManagementVersion = "0.10.0"
+val akkaManagementVersion = "1.10.0"
libraryDependencies ++= Vector(
"com.lightbend.akka.management" %% "akka-management-cluster-bootstrap" %
akkaManagementVersion,
diff --git a/lease-kubernetes-int-test/kubernetes/job.yml
b/lease-kubernetes-int-test/kubernetes/job.yml
index 26dcd56..9f6ec84 100644
--- a/lease-kubernetes-int-test/kubernetes/job.yml
+++ b/lease-kubernetes-int-test/kubernetes/job.yml
@@ -11,5 +11,5 @@ spec:
containers:
- name: lease-test
imagePullPolicy: Never
- image: akka-lease-kubernetes-int-test:latest
+ image: pekko-lease-kubernetes-int-test:latest
restartPolicy: Never
diff --git a/project/Common.scala b/project/Common.scala
index 54da76d..ec91c98 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -11,24 +11,25 @@ object Common extends AutoPlugin {
override def trigger = allRequirements
override def requires = plugins.JvmPlugin && HeaderPlugin && CiReleasePlugin
- val currentYear = "2021"
+ val currentYear = "2023"
override lazy val projectSettings: Seq[sbt.Def.Setting[_]] =
Seq(
- organization := "com.lightbend.akka.management",
- organizationName := "Lightbend Inc.",
- organizationHomepage := Some(url("https://www.lightbend.com/";)),
- startYear := Some(2017),
- homepage := Some(url("https://akka.io/";)),
+ 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/";)),
scmInfo := Some(
- ScmInfo(url("https://github.com/akka/akka-management";),
"[email protected]:akka/akka-management.git")),
+ ScmInfo(url("https://github.com/apache/incubator-pekko-management";),
+ "[email protected]:apache/incubator-pekko-management.git")),
developers += Developer(
"contributors",
"Contributors",
- "https://gitter.im/akka/dev";,
- url("https://github.com/akka/akka-management/graphs/contributors";)),
+ "[email protected]",
+
url("https://github.com/apache/incubator-pekko-management/graphs/contributors";)),
licenses := Seq(("Apache-2.0",
url("https://www.apache.org/licenses/LICENSE-2.0";))),
- description := "Akka Management is a suite of tools for operating Akka
Clusters.",
+ description := "Apache Pekko Management is a suite of tools for
operating Apache Pekko Clusters.",
headerLicense := Some(HeaderLicense.Custom(apacheHeader)),
crossScalaVersions := Dependencies.CrossScalaVersions,
projectInfoVersion := (if (isSnapshot.value) "snapshot" else
version.value),
@@ -56,19 +57,19 @@ object Common extends AutoPlugin {
),
Compile / doc / scalacOptions := scalacOptions.value ++ Seq(
"-doc-title",
- "Akka Management",
+ "Apache Pekko Management",
"-doc-version",
version.value,
"-skip-packages",
- "akka.pattern" // for some reason Scaladoc creates this
+ "pekko.pattern" // for some reason Scaladoc creates this
),
Compile / doc / scalacOptions ++= Seq(
"-doc-source-url", {
val branch = if (isSnapshot.value) "master" else s"v${version.value}"
-
s"https://github.com/akka/akka-management/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}";
+
s"https://github.com/apache/incubator-pekko-management/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}";
},
"-doc-canonical-base-url",
- "https://doc.akka.io/api/akka-management/current/";),
+ "https://pekko.apache.org/api/pekko-management/current/";),
autoAPIMappings := true,
// show full stack traces and test case durations
Test / testOptions += Tests.Argument("-oDF"),
diff --git a/project/project-info.conf b/project/project-info.conf
index d77ae45..23a57a4 100644
--- a/project/project-info.conf
+++ b/project/project-info.conf
@@ -1,6 +1,6 @@
project-info {
version: "current"
- scala-versions: ["2.11", "2.12"]
+ scala-versions: ["2.12", "2.13"]
shared-info {
jdk-versions: ["Adopt OpenJDK 8 with Hotspot", "Adopt OpenJDK 11 with
Hotspot"]
snapshots: {
@@ -32,7 +32,7 @@ project-info {
}
]
}
- akka-management: ${project-info.shared-info} {
+ management: ${project-info.shared-info} {
title: "Akka Management"
levels: [
{
@@ -62,7 +62,7 @@ project-info {
}
]
}
- akka-discovery-kubernetes-api: ${project-info.shared-info} {
+ discovery-kubernetes-api: ${project-info.shared-info} {
title: "Akka Discovery Kubernetes"
levels: [
{
@@ -72,7 +72,7 @@ project-info {
}
]
}
- akka-discovery-consul: ${project-info.shared-info} {
+ discovery-consul: ${project-info.shared-info} {
title: "Akka Discovery Consul"
levels: [
{ // keep in sync with README.md
@@ -82,7 +82,7 @@ project-info {
}
]
}
- akka-discovery-marathon-api: ${project-info.shared-info} {
+ discovery-marathon-api: ${project-info.shared-info} {
title: "Akka Discovery Marathon"
levels: [
{ // keep in sync with README.md
@@ -92,7 +92,7 @@ project-info {
}
]
}
- akka-discovery-aws-api: ${project-info.shared-info} {
+ discovery-aws-api: ${project-info.shared-info} {
title: "Akka Discovery AWS"
levels: [
{ // keep in sync with README.md
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
