From 42a26623d43d00db0f8741821abdad5b73c2c5b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Mon, 13 May 2024 10:42:33 +0200 Subject: [PATCH] build: License change date for 1.5.3, Akka and HTTP bumps, sample updates (#1290) --- LICENSE | 4 ++-- integration-test/dns-api-mesos/build.sbt | 2 +- integration-test/kubernetes-api-java/pom.xml | 4 ++-- native-image-tests/build.sbt | 4 ++-- samples/akka-sample-cluster-kubernetes-java/pom.xml | 4 ++-- samples/akka-sample-cluster-kubernetes-scala/build.sbt | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/LICENSE b/LICENSE index a9ce802a..0816c57d 100644 --- a/LICENSE +++ b/LICENSE @@ -3,7 +3,7 @@ Business Source License 1.1 Parameters Licensor: Lightbend, Inc. -Licensed Work: Akka Management 1.5.1 +Licensed Work: Akka Management 1.5.2 This license applies to all sub directories and files UNLESS another license file is present in a sub directory, then that other license applies to all files @@ -19,7 +19,7 @@ Additional Use Grant: Connecting to a Play Framework websocket and/or Play Framework request/response bodies for server and play-ws client. -Change Date: 2027-02-28 +Change Date: 2027-05-13 Change License: Apache License, Version 2.0 diff --git a/integration-test/dns-api-mesos/build.sbt b/integration-test/dns-api-mesos/build.sbt index fd9032fc..1547563b 100644 --- a/integration-test/dns-api-mesos/build.sbt +++ b/integration-test/dns-api-mesos/build.sbt @@ -14,4 +14,4 @@ libraryDependencies += "com.lightbend.akka.management" %% "akka-management-clust libraryDependencies += "com.lightbend.akka.management" %% "akka-management-cluster-http" % akkaManagementVersion( version.value) -libraryDependencies += "com.typesafe.akka" %% "akka-discovery" % "2.9.2" +libraryDependencies += "com.typesafe.akka" %% "akka-discovery" % "2.9.3" diff --git a/integration-test/kubernetes-api-java/pom.xml b/integration-test/kubernetes-api-java/pom.xml index ef9bcd57..c8a3c9ad 100644 --- a/integration-test/kubernetes-api-java/pom.xml +++ b/integration-test/kubernetes-api-java/pom.xml @@ -17,8 +17,8 @@ UTF-8 11 - 2.9.2 - 10.6.1 + 2.9.3 + 10.6.3 1.5.0 2.13 diff --git a/native-image-tests/build.sbt b/native-image-tests/build.sbt index 324b2f94..e27e596f 100644 --- a/native-image-tests/build.sbt +++ b/native-image-tests/build.sbt @@ -6,8 +6,8 @@ scalaVersion := "2.13.13" resolvers += "Akka library repository".at("https://repo.akka.io/maven") -lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.9.2") -lazy val akkaHttpVersion = sys.props.getOrElse("akka.http.version", "10.6.1") +lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.9.3") +lazy val akkaHttpVersion = sys.props.getOrElse("akka.http.version", "10.6.3") // Note: this default isn't really used anywhere so not important to bump lazy val akkaManagementVersion = sys.props.getOrElse("akka.management.version", "1.5.0") diff --git a/samples/akka-sample-cluster-kubernetes-java/pom.xml b/samples/akka-sample-cluster-kubernetes-java/pom.xml index 8f1ff2be..055d7a4c 100644 --- a/samples/akka-sample-cluster-kubernetes-java/pom.xml +++ b/samples/akka-sample-cluster-kubernetes-java/pom.xml @@ -10,8 +10,8 @@ 17 17 UTF-8 - 2.9.2 - 1.5.1 + 2.9.3 + 1.5.2 10.6.2 2.13 ${git.commit.time}-${git.commit.id.abbrev} diff --git a/samples/akka-sample-cluster-kubernetes-scala/build.sbt b/samples/akka-sample-cluster-kubernetes-scala/build.sbt index a7e9c24a..ed95179a 100644 --- a/samples/akka-sample-cluster-kubernetes-scala/build.sbt +++ b/samples/akka-sample-cluster-kubernetes-scala/build.sbt @@ -4,8 +4,8 @@ name := "akka-sample-cluster-kubernetes" scalaVersion := "2.13.13" lazy val akkaHttpVersion = "10.6.2" -lazy val akkaVersion = "2.9.2" -lazy val akkaManagementVersion = "1.5.1" +lazy val akkaVersion = "2.9.3" +lazy val akkaManagementVersion = "1.5.2" // make version compatible with docker for publishing ThisBuild / dynverSeparator := "-"