diff --git a/build.sbt b/build.sbt index b647a4d8..653c481a 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,6 @@ lazy val mkBatAssemblyTask = taskKey[File]("Create a Windows bat assembly") // TODO remove these resolvers when we start using released Pekko jars ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo -ThisBuild / resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/") ThisBuild / updateOptions := updateOptions.value.withLatestSnapshots(false) val pekkoGrpcCodegenId = s"$pekkoPrefix-codegen" diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle index 966993ac..4a03edb5 100644 --- a/plugin-tester-java/build.gradle +++ b/plugin-tester-java/build.gradle @@ -13,7 +13,6 @@ pekkoGrpc { repositories { mavenLocal() - maven { url 'https://repository.apache.org/content/groups/staging/' } // TODO remove this resolver when we start using released Pekko jars } def scalaFullVersion = "2.12.18" @@ -21,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+4456-9a4c0fc7-SNAPSHOT' + implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0+4468-963bd592-SNAPSHOT' implementation "org.scala-lang:scala-library:${scalaFullVersion}" - testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0-RC3" + testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0" 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 index 3128d0d2..0f5969d4 100644 --- a/plugin-tester-java/pom.xml +++ b/plugin-tester-java/pom.xml @@ -15,7 +15,7 @@ 1.8 3.1.2 3.0.0 - 0.0.0+4456-9a4c0fc7-SNAPSHOT + 0.0.0+4468-963bd592-SNAPSHOT 1.48.1 UTF-8 @@ -26,12 +26,6 @@ Apache Snapshots Repository https://repository.apache.org/content/repositories/snapshots/ - - - apache-staging - Apache Staging Repository - https://repository.apache.org/content/groups/staging/ - diff --git a/plugin-tester-scala/build.gradle b/plugin-tester-scala/build.gradle index 60c56ebf..397be715 100644 --- a/plugin-tester-scala/build.gradle +++ b/plugin-tester-scala/build.gradle @@ -8,7 +8,6 @@ pekkoGrpc { repositories { mavenLocal() - maven { url 'https://repository.apache.org/content/groups/staging/' } // TODO remove this resolver when we start using released Pekko jars } def scalaFullVersion = "2.12.18" @@ -16,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+4456-9a4c0fc7-SNAPSHOT' + implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0+4468-963bd592-SNAPSHOT' implementation "org.scala-lang:scala-library:${scalaFullVersion}" - testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0-RC3" + testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0" 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 index 1e05d30e..22f377c4 100644 --- a/plugin-tester-scala/pom.xml +++ b/plugin-tester-scala/pom.xml @@ -13,8 +13,8 @@ 1.8 1.8 - 1.0.0-RC3 - 0.0.0+4456-9a4c0fc7-SNAPSHOT + 1.0.0 + 0.0.0+4468-963bd592-SNAPSHOT 1.48.1 UTF-8 @@ -25,12 +25,6 @@ Apache Snapshots Repository https://repository.apache.org/content/repositories/snapshots/ - - - apache-staging - Apache Staging Repository - https://repository.apache.org/content/groups/staging/ - diff --git a/project/Dependencies.scala b/project/Dependencies.scala index fc04b5a9..de06e905 100644 --- 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-RC3" + val pekko = "1.0.0" val pekkoBinary = "current" - val pekkoHttp = "0.0.0+4456-9a4c0fc7-SNAPSHOT" + val pekkoHttp = "0.0.0+4468-963bd592-SNAPSHOT" 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 index 956993cf..a50522b5 100644 --- 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 @@ -4,7 +4,6 @@ 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-java/02-server-reflection/build.sbt b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt index 1d1776f3..b5dd1be9 100644 --- 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 @@ -4,7 +4,6 @@ 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-java/03-no-java-package/build.sbt b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt index 1d1776f3..b5dd1be9 100644 --- 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 @@ -4,7 +4,6 @@ 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-java/04-crash-on-keywords/build.sbt b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt index 956993cf..a50522b5 100644 --- 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 @@ -4,7 +4,6 @@ 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-java/05-duplicate-messages-different-packages/build.sbt b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt index 1d1776f3..b5dd1be9 100644 --- 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 @@ -4,7 +4,6 @@ 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/00-interop/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt index 508c16c4..0e7f477c 100644 --- 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 @@ -4,7 +4,6 @@ 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/") organization := "org.apache.pekko" 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 index db52cd0c..e74a9111 100644 --- 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 @@ -2,7 +2,6 @@ scalaVersion := "3.3.0" // 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"