This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-management.git
The following commit(s) were added to refs/heads/main by this push:
new d4269cc5 build with pekko 2.0.0-M1 (#568)
d4269cc5 is described below
commit d4269cc546d0a4c39bd5a8cda20573c15e8b4efa
Author: PJ Fanning <[email protected]>
AuthorDate: Mon Jan 26 07:47:44 2026 +0100
build with pekko 2.0.0-M1 (#568)
* build with pekko 2.0.0-M1
Update CodeExamples.java
try to set add-opens for integration tests
Update build.sbt
Update PekkoHttpDependency.scala
Update build.sbt
Update build.sbt
try to fix more tests
Update HttpContactPointBootstrapSpec.scala
test with pekko-http 2.0.0-M1 staging
Remove Apache Maven Staging Repo from resolvers
try to fix int tests
Update pom.xml
* java-opts
---
.github/workflows/unit-tests.yml | 1 +
build.sbt | 8 ++++++++
.../kubernetes-api/kubernetes/pekko-cluster.yml | 4 ++++
.../kubernetes-dns/kubernetes/pekko-cluster.yml | 3 +++
.../cluster/bootstrap/LowestAddressJoinDecider.scala | 6 ++++--
.../bootstrap/internal/HttpContactPointBootstrapSpec.scala | 14 ++++++++------
.../cluster/scaladsl/ClusterHttpManagementRoutes.scala | 2 +-
.../java/org/apache/pekko/management/CodeExamples.java | 2 +-
project/PekkoCoreDependency.scala | 2 +-
project/PekkoHttpDependency.scala | 2 +-
10 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index cf267487..c411d618 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -6,6 +6,7 @@ on:
push:
branches:
- main
+ - 1.*
tags-ignore: [ v.* ]
jobs:
diff --git a/build.sbt b/build.sbt
index abbe476e..4d7d92ca 100644
--- a/build.sbt
+++ b/build.sbt
@@ -141,6 +141,10 @@ lazy val managementClusterHttp =
pekkoModule("management-cluster-http")
.settings(
name := "pekko-management-cluster-http",
libraryDependencies := Dependencies.managementClusterHttp,
+ // following is needed by Agrona lib
+ // https://github.com/aeron-io/agrona/wiki/Change-Log#200-2024-12-17
+ Test / fork := true,
+ Test / javaOptions +=
"--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED",
mimaPreviousArtifactsSet)
.dependsOn(management)
@@ -149,6 +153,10 @@ lazy val managementClusterBootstrap =
pekkoModule("management-cluster-bootstrap"
.settings(
name := "pekko-management-cluster-bootstrap",
libraryDependencies := Dependencies.managementClusterBootstrap,
+ // following is needed by Agrona lib
+ // https://github.com/aeron-io/agrona/wiki/Change-Log#200-2024-12-17
+ Test / fork := true,
+ Test / javaOptions +=
"--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED",
mimaPreviousArtifactsSet)
.dependsOn(management)
.dependsOn(managementPki)
diff --git a/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
b/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
index 2610ffe4..afdb0c91 100644
--- a/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
+++ b/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
@@ -53,6 +53,10 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: "metadata.labels['app']"
+ # Agrona requires this JVM option to work on recent JDKs
+ - name: JAVA_OPTS
+ value: "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"
+
#deployment
---
#rbac
diff --git a/integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml
b/integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml
index e4160190..46e9a339 100644
--- a/integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml
+++ b/integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml
@@ -55,6 +55,9 @@ spec:
# service defined below
- name: PEKKO_CLUSTER_BOOTSTRAP_SERVICE_NAME
value: "integration-test-kubernetes-dns-internal"
+ # Agrona requires this JVM option to work on recent JDKs
+ - name: JAVA_OPTS
+ value: "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"
---
#headless
diff --git
a/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/LowestAddressJoinDecider.scala
b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/LowestAddressJoinDecider.scala
index 63c48890..010b9f10 100644
---
a/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/LowestAddressJoinDecider.scala
+++
b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/LowestAddressJoinDecider.scala
@@ -16,11 +16,12 @@ package org.apache.pekko.management.cluster.bootstrap
import java.time.Duration
import scala.concurrent.Future
+import scala.annotation.nowarn
+
import org.apache.pekko
import pekko.actor.ActorSystem
import pekko.actor.Address
import pekko.discovery.ServiceDiscovery.ResolvedTarget
-import pekko.util.unused
/**
* The decision of joining "self" is made by deterministically sorting the
discovered services
@@ -145,7 +146,8 @@ class LowestAddressJoinDecider(system: ActorSystem,
settings: ClusterBootstrapSe
* contact points have not been confirmed (unreachable or not running).
* `hasEnoughContactPoints` and `isPastStableMargin` must still be fulfilled.
*/
- protected def isConfirmedCommunicationWithAllContactPointsRequired(@unused
info: SeedNodesInformation): Boolean =
+ @nowarn("msg=unused")
+ protected def isConfirmedCommunicationWithAllContactPointsRequired(info:
SeedNodesInformation): Boolean =
settings.contactPointDiscovery.contactWithAllContactPoints
/**
diff --git
a/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrapSpec.scala
b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrapSpec.scala
index b3f8892d..cdd8284c 100644
---
a/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrapSpec.scala
+++
b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrapSpec.scala
@@ -26,6 +26,8 @@ import org.scalatest.wordspec.AnyWordSpec
class HttpContactPointBootstrapSpec extends AnyWordSpec with Matchers {
+ val userDir = System.getProperty("user.dir")
+
"HttpContactPointBootstrap" should {
"use a safe name when connecting over IPv6" in {
val name =
HttpContactPointBootstrap.name(Host("[fe80::1013:2070:258a:c662]"), 443)
@@ -45,9 +47,9 @@ class HttpContactPointBootstrapSpec extends AnyWordSpec with
Matchers {
val sys = ActorSystem("HttpContactPointBootstrapSpec")
val log = Logging(sys, classOf[HttpContactPointBootstrapSpec])
try {
- val cfg = ConfigFactory.parseString("""
+ val cfg = ConfigFactory.parseString(s"""
pekko.management.cluster.bootstrap.contact-point.http-client {
- ca-path = "management-cluster-bootstrap/src/test/files/ca.crt"
+ ca-path = "${userDir}/src/test/files/ca.crt"
}""").withFallback(sys.settings.config)
val settings = new ClusterBootstrapSettings(cfg, log)
HttpContactPointBootstrap.generateSSLContext(settings) should not be
null
@@ -59,9 +61,9 @@ class HttpContactPointBootstrapSpec extends AnyWordSpec with
Matchers {
val sys = ActorSystem("HttpContactPointBootstrapSpec")
val log = Logging(sys, classOf[HttpContactPointBootstrapSpec])
try {
- val cfg = ConfigFactory.parseString("""
+ val cfg = ConfigFactory.parseString(s"""
pekko.management.cluster.bootstrap.contact-point.http-client {
- ca-path =
"management-cluster-bootstrap/src/test/files/non-existent.crt"
+ ca-path = "${userDir}/src/test/files/non-existent.crt"
}""").withFallback(sys.settings.config)
val settings = new ClusterBootstrapSettings(cfg, log)
intercept[NoSuchFileException] {
@@ -75,9 +77,9 @@ class HttpContactPointBootstrapSpec extends AnyWordSpec with
Matchers {
val sys = ActorSystem("HttpContactPointBootstrapSpec")
val log = Logging(sys, classOf[HttpContactPointBootstrapSpec])
try {
- val cfg = ConfigFactory.parseString("""
+ val cfg = ConfigFactory.parseString(s"""
pekko.management.cluster.bootstrap.contact-point.http-client {
- ca-path = "management-cluster-bootstrap/src/test/files/ca.crt"
+ ca-path = "${userDir}/src/test/files/ca.crt"
tls-version = "BAD_VERSION"
}""").withFallback(sys.settings.config)
val settings = new ClusterBootstrapSettings(cfg, log)
diff --git
a/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
index 9201d403..77f4b674 100644
---
a/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
+++
b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
@@ -187,7 +187,7 @@ object ClusterHttpManagementRoutes extends
ClusterHttpManagementJsonProtocol {
eventualActorRef.success(Some(actorRef))
()
}
- .watchTermination() {
+ .watchTermination {
case (_, eventualDone) =>
eventualDone.onComplete { _ =>
// the stream has terminated, so complete the promise if it
isn't already, and
diff --git
a/management/src/test/java/org/apache/pekko/management/CodeExamples.java
b/management/src/test/java/org/apache/pekko/management/CodeExamples.java
index 4e34a0e6..3d96f1f5 100644
--- a/management/src/test/java/org/apache/pekko/management/CodeExamples.java
+++ b/management/src/test/java/org/apache/pekko/management/CodeExamples.java
@@ -33,7 +33,7 @@ public class CodeExamples {
// #start-pekko-management-with-https-context
PekkoManagement management = PekkoManagement.get(system);
- HttpsConnectionContext https = ConnectionContext.https(sslContext);
+ HttpsConnectionContext https = ConnectionContext.httpsServer(sslContext);
management.start(settings -> settings.withHttpsConnectionContext(https));
// #start-pekko-management-with-https-context
}
diff --git a/project/PekkoCoreDependency.scala
b/project/PekkoCoreDependency.scala
index 61d5bd7d..c127cb61 100644
--- a/project/PekkoCoreDependency.scala
+++ b/project/PekkoCoreDependency.scala
@@ -20,5 +20,5 @@ import com.github.pjfanning.pekkobuild.PekkoDependency
object PekkoCoreDependency extends PekkoDependency {
override val checkProject: String = "pekko-cluster-sharding-typed"
override val module: Option[String] = None
- override val currentVersion: String = "1.3.0"
+ override val currentVersion: String = "2.0.0-M1"
}
diff --git a/project/PekkoHttpDependency.scala
b/project/PekkoHttpDependency.scala
index b516636a..d380824f 100644
--- a/project/PekkoHttpDependency.scala
+++ b/project/PekkoHttpDependency.scala
@@ -20,5 +20,5 @@ import com.github.pjfanning.pekkobuild.PekkoDependency
object PekkoHttpDependency extends PekkoDependency {
override val checkProject: String = "pekko-http-testkit"
override val module: Option[String] = Some("http")
- override val currentVersion: String = "1.3.0"
+ override val currentVersion: String = "2.0.0-M1"
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
