You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by nv...@apache.org on 2023/03/01 11:12:08 UTC

[incubator-pekko-management] branch main updated: Updates Scala 2.13 and aligns naming with Pekko project (#20)

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 db6237a  Updates Scala 2.13 and aligns naming with Pekko project (#20)
db6237a is described below

commit db6237aaf5ae674a93e9dadc1ca97afb2ff33e5f
Author: Nicolas Vollmar <nv...@gmail.com>
AuthorDate: Wed Mar 1 12:12:02 2023 +0100

    Updates Scala 2.13 and aligns naming with Pekko project (#20)
---
 .github/workflows/unit-tests.yml       |  16 +-
 build.sbt                              |  36 ++---
 integration-test/aws-api-ec2/build.sbt |   2 +-
 project/Common.scala                   |   6 +-
 project/Dependencies.scala             | 269 ++++++++++++++++-----------------
 5 files changed, 164 insertions(+), 165 deletions(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 427d030..de808ea 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -18,10 +18,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { java-version: 8,      scala-version: 2.12.16, sbt-opts: '' }
-          - { java-version: 11, scala-version: 2.12.16, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
-          - { java-version: 8,      scala-version: 2.13.8,  sbt-opts: '' }
-          - { java-version: 11, scala-version: 2.13.8,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { javaVersion: 8,  scalaVersion: 2.12.17, sbtOpts: '' }
+          - { javaVersion: 11, scalaVersion: 2.12.17, sbtOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { javaVersion: 8,  scalaVersion: 2.13.10, sbtOpts: '' }
+          - { javaVersion: 11, scalaVersion: 2.13.10, sbtOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -34,11 +34,11 @@ jobs:
           git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch
           git checkout scratch
 
-      - name: Setup Java ${{ matrix.java-version }}
+      - name: Setup Java ${{ matrix.javaVersion }}
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: ${{ matrix.java-version }}
+          java-version: ${{ matrix.javaVersion }}
 
       - name: Cache Coursier cache
         uses: coursier/cache-action@v6.4.0
@@ -48,8 +48,8 @@ jobs:
         run: |
           echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
 
-      - name: Run tests with Scala ${{ matrix.scala-version }} and Java ${{ matrix.java-version }}
-        run: sbt "++${{ matrix.scala-version }} test" ${{ matrix.sbt-opts }}
+      - name: Run tests with Scala ${{ matrix.scalaVersion }} and Java ${{ matrix.javaVersion }}
+        run: sbt "++${{ matrix.scalaVersion }} test" ${{ matrix.sbtOpts }}
 
       - name: Print logs on failure
         if: ${{ failure() }}
diff --git a/build.sbt b/build.sbt
index 72fdf54..914c643 100644
--- a/build.sbt
+++ b/build.sbt
@@ -44,7 +44,7 @@ lazy val discoveryKubernetesApi = pekkoModule("discovery-kubernetes-api")
   .settings(MetaInfLicenseNoticeCopy.settings)
   .settings(
     name := "pekko-discovery-kubernetes-api",
-    libraryDependencies := Dependencies.DiscoveryKubernetesApi,
+    libraryDependencies := Dependencies.discoveryKubernetesApi,
     mimaPreviousArtifactsSet)
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(managementPki)
@@ -54,7 +54,7 @@ lazy val discoveryMarathonApi = pekkoModule("discovery-marathon-api")
   .settings(MetaInfLicenseNoticeCopy.settings)
   .settings(
     name := "pekko-discovery-marathon-api",
-    libraryDependencies := Dependencies.DiscoveryMarathonApi,
+    libraryDependencies := Dependencies.discoveryMarathonApi,
     mimaPreviousArtifactsSet)
   .settings(MetaInfLicenseNoticeCopy.settings)
 
@@ -63,7 +63,7 @@ lazy val discoveryAwsApi = pekkoModule("discovery-aws-api")
   .settings(MetaInfLicenseNoticeCopy.settings)
   .settings(
     name := "pekko-discovery-aws-api",
-    libraryDependencies := Dependencies.DiscoveryAwsApi,
+    libraryDependencies := Dependencies.discoveryAwsApi,
     mimaPreviousArtifactsSet)
   .settings(MetaInfLicenseNoticeCopy.settings)
 
@@ -72,7 +72,7 @@ lazy val discoveryAwsApiAsync = pekkoModule("discovery-aws-api-async")
   .settings(MetaInfLicenseNoticeCopy.settings)
   .settings(
     name := "pekko-discovery-aws-api-async",
-    libraryDependencies := Dependencies.DiscoveryAwsApiAsync,
+    libraryDependencies := Dependencies.discoveryAwsApiAsync,
     mimaPreviousArtifactsSet)
   .settings(MetaInfLicenseNoticeCopy.settings)
 
@@ -81,7 +81,7 @@ lazy val discoveryConsul = pekkoModule("discovery-consul")
   .settings(MetaInfLicenseNoticeCopy.settings)
   .settings(
     name := "pekko-discovery-consul",
-    libraryDependencies := Dependencies.DiscoveryConsul,
+    libraryDependencies := Dependencies.discoveryConsul,
     mimaPreviousArtifactsSet)
   .settings(MetaInfLicenseNoticeCopy.settings)
 
@@ -91,7 +91,7 @@ lazy val management = pekkoModule("management")
   .settings(MetaInfLicenseNoticeCopy.settings)
   .settings(
     name := "pekko-management",
-    libraryDependencies := Dependencies.ManagementHttp,
+    libraryDependencies := Dependencies.managementHttp,
     mimaPreviousArtifactsSet)
   .settings(MetaInfLicenseNoticeCopy.settings)
 
@@ -100,7 +100,7 @@ lazy val managementPki = pekkoModule("management-pki")
   .settings(MetaInfLicenseNoticeCopy.settings)
   .settings(
     name := "pekko-management-pki",
-    libraryDependencies := Dependencies.ManagementPki,
+    libraryDependencies := Dependencies.managementPki,
     mimaPreviousArtifactsSet)
   .settings(MetaInfLicenseNoticeCopy.settings)
 
@@ -109,7 +109,7 @@ lazy val managementLoglevelsLogback = pekkoModule("management-loglevels-logback"
   .settings(MetaInfLicenseNoticeCopy.settings)
   .settings(
     name := "pekko-management-loglevels-logback",
-    libraryDependencies := Dependencies.LoglevelsLogback,
+    libraryDependencies := Dependencies.managementLoglevelsLogback,
     mimaPreviousArtifactsSet)
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(management)
@@ -120,7 +120,7 @@ lazy val managementLoglevelsLog4j2 = pekkoModule("management-loglevels-log4j2")
   .disablePlugins(MimaPlugin)
   .settings(
     name := "pekko-management-loglevels-log4j2",
-    libraryDependencies := Dependencies.LoglevelsLog4j2)
+    libraryDependencies := Dependencies.managementLoglevelsLog4j2)
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(management)
 
@@ -129,7 +129,7 @@ lazy val managementClusterHttp = pekkoModule("management-cluster-http")
   .settings(MetaInfLicenseNoticeCopy.settings)
   .settings(
     name := "pekko-management-cluster-http",
-    libraryDependencies := Dependencies.ClusterHttp,
+    libraryDependencies := Dependencies.managementClusterHttp,
     mimaPreviousArtifactsSet)
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(management)
@@ -139,7 +139,7 @@ lazy val managementClusterBootstrap = pekkoModule("management-cluster-bootstrap"
   .settings(MetaInfLicenseNoticeCopy.settings)
   .settings(
     name := "pekko-management-cluster-bootstrap",
-    libraryDependencies := Dependencies.ClusterBootstrap,
+    libraryDependencies := Dependencies.managementClusterBootstrap,
     mimaPreviousArtifactsSet)
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(management)
@@ -149,7 +149,7 @@ lazy val leaseKubernetes = pekkoModule("lease-kubernetes")
   .settings(MetaInfLicenseNoticeCopy.settings)
   .settings(
     name := "pekko-lease-kubernetes",
-    libraryDependencies := Dependencies.LeaseKubernetes,
+    libraryDependencies := Dependencies.leaseKubernetes,
     mimaPreviousArtifactsSet)
   .settings(Defaults.itSettings)
   .settings(MetaInfLicenseNoticeCopy.settings)
@@ -164,7 +164,7 @@ lazy val leaseKubernetesIntTest = pekkoModule("lease-kubernetes-int-test")
   .settings(
     name := "pekko-lease-kubernetes-int-test",
     publish / skip := true,
-    libraryDependencies := Dependencies.LeaseKubernetesTest,
+    libraryDependencies := Dependencies.leaseKubernetesTest,
     version ~= (_.replace('+', '-')),
     dockerBaseImage := "openjdk:8-jre-alpine",
     dockerUpdateLatest := true,
@@ -185,7 +185,7 @@ lazy val integrationTestKubernetesApi = pekkoIntTestModule("kubernetes-api")
   .settings(
     publish / skip := true,
     doc / sources := Seq.empty,
-    libraryDependencies := Dependencies.BootstrapDemos)
+    libraryDependencies := Dependencies.bootstrapDemos)
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(management, managementClusterHttp, managementClusterBootstrap, discoveryKubernetesApi)
 
@@ -195,7 +195,7 @@ lazy val integrationTestKubernetesApiJava = pekkoIntTestModule("kubernetes-api-j
   .settings(
     publish / skip := true,
     doc / sources := Seq.empty,
-    libraryDependencies := Dependencies.BootstrapDemos)
+    libraryDependencies := Dependencies.bootstrapDemos)
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(
     management,
@@ -209,7 +209,7 @@ lazy val integrationTestKubernetesDns = pekkoIntTestModule("kubernetes-dns")
   .settings(
     publish / skip := true,
     doc / sources := Seq.empty,
-    libraryDependencies := Dependencies.BootstrapDemos)
+    libraryDependencies := Dependencies.bootstrapDemos)
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(
     management,
@@ -270,7 +270,7 @@ lazy val integrationTestLocal = pekkoIntTestModule("local")
     name := "integration-test-local",
     publish / skip := true,
     doc / sources := Seq.empty,
-    libraryDependencies := Dependencies.BootstrapDemos)
+    libraryDependencies := Dependencies.bootstrapDemos)
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(
     management,
@@ -299,7 +299,7 @@ lazy val docs = project
       "canonical.base_url" -> "https://pekko.apache.org/docs/pekko-management/current",
       "scaladoc.base_url" -> s"https://pekko.apache.org/api/pekko-management/current/",
       "scala.binary.version" -> scalaBinaryVersion.value,
-      "pekko.version" -> Dependencies.PekkoVersion,
+      "pekko.version" -> Dependencies.pekkoVersion,
       "extref.pekko.base_url" -> s"https://pekko.apache.org/docs/pekko/current/%s",
       "scaladoc.pekko.base_url" -> s"https://pekko.apache.org/api/pekko/current/",
       "extref.pekko-http.base_url" -> s"https://pekko.apache.org/docs/pekko-http/current/%s",
diff --git a/integration-test/aws-api-ec2/build.sbt b/integration-test/aws-api-ec2/build.sbt
index 4760dba..57dd178 100644
--- a/integration-test/aws-api-ec2/build.sbt
+++ b/integration-test/aws-api-ec2/build.sbt
@@ -8,4 +8,4 @@ libraryDependencies += "com.amazonaws" % "aws-java-sdk-autoscaling" % "1.12.213"
 
 libraryDependencies += "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.7" // aws SDK depends on insecure jackson
 
-libraryDependencies += "org.scalatest" %% "scalatest" % Dependencies.ScalaTestVersion % IntegrationTest
+libraryDependencies += "org.scalatest" %% "scalatest" % Dependencies.scalaTestVersion % IntegrationTest
diff --git a/project/Common.scala b/project/Common.scala
index ec91c98..f0232c9 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -31,7 +31,7 @@ object Common extends AutoPlugin {
       licenses := Seq(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))),
       description := "Apache Pekko Management is a suite of tools for operating Apache Pekko Clusters.",
       headerLicense := Some(HeaderLicense.Custom(apacheHeader)),
-      crossScalaVersions := Dependencies.CrossScalaVersions,
+      crossScalaVersions := Dependencies.crossScalaVersions,
       projectInfoVersion := (if (isSnapshot.value) "snapshot" else version.value),
       crossVersion := CrossVersion.binary,
       scalacOptions ++= {
@@ -44,7 +44,7 @@ object Common extends AutoPlugin {
           "-Xlint",
           "-Ywarn-dead-code",
           "-target:jvm-1.8")
-        if (scalaVersion.value == Dependencies.Scala212)
+        if (scalaVersion.value == Dependencies.scala212Version)
           scalacOptionsBase ++: Seq("-Xfuture", "-Xfatal-warnings")
         else
           scalacOptionsBase
@@ -76,7 +76,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.Scala212,
+      scalaVersion := Dependencies.scala212Version,
       sonatypeProfileName := "com.lightbend")
 
   private def isJdk8 =
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index de2af4e..b81365f 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -2,160 +2,159 @@ import sbt._
 import Keys._
 
 object Dependencies {
-
-  val Scala212 = "2.12.16"
-  val Scala213 = "2.13.8"
-  val CrossScalaVersions = Seq(Dependencies.Scala212, Dependencies.Scala213)
+  // keep in sync with .github/workflows/unit-tests.yml
+  val scala212Version = "2.12.17"
+  val scala213Version = "2.13.10"
+  val scala3Version = "3.1.2" // not yet enabled - missing pekko-http Scala 3 artifacts
+  val crossScalaVersions = Seq(scala212Version, scala213Version)
 
   // Align the versions in integration-test/kubernetes-api-java/pom.xml
-  val PekkoVersion = "0.0.0+26599-83545a33-SNAPSHOT"
-  val AkkaBinary = "2.6"
-  val PekkoHttpVersion = "0.0.0+4298-26846a02-SNAPSHOT"
-  val AkkaHttpBinaryVersion = "10.2"
+  val pekkoVersion = "0.0.0+26599-83545a33-SNAPSHOT"
+  val pekkoHttpVersion = "0.0.0+4298-26846a02-SNAPSHOT"
 
-  val ScalaTestVersion = "3.1.4"
-  val ScalaTestPlusJUnitVersion = ScalaTestVersion + ".0"
+  val scalaTestVersion = "3.2.14"
+  val scalaTestPlusJUnitVersion = scalaTestVersion + ".0"
 
-  val AwsSdkVersion = "1.12.210"
-  val JacksonVersion = "2.11.4"
+  val awsSdkVersion = "1.12.210"
+  val jacksonVersion = "2.11.4"
 
-  val Log4j2Version = "2.17.2"
+  val log4j2Version = "2.17.2"
 
   // often called-in transitively with insecure versions of databind / core
-  private val JacksonDatabind = Seq(
-    "com.fasterxml.jackson.core" % "jackson-databind" % JacksonVersion)
+  private val jacksonDatabind = Seq(
+    "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion)
 
-  private val JacksonDatatype = Seq(
-    "com.fasterxml.jackson.datatype" % "jackson-datatype-guava" % JacksonVersion,
-    "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % JacksonVersion,
+  private val jacksonDatatype = Seq(
+    "com.fasterxml.jackson.datatype" % "jackson-datatype-guava" % jacksonVersion,
+    "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % jacksonVersion,
     // Specifying guava dependency because older transitive dependency has security vulnerability
     "com.google.guava" % "guava" % "31.1-jre")
 
-  val DiscoveryConsul = Seq(
-    "org.apache.pekko" %% "pekko-actor" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-discovery" % PekkoVersion,
+  val discoveryConsul = Seq(
+    "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-discovery" % pekkoVersion,
     "com.orbitz.consul" % "consul-client" % "1.5.3",
     "com.pszymczyk.consul" % "embedded-consul" % "2.2.1" % Test,
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test,
-    "org.apache.pekko" %% "pekko-testkit" % PekkoVersion % Test,
-    "org.apache.pekko" %% "pekko-slf4j" % PekkoVersion % Test,
-    "ch.qos.logback" % "logback-classic" % "1.2.11" % Test) ++ JacksonDatabind ++ JacksonDatatype // consul depends on insecure version of jackson
-
-  val DiscoveryKubernetesApi = Seq(
-    "org.apache.pekko" %% "pekko-actor" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-discovery" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-stream" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion,
-    "org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion,
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test)
-
-  val DiscoveryMarathonApi = Seq(
-    "org.apache.pekko" %% "pekko-actor" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-discovery" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-stream" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion,
-    "org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion,
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test)
-
-  val DiscoveryAwsApi = Seq(
-    "org.apache.pekko" %% "pekko-actor" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-discovery" % PekkoVersion,
-    "com.amazonaws" % "aws-java-sdk-ec2" % AwsSdkVersion,
-    "com.amazonaws" % "aws-java-sdk-ecs" % AwsSdkVersion,
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test) ++ JacksonDatabind // aws-java-sdk depends on insecure version of jackson
-
-  val DiscoveryAwsApiAsync = Seq(
-    "org.apache.pekko" %% "pekko-actor" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-discovery" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-stream" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion,
-    "org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion,
+    "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
+    "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
+    "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion % Test,
+    "ch.qos.logback" % "logback-classic" % "1.2.11" % Test) ++ jacksonDatabind ++ jacksonDatatype // consul depends on insecure version of jackson
+
+  val discoveryKubernetesApi = Seq(
+    "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-discovery" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-stream" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion,
+    "org.scalatest" %% "scalatest" % scalaTestVersion % Test)
+
+  val discoveryMarathonApi = Seq(
+    "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-discovery" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-stream" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion,
+    "org.scalatest" %% "scalatest" % scalaTestVersion % Test)
+
+  val discoveryAwsApi = Seq(
+    "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-discovery" % pekkoVersion,
+    "com.amazonaws" % "aws-java-sdk-ec2" % awsSdkVersion,
+    "com.amazonaws" % "aws-java-sdk-ecs" % awsSdkVersion,
+    "org.scalatest" %% "scalatest" % scalaTestVersion % Test) ++ jacksonDatabind // aws-java-sdk depends on insecure version of jackson
+
+  val discoveryAwsApiAsync = Seq(
+    "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-discovery" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-stream" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion,
     ("software.amazon.awssdk" % "ecs" % "2.17.184").exclude("software.amazon.awssdk", "apache-client"),
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test) ++ JacksonDatabind // aws-java-sdk depends on insecure version of jackson
-
-  val ManagementHttp = Seq(
-    "org.apache.pekko" %% "pekko-actor" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-stream" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion,
-    "org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion,
-    "org.apache.pekko" %% "pekko-testkit" % PekkoVersion % Test,
-    "org.apache.pekko" %% "pekko-cluster" % PekkoVersion % Test,
-    "org.apache.pekko" %% "pekko-http-testkit" % PekkoHttpVersion % Test,
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test,
-    "org.scalatestplus" %% "junit-4-13" % ScalaTestPlusJUnitVersion % Test)
-
-  val ManagementPki = Seq(
-    "org.apache.pekko" %% "pekko-pki" % PekkoVersion,
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test,
-    "org.scalatestplus" %% "junit-4-13" % ScalaTestPlusJUnitVersion % Test)
-
-  val LoglevelsLogback = Seq(
-    "org.apache.pekko" %% "pekko-actor" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-slf4j" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-stream" % PekkoVersion,
+    "org.scalatest" %% "scalatest" % scalaTestVersion % Test) ++ jacksonDatabind // aws-java-sdk depends on insecure version of jackson
+
+  val managementHttp = Seq(
+    "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-stream" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
+    "org.apache.pekko" %% "pekko-cluster" % pekkoVersion % Test,
+    "org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % Test,
+    "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
+    "org.scalatestplus" %% "junit-4-13" % scalaTestPlusJUnitVersion % Test)
+
+  val managementPki = Seq(
+    "org.apache.pekko" %% "pekko-pki" % pekkoVersion,
+    "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
+    "org.scalatestplus" %% "junit-4-13" % scalaTestPlusJUnitVersion % Test)
+
+  val managementLoglevelsLogback = Seq(
+    "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-stream" % pekkoVersion,
     "ch.qos.logback" % "logback-classic" % "1.2.11",
-    "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion,
-    "org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion,
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test,
-    "org.apache.pekko" %% "pekko-testkit" % PekkoVersion % Test,
-    "org.apache.pekko" %% "pekko-http-testkit" % PekkoHttpVersion % Test)
-
-  val LoglevelsLog4j2 = Seq(
-    "org.apache.pekko" %% "pekko-actor" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-slf4j" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-stream" % PekkoVersion,
-    "org.apache.logging.log4j" % "log4j-core" % Log4j2Version,
-    "org.apache.logging.log4j" % "log4j-api" % Log4j2Version,
-    "org.apache.logging.log4j" % "log4j-slf4j-impl" % Log4j2Version,
-    "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion,
-    "org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion,
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test,
-    "org.apache.pekko" %% "pekko-testkit" % PekkoVersion % Test,
-    "org.apache.pekko" %% "pekko-http-testkit" % PekkoHttpVersion % Test)
-
-  val ClusterHttp = Seq(
-    "org.apache.pekko" %% "pekko-cluster" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-cluster-sharding" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-http-core" % PekkoHttpVersion,
-    "org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion,
-    "org.apache.pekko" %% "pekko-testkit" % PekkoVersion % Test,
+    "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion,
+    "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
+    "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
+    "org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % Test)
+
+  val managementLoglevelsLog4j2 = Seq(
+    "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-stream" % pekkoVersion,
+    "org.apache.logging.log4j" % "log4j-core" % log4j2Version,
+    "org.apache.logging.log4j" % "log4j-api" % log4j2Version,
+    "org.apache.logging.log4j" % "log4j-slf4j-impl" % log4j2Version,
+    "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion,
+    "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
+    "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
+    "org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % Test)
+
+  val managementClusterHttp = Seq(
+    "org.apache.pekko" %% "pekko-cluster" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-cluster-sharding" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-http-core" % pekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
     "org.mockito" % "mockito-all" % "1.10.19" % Test,
-    "org.apache.pekko" %% "pekko-http-testkit" % PekkoHttpVersion % Test,
-    "org.apache.pekko" %% "pekko-distributed-data" % PekkoVersion % Test,
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test,
-    "org.scalatestplus" %% "junit-4-13" % ScalaTestPlusJUnitVersion % Test)
-
-  val ClusterBootstrap = Seq(
-    "org.apache.pekko" %% "pekko-discovery" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-cluster" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-http-core" % PekkoHttpVersion,
-    "org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion,
-    "org.apache.pekko" %% "pekko-testkit" % PekkoVersion % Test,
-    "org.apache.pekko" %% "pekko-http-testkit" % PekkoHttpVersion % Test,
-    "org.apache.pekko" %% "pekko-distributed-data" % PekkoVersion % Test,
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test,
-    "org.scalatestplus" %% "junit-4-13" % ScalaTestPlusJUnitVersion % Test)
-
-  val LeaseKubernetes = Seq(
-    "org.apache.pekko" %% "pekko-actor" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-coordination" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-stream" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion,
-    "org.apache.pekko" %% "pekko-slf4j" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % Test,
+    "org.apache.pekko" %% "pekko-distributed-data" % pekkoVersion % Test,
+    "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
+    "org.scalatestplus" %% "junit-4-13" % scalaTestPlusJUnitVersion % Test)
+
+  val managementClusterBootstrap = Seq(
+    "org.apache.pekko" %% "pekko-discovery" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-cluster" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-http-core" % pekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
+    "org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % Test,
+    "org.apache.pekko" %% "pekko-distributed-data" % pekkoVersion % Test,
+    "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
+    "org.scalatestplus" %% "junit-4-13" % scalaTestPlusJUnitVersion % Test)
+
+  val leaseKubernetes = Seq(
+    "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-coordination" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-stream" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion,
+    "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion,
     "com.github.tomakehurst" % "wiremock-jre8" % "2.33.2" % Test,
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % "it,test",
-    "org.scalatestplus" %% "junit-4-13" % ScalaTestPlusJUnitVersion % "it,test",
-    "org.apache.pekko" %% "pekko-testkit" % PekkoVersion % "it,test")
+    "org.scalatest" %% "scalatest" % scalaTestVersion % "it,test",
+    "org.scalatestplus" %% "junit-4-13" % scalaTestPlusJUnitVersion % "it,test",
+    "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % "it,test")
 
-  val LeaseKubernetesTest = Seq(
-    "org.scalatest" %% "scalatest" % ScalaTestVersion)
+  val leaseKubernetesTest = Seq(
+    "org.scalatest" %% "scalatest" % scalaTestVersion)
 
-  val BootstrapDemos = Seq(
-    "org.apache.pekko" %% "pekko-discovery" % PekkoVersion,
-    "org.apache.pekko" %% "pekko-testkit" % PekkoVersion % Test,
-    "org.apache.pekko" %% "pekko-slf4j" % PekkoVersion,
+  val bootstrapDemos = Seq(
+    "org.apache.pekko" %% "pekko-discovery" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
+    "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion,
     "ch.qos.logback" % "logback-classic" % "1.2.11",
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test)
+    "org.scalatest" %% "scalatest" % scalaTestVersion % Test)
 
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org