Merge branch 'main' into update/sbt-git-2.1.0

akka · Oct 30, 2024 · 56403a2 · 56403a2
2 parents 429cca6 + f106df6
commit 56403a2
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/integration-test/kubernetes-api-java/pom.xml b/integration-test/kubernetes-api-java/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.8</version>
+      <version>1.5.12</version>
     </dependency>
     <dependency>
       <groupId>com.lightbend.akka.management</groupId>

diff --git a/native-image-tests/build.sbt b/native-image-tests/build.sbt
@@ -35,7 +35,7 @@ libraryDependencies ++= Seq(
   "com.lightbend.akka.discovery" %% "akka-discovery-kubernetes-api" % akkaManagementVersion,
   "com.lightbend.akka.management" %% "akka-lease-kubernetes" % akkaManagementVersion,
   "com.lightbend.akka.management" %% "akka-rolling-update-kubernetes" % akkaManagementVersion,
-  "ch.qos.logback" % "logback-classic" % "1.5.8"
+  "ch.qos.logback" % "logback-classic" % "1.5.12"
 )
 
 // useful for investigations: sbt nativeImageRunAgent

diff --git a/native-image-tests/project/build.properties b/native-image-tests/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.4
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -102,7 +102,7 @@ object Dependencies {
     "com.typesafe.akka" %% "akka-actor" % AkkaVersion,
     "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion,
     "com.typesafe.akka" %% "akka-stream" % AkkaVersion,
-    "ch.qos.logback" % "logback-classic" % "1.5.8",
+    "ch.qos.logback" % "logback-classic" % "1.5.12",
     "com.typesafe.akka" %% "akka-http" % AkkaHttpVersion,
     "com.typesafe.akka" %% "akka-http-spray-json" % AkkaHttpVersion,
     "org.scalatest" %% "scalatest" % ScalaTestVersion % Test,
@@ -190,7 +190,7 @@ object Dependencies {
     "com.typesafe.akka" %% "akka-discovery" % AkkaVersion,
     "com.typesafe.akka" %% "akka-testkit" % AkkaVersion % Test,
     "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion,
-    "ch.qos.logback" % "logback-classic" % "1.5.8",
+    "ch.qos.logback" % "logback-classic" % "1.5.12",
     "org.scalatest" %% "scalatest" % ScalaTestVersion % Test
   )
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.4
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,13 +4,13 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
 
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
-addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
+addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")
 addSbtPlugin("io.akka" % "sbt-paradox-akka" % "24.10.3")
 addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
 addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0")
 addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.3")
 addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")
 addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
 

diff --git a/samples/akka-sample-cluster-kubernetes-java/pom.xml b/samples/akka-sample-cluster-kubernetes-java/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.8</version>
+      <version>1.5.12</version>
     </dependency>
     <dependency>
       <groupId>com.lightbend.akka.management</groupId>

diff --git a/samples/akka-sample-cluster-kubernetes-scala/build.sbt b/samples/akka-sample-cluster-kubernetes-scala/build.sbt
@@ -34,7 +34,7 @@ libraryDependencies ++= {
     "com.typesafe.akka" %% "akka-cluster-sharding-typed" % akkaVersion,
     "com.typesafe.akka" %% "akka-stream-typed" % akkaVersion,
     "com.typesafe.akka" %% "akka-discovery" % akkaVersion,
-    "ch.qos.logback" % "logback-classic" % "1.5.8",
+    "ch.qos.logback" % "logback-classic" % "1.5.12",
     "com.lightbend.akka.discovery" %% "akka-discovery-kubernetes-api" % akkaManagementVersion,
     "com.lightbend.akka.management" %% "akka-management-cluster-bootstrap" % akkaManagementVersion,
     "com.lightbend.akka.management" %% "akka-management-cluster-http" % akkaManagementVersion,

diff --git a/samples/akka-sample-cluster-kubernetes-scala/project/plugins.sbt b/samples/akka-sample-cluster-kubernetes-scala/project/plugins.sbt
@@ -1,4 +1,4 @@
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
-addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
+addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")