From 45a51417a1ae1e0749f569345d7df7459b253e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Wed, 15 May 2024 14:19:25 +0200 Subject: [PATCH] chore: License change date and sample bump for 1.5.4 (#1158) * chore: License change date for 1.5.4 * bump: Sample Akka dependencies --- LICENSE | 4 ++-- samples/grpc/iot-service-java/pom.xml | 4 ++-- .../src/main/java/iot/temperature/TemperatureEvents.java | 4 +--- samples/grpc/iot-service-scala/build.sbt | 2 +- samples/grpc/local-drone-control-java/pom.xml | 4 ++-- samples/grpc/local-drone-control-scala/build.sbt | 4 ++-- .../grpc/restaurant-drone-deliveries-service-scala/build.sbt | 2 +- samples/grpc/shopping-analytics-service-java/pom.xml | 2 +- samples/grpc/shopping-analytics-service-scala/build.sbt | 2 +- samples/grpc/shopping-cart-service-java/pom.xml | 2 +- samples/replicated/shopping-cart-service-java/pom.xml | 2 +- samples/replicated/shopping-cart-service-scala/build.sbt | 2 +- 12 files changed, 16 insertions(+), 18 deletions(-) diff --git a/LICENSE b/LICENSE index b24dee33c..c16f263e5 100644 --- a/LICENSE +++ b/LICENSE @@ -3,7 +3,7 @@ Business Source License 1.1 Parameters Licensor: Lightbend, Inc. -Licensed Work: Akka Projection 1.5.3 +Licensed Work: Akka Projection 1.5.4 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-03-13 +Change Date: 2027-05-15 Change License: Apache License, Version 2.0 diff --git a/samples/grpc/iot-service-java/pom.xml b/samples/grpc/iot-service-java/pom.xml index 6705269bd..a223eeade 100644 --- a/samples/grpc/iot-service-java/pom.xml +++ b/samples/grpc/iot-service-java/pom.xml @@ -18,9 +18,9 @@ UTF-8 2.9.3 - + 1.5.4 1.2.3 - 1.5.1 + 1.5.2 2.1.0 2.4.3 2.4.3 diff --git a/samples/grpc/iot-service-java/src/main/java/iot/temperature/TemperatureEvents.java b/samples/grpc/iot-service-java/src/main/java/iot/temperature/TemperatureEvents.java index 6bd6efe78..14cda4d0c 100644 --- a/samples/grpc/iot-service-java/src/main/java/iot/temperature/TemperatureEvents.java +++ b/samples/grpc/iot-service-java/src/main/java/iot/temperature/TemperatureEvents.java @@ -43,9 +43,7 @@ public static Function> pushedEventsG EventProducerPushDestination.create( TEMPERATURE_EVENT_STREAM_ID, Collections.singletonList(iot.temperature.proto.TemperatureEvents.getDescriptor()), - system) - // FIXME withTransformation can be removed when updating to akka-projection-grpc 1.5.1 - .withTransformation(Transformation.identity()); + system); return EventProducerPushDestination.grpcServiceHandler(destination, system); } diff --git a/samples/grpc/iot-service-scala/build.sbt b/samples/grpc/iot-service-scala/build.sbt index 4486de002..7d8499071 100644 --- a/samples/grpc/iot-service-scala/build.sbt +++ b/samples/grpc/iot-service-scala/build.sbt @@ -30,7 +30,7 @@ Global / cancelable := false // ctrl-c val AkkaVersion = "2.9.3" val AkkaHttpVersion = "10.6.3" -val AkkaManagementVersion = "1.5.1" +val AkkaManagementVersion = "1.5.2" val AkkaPersistenceR2dbcVersion = "1.2.3" val AkkaProjectionVersion = sys.props.getOrElse("akka-projection.version", "") diff --git a/samples/grpc/local-drone-control-java/pom.xml b/samples/grpc/local-drone-control-java/pom.xml index 270167d19..2917c90f6 100644 --- a/samples/grpc/local-drone-control-java/pom.xml +++ b/samples/grpc/local-drone-control-java/pom.xml @@ -18,9 +18,9 @@ UTF-8 2.9.3 - + 1.5.4 1.2.3 - 1.5.1 + 1.5.2 2.1.0 10.6.3 2.4.3 diff --git a/samples/grpc/local-drone-control-scala/build.sbt b/samples/grpc/local-drone-control-scala/build.sbt index c70954b35..6a3237c77 100644 --- a/samples/grpc/local-drone-control-scala/build.sbt +++ b/samples/grpc/local-drone-control-scala/build.sbt @@ -32,10 +32,10 @@ Global / cancelable := false // ctrl-c val AkkaVersion = "2.9.3" val AkkaHttpVersion = "10.6.3" -val AkkaManagementVersion = "1.5.1" +val AkkaManagementVersion = "1.5.2" val AkkaPersistenceR2dbcVersion = "1.2.3" val AkkaProjectionVersion = - sys.props.getOrElse("akka-projection.version", "1.5.3") + sys.props.getOrElse("akka-projection.version", "1.5.4") val AkkaDiagnosticsVersion = "2.1.0" enablePlugins(AkkaGrpcPlugin) diff --git a/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt b/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt index 1f8f4a03d..e4083f96d 100644 --- a/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt +++ b/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt @@ -33,7 +33,7 @@ val AkkaHttpVersion = "10.6.3" val AkkaManagementVersion = "1.5.1" val AkkaPersistenceR2dbcVersion = "1.2.3" val AkkaProjectionVersion = - sys.props.getOrElse("akka-projection.version", "1.5.2") + sys.props.getOrElse("akka-projection.version", "1.5.4") val AkkaDiagnosticsVersion = "2.1.0" enablePlugins(AkkaGrpcPlugin) diff --git a/samples/grpc/shopping-analytics-service-java/pom.xml b/samples/grpc/shopping-analytics-service-java/pom.xml index 31abd889d..eb9e215ce 100644 --- a/samples/grpc/shopping-analytics-service-java/pom.xml +++ b/samples/grpc/shopping-analytics-service-java/pom.xml @@ -18,7 +18,7 @@ UTF-8 2.9.3 - 1.5.2 + 1.5.4 1.2.3 1.5.1 2.1.0 diff --git a/samples/grpc/shopping-analytics-service-scala/build.sbt b/samples/grpc/shopping-analytics-service-scala/build.sbt index c085382f4..a238e8150 100644 --- a/samples/grpc/shopping-analytics-service-scala/build.sbt +++ b/samples/grpc/shopping-analytics-service-scala/build.sbt @@ -33,7 +33,7 @@ val AkkaHttpVersion = "10.6.3" val AkkaManagementVersion = "1.5.1" val AkkaPersistenceR2dbcVersion = "1.2.3" val AkkaProjectionVersion = - sys.props.getOrElse("akka-projection.version", "1.5.2") + sys.props.getOrElse("akka-projection.version", "1.5.4") val AkkaDiagnosticsVersion = "2.1.0" enablePlugins(AkkaGrpcPlugin) diff --git a/samples/grpc/shopping-cart-service-java/pom.xml b/samples/grpc/shopping-cart-service-java/pom.xml index 56cc672be..d990e3743 100644 --- a/samples/grpc/shopping-cart-service-java/pom.xml +++ b/samples/grpc/shopping-cart-service-java/pom.xml @@ -18,7 +18,7 @@ UTF-8 2.9.3 - 1.5.2 + 1.5.4 1.2.3 1.5.1 2.1.0 diff --git a/samples/replicated/shopping-cart-service-java/pom.xml b/samples/replicated/shopping-cart-service-java/pom.xml index ada5860f4..52df87e85 100644 --- a/samples/replicated/shopping-cart-service-java/pom.xml +++ b/samples/replicated/shopping-cart-service-java/pom.xml @@ -18,7 +18,7 @@ UTF-8 2.9.1 - 1.5.2 + 1.5.4 1.2.2 1.5.0 2.1.0 diff --git a/samples/replicated/shopping-cart-service-scala/build.sbt b/samples/replicated/shopping-cart-service-scala/build.sbt index d64eb64f4..ed17a794c 100644 --- a/samples/replicated/shopping-cart-service-scala/build.sbt +++ b/samples/replicated/shopping-cart-service-scala/build.sbt @@ -34,7 +34,7 @@ val AkkaHttpVersion = "10.6.0" val AkkaManagementVersion = "1.5.0" val AkkaPersistenceR2dbcVersion = "1.2.2" val AkkaProjectionVersion = - sys.props.getOrElse("akka-projection.version", "1.5.2") + sys.props.getOrElse("akka-projection.version", "1.5.4") val AkkaDiagnosticsVersion = "2.1.0" enablePlugins(AkkaGrpcPlugin)