Skip to content

Commit

Permalink
build: License change date for 1.5.3, Akka and HTTP bumps, sample upd…
Browse files Browse the repository at this point in the history
…ates (#1290)
  • Loading branch information
johanandren authored May 13, 2024
1 parent fcc3ffe commit 42a2662
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion integration-test/dns-api-mesos/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions integration-test/kubernetes-api-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<properties>
<encoding>UTF-8</encoding>
<maven.compiler.release>11</maven.compiler.release>
<akka.version>2.9.2</akka.version>
<akka.http.version>10.6.1</akka.http.version>
<akka.version>2.9.3</akka.version>
<akka.http.version>10.6.3</akka.http.version>
<akka-management.version>1.5.0</akka-management.version>
<scala.binary.version>2.13</scala.binary.version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions native-image-tests/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions samples/akka-sample-cluster-kubernetes-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<encoding>UTF-8</encoding>
<akka.version>2.9.2</akka.version>
<akka-management.version>1.5.1</akka-management.version>
<akka.version>2.9.3</akka.version>
<akka-management.version>1.5.2</akka-management.version>
<akka-http.version>10.6.2</akka-http.version>
<scala.binary.version>2.13</scala.binary.version>
<version.number>${git.commit.time}-${git.commit.id.abbrev}</version.number>
Expand Down
4 changes: 2 additions & 2 deletions samples/akka-sample-cluster-kubernetes-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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 := "-"
Expand Down

0 comments on commit 42a2662

Please sign in to comment.