From bbff2587d538f2f784c2b23d87a826d1d8d7e970 Mon Sep 17 00:00:00 2001 From: Pawel Lipski Date: Sat, 4 Jan 2025 12:15:07 +0100 Subject: [PATCH] Remove references to http2-support --- .scala-steward.conf | 1 - examples/akka-persistence-app/build.sbt | 3 --- examples/akka-persistence-app/src/main/resources/grpc.conf | 2 -- scripts/akka-to-pekko.sed | 1 - 4 files changed, 7 deletions(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index fecd73e2..6c913e62 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -74,7 +74,6 @@ updates { # 10.3.0 release for akka-http. So, we want to stick to 10.2.x for now to avoid potential license-connected problems. { groupId = "com.typesafe.akka", artifactId="akka-http", version = "10.2." } { groupId = "com.typesafe.akka", artifactId="akka-http-spray-json", version = "10.2." } - { groupId = "com.typesafe.akka", artifactId="akka-http2-support", version = "10.2." } # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the # 1.2.0 release for akka-management - related modules. So, we want to stick to 1.1.x for now to avoid # potential license-connected problems. diff --git a/examples/akka-persistence-app/build.sbt b/examples/akka-persistence-app/build.sbt index 4ffd41b9..b203b740 100644 --- a/examples/akka-persistence-app/build.sbt +++ b/examples/akka-persistence-app/build.sbt @@ -24,7 +24,6 @@ ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo val akkaVersion = "2.6.20" val akkaHttpVersion = "10.2.10" -val akkaHttp2SupportVersion = "10.2.10" val akkaManagementVersion = "1.1.4" val akkaPersistenceJdbcVersion = "5.1.0" val akkaProjectionVersion = "1.2.5" @@ -56,8 +55,6 @@ libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-slf4j" % akkaVersion, "ch.qos.logback" % "logback-classic" % "1.5.15", "org.scalatest" %% "scalatest" % "3.2.12" % Test, - // 2. Using gRPC and/or protobuf - "com.typesafe.akka" %% "akka-http2-support" % akkaHttp2SupportVersion, // 3. Using Akka Persistence "com.typesafe.akka" %% "akka-persistence-typed" % akkaVersion, "com.typesafe.akka" %% "akka-serialization-jackson" % akkaVersion, diff --git a/examples/akka-persistence-app/src/main/resources/grpc.conf b/examples/akka-persistence-app/src/main/resources/grpc.conf index 6e322df2..a95e488c 100644 --- a/examples/akka-persistence-app/src/main/resources/grpc.conf +++ b/examples/akka-persistence-app/src/main/resources/grpc.conf @@ -1,5 +1,3 @@ -akka.http.server.preview.enable-http2 = on - akka-persistence-app { grpc { diff --git a/scripts/akka-to-pekko.sed b/scripts/akka-to-pekko.sed index 1f517979..0ea82347 100644 --- a/scripts/akka-to-pekko.sed +++ b/scripts/akka-to-pekko.sed @@ -24,7 +24,6 @@ s/\/ASH/g s/(val pekkoGrpcRuntimeVersion) = ".*"/\1 = "1.1.1"/ s/(val pekkoGrpcSbtPluginVersion) = ".*"/\1 = "1.1.1"/ -s/(val pekkoHttp2SupportVersion) = .*/\1 = "0.0.0+4272-045c925b-SNAPSHOT"/ s/(val pekkoHttpCorsVersion) = .*/\1 = "1.1.0"/ s/(val pekkoHttpVersion) = .*/\1 = "1.1.0"/ s/(val pekkoManagementVersion) = .*/\1 = "1.1.0"/