pekko http 1.0.0 (#121)

* pekko http 1.0.0 * remove snapshot repositories in poms
apache · Aug 2, 2023 · b68b395 · b68b395
1 parent cc19087
commit b68b395
Show file tree

Hide file tree

Showing 23 changed files with 9 additions and 90 deletions.
diff --git a/build.sbt b/build.sbt
@@ -34,10 +34,6 @@ lazy val mkBatAssemblyTask = taskKey[File]("Create a Windows bat assembly")
 // gradle plugin compatibility (avoid `+` in snapshot versions)
 (ThisBuild / dynverSeparator) := "-"
 
-// TODO remove these resolvers when we start using released Pekko jars
-ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo
-ThisBuild / updateOptions := updateOptions.value.withLatestSnapshots(false)
-
 val pekkoGrpcCodegenId = s"$pekkoPrefix-codegen"
 lazy val codegen = Project(id = "codegen", base = file("codegen"))
   .enablePlugins(SbtTwirl, BuildInfoPlugin)

diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle
@@ -20,9 +20,9 @@ def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion)
 def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
 
 dependencies {
-  implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0+4468-963bd592-SNAPSHOT'
+  implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '1.0.0'
   implementation "org.scala-lang:scala-library:${scalaFullVersion}"
-  testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0"
+  testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.1"
   testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.15"
   testImplementation "org.scalatestplus:junit-4-13_${scalaBinaryVersion}:3.2.15.0"
 }
diff --git a/plugin-tester-java/pom.xml b/plugin-tester-java/pom.xml
@@ -15,19 +15,11 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
     <maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
-    <pekko.http.version>0.0.0+4468-963bd592-SNAPSHOT</pekko.http.version>
+    <pekko.http.version>1.0.0</pekko.http.version>
     <grpc.version>1.48.1</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
     <project.encoding>UTF-8</project.encoding>
   </properties>
 
-  <repositories>
-    <repository>
-      <id>apache-snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>https://repository.apache.org/content/repositories/snapshots/</url>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.pekko</groupId>

diff --git a/plugin-tester-scala/build.gradle b/plugin-tester-scala/build.gradle
@@ -15,9 +15,9 @@ def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion)
 def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
 
 dependencies {
-  implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0+4468-963bd592-SNAPSHOT'
+  implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '1.0.0'
   implementation "org.scala-lang:scala-library:${scalaFullVersion}"
-  testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0"
+  testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.1"
   testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.15"
   testImplementation "org.scalatestplus:junit-4-13_${scalaBinaryVersion}:3.2.15.0"
 }
diff --git a/plugin-tester-scala/pom.xml b/plugin-tester-scala/pom.xml
@@ -13,20 +13,12 @@
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <pekko.version>1.0.0</pekko.version>
-    <pekko.http.version>0.0.0+4468-963bd592-SNAPSHOT</pekko.http.version>
+    <pekko.version>1.0.1</pekko.version>
+    <pekko.http.version>1.0.0</pekko.http.version>
     <grpc.version>1.48.1</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
     <project.encoding>UTF-8</project.encoding>
   </properties>
 
-  <repositories>
-    <repository>
-      <id>apache-snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>https://repository.apache.org/content/repositories/snapshots/</url>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.pekko</groupId>

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -26,9 +26,9 @@ object Dependencies {
     // We don't force Pekko updates because downstream projects can upgrade
     // themselves. For more information see
     // https://pekko.apache.org//docs/pekko/current/project/downstream-upgrade-strategy.html
-    val pekko = "1.0.0"
+    val pekko = "1.0.1"
     val pekkoBinary = "current"
-    val pekkoHttp = "0.0.0+4468-963bd592-SNAPSHOT"
+    val pekkoHttp = "1.0.0"
     val pekkoHttpBinary = "current"
 
     val grpc = "1.48.1" // checked synced by VersionSyncCheckPlugin

diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
@@ -2,9 +2,6 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-
 enablePlugins(PekkoGrpcPlugin)
 
 javacOptions += "-Xdoclint:all"

diff --git a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
@@ -2,9 +2,6 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-
 enablePlugins(PekkoGrpcPlugin)
 
 pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
diff --git a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
@@ -2,9 +2,6 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-
 enablePlugins(PekkoGrpcPlugin)
 
 pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
@@ -2,9 +2,6 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-
 enablePlugins(PekkoGrpcPlugin)
 
 javacOptions += "-Xdoclint:all"

diff --git a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
@@ -2,9 +2,6 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-
 enablePlugins(PekkoGrpcPlugin)
 
 pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
@@ -2,9 +2,6 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-
 organization := "org.apache.pekko"
 
 val grpcVersion = "1.48.1" // checked synced by VersionSyncCheckPlugin

diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
@@ -2,10 +2,6 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
-
 scalacOptions += "-Xfatal-warnings"
 
 enablePlugins(PekkoGrpcPlugin)

diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
@@ -2,8 +2,4 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
-
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
@@ -2,10 +2,6 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
-
 enablePlugins(PekkoGrpcPlugin)
 
 Compile / pekkoGrpcGeneratedSources := Seq(PekkoGrpc.Server)

diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
@@ -2,8 +2,4 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
-
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
@@ -2,8 +2,4 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
-
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
@@ -2,10 +2,6 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
-
 enablePlugins(ProtocJSPlugin) // enable it first to test possibility of getting overriden
 
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
@@ -2,10 +2,6 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
-
 enablePlugins(PekkoGrpcPlugin)
 
 assembly / assemblyMergeStrategy := {

diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
@@ -2,10 +2,6 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
-
 enablePlugins(PekkoGrpcPlugin)
 
 // Don't enable it flat_package globally, but via a package-level option instead (see package.proto)

diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
@@ -2,10 +2,6 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
-
 //#setup
 import scalapb.GeneratorOption._
 

diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt
@@ -2,8 +2,4 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
-
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
@@ -1,8 +1,5 @@
 scalaVersion := "3.3.0"
 
-// TODO remove these resolvers when we start using released Pekko jars
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-
 scalacOptions += "-Xfatal-warnings"
 
 enablePlugins(PekkoGrpcPlugin)