You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/02/28 13:47:55 UTC
[incubator-pekko-grpc] branch main updated: use pekko groupId and update some artifact names in docs (#35)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-grpc.git
The following commit(s) were added to refs/heads/main by this push:
new 5fb413bc use pekko groupId and update some artifact names in docs (#35)
5fb413bc is described below
commit 5fb413bc159461dfbcc6f0ac9575c339c04e3379
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Tue Feb 28 14:47:49 2023 +0100
use pekko groupId and update some artifact names in docs (#35)
---
benchmark-java/build.sbt | 2 +-
benchmark-java/project/plugins.sbt | 2 +-
docs/src/main/paradox/buildtools/maven.md | 12 ++++++------
docs/src/main/paradox/client/walkthrough.md | 10 +++++-----
docs/src/main/paradox/server/walkthrough.md | 10 +++++-----
gradle-plugin/build.gradle | 2 +-
.../org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy | 6 +++---
gradle-plugin/src/test/groovy/unit/DependenciesSpec.groovy | 4 ++--
maven-plugin/src/main/maven/plugin.xml | 2 +-
plugin-tester-java/pom.xml | 6 +++---
plugin-tester-scala/pom.xml | 6 +++---
project/Common.scala | 4 ++--
project/ReflectiveCodeGen.scala | 2 +-
.../sbt-test/gen-java/01-gen-basic-java/project/plugins.sbt | 2 +-
.../gen-java/02-server-reflection/project/plugins.sbt | 2 +-
.../sbt-test/gen-java/03-no-java-package/project/plugins.sbt | 2 +-
.../gen-java/04-crash-on-keywords/project/plugins.sbt | 2 +-
.../project/plugins.sbt | 2 +-
.../src/sbt-test/gen-scala-server/00-interop/build.sbt | 4 ++--
.../sbt-test/gen-scala-server/00-interop/project/plugins.sbt | 2 +-
.../gen-scala-server/01-gen-basic-server/project/plugins.sbt | 2 +-
.../02-multiple-services/project/plugins.sbt | 2 +-
.../gen-scala-server/03-test-config/project/plugins.sbt | 2 +-
.../04-server-reflection/project/plugins.sbt | 2 +-
.../gen-scala-server/05-no-java-package/project/plugins.sbt | 2 +-
.../06-compatibility-plugins/project/plugins.sbt | 2 +-
.../07-gen-basic-server-with-pekko/build.sbt | 2 --
.../07-gen-basic-server-with-pekko/project/plugins.sbt | 2 +-
.../09-scalapb-customizations/project/plugins.sbt | 2 +-
.../gen-scala-server/10-scalapb-validate/project/plugins.sbt | 2 +-
.../project/plugins.sbt | 2 +-
.../scala3/01-basic-client-server/project/plugins.sbt | 2 +-
32 files changed, 53 insertions(+), 55 deletions(-)
diff --git a/benchmark-java/build.sbt b/benchmark-java/build.sbt
index 3a5d70f7..b1ce1651 100644
--- a/benchmark-java/build.sbt
+++ b/benchmark-java/build.sbt
@@ -17,7 +17,7 @@ val root = project
// Use this instead of above when importing to IDEA, after publishLocal and replacing the version here
/*
.settings(libraryDependencies ++= Seq(
- "com.lightbend.akka.grpc" %% "pekko-grpc-runtime" % "0.1+32-fd597fcb+20180618-1248"
+ "org.apache.pekko" %% "pekko-grpc-runtime" % "0.1+32-fd597fcb+20180618-1248"
))
*/
.settings(
diff --git a/benchmark-java/project/plugins.sbt b/benchmark-java/project/plugins.sbt
index 865256d0..6a536316 100644
--- a/benchmark-java/project/plugins.sbt
+++ b/benchmark-java/project/plugins.sbt
@@ -1,3 +1,3 @@
lazy val plugins = (project in file(".")).dependsOn(ProjectRef(file("../../"), "sbt-plugin"))
// Use this instead of above when importing to IDEA, after publishLocal and replacing the version here
-//addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % "0.1+32-fd597fcb+20180618-1248")
+//addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % "0.1+32-fd597fcb+20180618-1248")
diff --git a/docs/src/main/paradox/buildtools/maven.md b/docs/src/main/paradox/buildtools/maven.md
index ef8c6d47..dda59a21 100644
--- a/docs/src/main/paradox/buildtools/maven.md
+++ b/docs/src/main/paradox/buildtools/maven.md
@@ -10,8 +10,8 @@ By default both client and server in Java are generated.
Java
: ```xml
<plugin>
- <groupId>com.lightbend.akka.grpc</groupId>
- <artifactId>akka-grpc-maven-plugin</artifactId>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-grpc-maven-plugin</artifactId>
<version>${pekko.grpc.version}</version>
<configuration>
<language>Java</language>
@@ -24,8 +24,8 @@ Java
Scala
: ```xml
<plugin>
- <groupId>com.lightbend.akka.grpc</groupId>
- <artifactId>akka-grpc-maven-plugin</artifactId>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-grpc-maven-plugin</artifactId>
<version>${pekko.grpc.version}</version>
<configuration>
<language>Scala</language>
@@ -61,8 +61,8 @@ which is a relative path to the project basedir. The below configuration overrid
`pom.xml`
: ```xml
<plugin>
- <groupId>com.lightbend.akka.grpc</groupId>
- <artifactId>akka-grpc-maven-plugin</artifactId>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-grpc-maven-plugin</artifactId>
<version>${pekko.grpc.version}</version>
<configuration>
<protoPaths>
diff --git a/docs/src/main/paradox/client/walkthrough.md b/docs/src/main/paradox/client/walkthrough.md
index 0b4971ff..4194d744 100644
--- a/docs/src/main/paradox/client/walkthrough.md
+++ b/docs/src/main/paradox/client/walkthrough.md
@@ -14,7 +14,7 @@ sbt
: @@@vars
```scala
// in project/plugins.sbt:
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % "$project.version$")
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % "$project.version$")
// in build.sbt:
enablePlugins(PekkoGrpcPlugin)
```
@@ -28,7 +28,7 @@ buildscript {
// version here is a placeholder,
// it is replaced with a project dependency during integration tests
// by adding --include-build <path> to gradlew
- classpath 'com.lightbend.akka.grpc:akka-grpc-gradle-plugin:$project.version$'
+ classpath 'org.apache.pekko:pekko-grpc-gradle-plugin:$project.version$'
}
}
plugins {
@@ -57,7 +57,7 @@ Maven
</properties>
<dependencies>
<dependency>
- <groupId>com.lightbend.akka.grpc</groupId>
+ <groupId>org.apache.pekko</groupId>
<artifactId>pekko-grpc-runtime_2.12</artifactId>
<version>${pekko.grpc.version}</version>
</dependency>
@@ -71,8 +71,8 @@ Maven
<build>
<plugins>
<plugin>
- <groupId>com.lightbend.akka.grpc</groupId>
- <artifactId>akka-grpc-maven-plugin</artifactId>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-grpc-maven-plugin</artifactId>
<version>${pekko.grpc.version}</version>
<!-- Hook the generate goal into the lifecycle,
automatically tied to generate-sources -->
diff --git a/docs/src/main/paradox/server/walkthrough.md b/docs/src/main/paradox/server/walkthrough.md
index 64212f70..382a6052 100644
--- a/docs/src/main/paradox/server/walkthrough.md
+++ b/docs/src/main/paradox/server/walkthrough.md
@@ -12,7 +12,7 @@ sbt
: @@@vars
```scala
// in project/plugins.sbt:
- addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % "$project.version$")
+ addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % "$project.version$")
//
// in build.sbt:
enablePlugins(PekkoGrpcPlugin)
@@ -30,7 +30,7 @@ Gradle
dependencies {
// see https://plugins.gradle.org/plugin/org.apache.pekko.grpc.gradle
// for the currently latest version.
- classpath 'gradle.plugin.com.lightbend.akka.grpc:akka-grpc-gradle-plugin:$project.version$'
+ classpath 'gradle.plugin.org.apache.pekko:pekko-grpc-gradle-plugin:$project.version$'
}
}
plugins {
@@ -63,7 +63,7 @@ Maven
</properties>
<dependencies>
<dependency>
- <groupId>com.lightbend.akka.grpc</groupId>
+ <groupId>org.apache.pekko</groupId>
<artifactId>pekko-grpc-runtime_2.12</artifactId>
<version>${pekko.grpc.version}</version>
</dependency>
@@ -71,8 +71,8 @@ Maven
<build>
<plugins>
<plugin>
- <groupId>com.lightbend.akka.grpc</groupId>
- <artifactId>akka-grpc-maven-plugin</artifactId>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-grpc-maven-plugin</artifactId>
<version>${pekko.grpc.version}</version>
<executions>
<execution>
diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle
index c3c5c9d2..8f3638b4 100644
--- a/gradle-plugin/build.gradle
+++ b/gradle-plugin/build.gradle
@@ -6,7 +6,7 @@ plugins {
id 'com.gradle.plugin-publish' version '0.11.0'
}
-group = "com.lightbend.akka.grpc"
+group = "org.apache.pekko"
// https://github.com/palantir/gradle-git-version/issues/97
def tag = "git describe --tags".execute().text.substring(1).split("-g")[0].replace("\n", "")
diff --git a/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy
index 6d3d4060..687ff4b1 100644
--- a/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy
+++ b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy
@@ -106,11 +106,11 @@ class PekkoGrpcPlugin implements Plugin<Project> {
}
plugins {
pekkoGrpc {
- artifact = "com.lightbend.akka.grpc:pekko-grpc-codegen_${PROTOC_PLUGIN_SCALA_VERSION}:${baselineVersion}:${assemblyClassifier}@${assemblySuffix}"
+ artifact = "org.apache.pekko:pekko-grpc-codegen_${PROTOC_PLUGIN_SCALA_VERSION}:${baselineVersion}:${assemblyClassifier}@${assemblySuffix}"
}
if (pekkoGrpcExt.scala) {
scalapb {
- artifact = "com.lightbend.akka.grpc:pekko-grpc-scalapb-protoc-plugin_${PROTOC_PLUGIN_SCALA_VERSION}:${baselineVersion}:${assemblyClassifier}@${assemblySuffix}"
+ artifact = "org.apache.pekko:pekko-grpc-scalapb-protoc-plugin_${PROTOC_PLUGIN_SCALA_VERSION}:${baselineVersion}:${assemblyClassifier}@${assemblySuffix}"
}
}
}
@@ -159,7 +159,7 @@ class PekkoGrpcPlugin implements Plugin<Project> {
def scalaVersion = autodetectScala()
p.dependencies {
- implementation "com.lightbend.akka.grpc:pekko-grpc-runtime_${scalaVersion}:${baselineVersion}"
+ implementation "org.apache.pekko:pekko-grpc-runtime_${scalaVersion}:${baselineVersion}"
implementation "io.grpc:grpc-stub:${GRPC_VERSION}"
}
}
diff --git a/gradle-plugin/src/test/groovy/unit/DependenciesSpec.groovy b/gradle-plugin/src/test/groovy/unit/DependenciesSpec.groovy
index d9bc8776..7f55ab6f 100644
--- a/gradle-plugin/src/test/groovy/unit/DependenciesSpec.groovy
+++ b/gradle-plugin/src/test/groovy/unit/DependenciesSpec.groovy
@@ -15,7 +15,7 @@ class DependenciesSpec extends BaseSpec {
static final String PROTOC_PLUGIN_CODEGEN = "pekkoGrpc"
def checkCodegen(Dependency d, PekkoGrpcPluginExtension ext) {
- assert d.group == "com.lightbend.akka.grpc"
+ assert d.group == "org.apache.pekko"
assert d.name == "pekko-grpc-codegen_${PROTOC_PLUGIN_SCALA_VERSION}"
assert d.version == ext.pluginVersion
true
@@ -24,7 +24,7 @@ class DependenciesSpec extends BaseSpec {
static final String PROTOC_PLUGIN_SCALAPB = "scalapb"
def checkScalapb(Dependency d, PekkoGrpcPluginExtension ext) {
- assert d.group == "com.lightbend.akka.grpc"
+ assert d.group == "org.apache.pekko"
assert d.name == "pekko-grpc-scalapb-protoc-plugin_${PROTOC_PLUGIN_SCALA_VERSION}"
assert d.version == ext.pluginVersion
true
diff --git a/maven-plugin/src/main/maven/plugin.xml b/maven-plugin/src/main/maven/plugin.xml
index f98f0e26..5b4ec31e 100644
--- a/maven-plugin/src/main/maven/plugin.xml
+++ b/maven-plugin/src/main/maven/plugin.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/PLUGIN/1.0.0 http://maven.apache.org/xsd/plugin-1.0.0.xsd">
<name>Apache Pekko gRPC</name>
<description>Generate gRPC client and/or server code</description>
- <groupId>com.lightbend.akka.grpc</groupId>
+ <groupId>org.apache.pekko</groupId>
<artifactId>pekko-grpc-maven-plugin</artifactId>
<goalPrefix>pekko-grpc</goalPrefix>
<mojos>
diff --git a/plugin-tester-java/pom.xml b/plugin-tester-java/pom.xml
index 1e61f46d..e72df146 100644
--- a/plugin-tester-java/pom.xml
+++ b/plugin-tester-java/pom.xml
@@ -6,7 +6,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<name>Pekko gRPC Java example project</name>
- <groupId>com.lightbend.akka.grpc</groupId>
+ <groupId>org.apache.pekko</groupId>
<artifactId>grpc-plugin-tester-java</artifactId>
<version>0.1-SNAPSHOT</version>
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
- <groupId>com.lightbend.akka.grpc</groupId>
+ <groupId>org.apache.pekko</groupId>
<artifactId>pekko-grpc-runtime_2.12</artifactId>
<version>${pekko.grpc.project.version}</version>
</dependency>
@@ -52,7 +52,7 @@
<build>
<plugins>
<plugin>
- <groupId>com.lightbend.akka.grpc</groupId>
+ <groupId>org.apache.pekko</groupId>
<artifactId>pekko-grpc-maven-plugin</artifactId>
<version>${pekko.grpc.project.version}</version>
<executions>
diff --git a/plugin-tester-scala/pom.xml b/plugin-tester-scala/pom.xml
index fa673918..fc7b7686 100644
--- a/plugin-tester-scala/pom.xml
+++ b/plugin-tester-scala/pom.xml
@@ -6,7 +6,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<name>Pekko gRPC Scala example project</name>
- <groupId>com.lightbend.akka.grpc</groupId>
+ <groupId>org.apache.pekko</groupId>
<artifactId>grpc-plugin-tester-scala</artifactId>
<version>0.1-SNAPSHOT</version>
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
- <groupId>com.lightbend.akka.grpc</groupId>
+ <groupId>org.apache.pekko</groupId>
<artifactId>pekko-grpc-runtime_2.12</artifactId>
<version>${pekko.grpc.project.version}</version>
</dependency>
@@ -80,7 +80,7 @@
</plugin>
<plugin>
- <groupId>com.lightbend.akka.grpc</groupId>
+ <groupId>org.apache.pekko</groupId>
<artifactId>pekko-grpc-maven-plugin</artifactId>
<version>${pekko.grpc.project.version}</version>
<configuration>
diff --git a/project/Common.scala b/project/Common.scala
index 0e24eb14..4ad6164e 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -19,7 +19,7 @@ object Common extends AutoPlugin {
override def globalSettings =
Seq(
- organization := "com.lightbend.akka.grpc",
+ organization := "org.apache.pekko",
organizationName := "Apache Pekko",
organizationHomepage := Some(url("https://www.apache.org/")),
resolvers ++= Resolver.sonatypeOssRepos("staging"),
@@ -51,7 +51,7 @@ object Common extends AutoPlugin {
// deprecated in 2.13, but used as long as we support 2.12
"-Wconf:msg=Use `scala.jdk.CollectionConverters` instead:silent",
"-Wconf:msg=Use LazyList instead of Stream:silent",
- // ignore imports in templates (FIXME why is that trailig .* needed?)
+ // ignore imports in templates (FIXME why is that trailing .* needed?)
"-Wconf:src=.*.txt.*:silent"),
Compile / console / scalacOptions ~= (_.filterNot(consoleDisabledOptions.contains)),
javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation"),
diff --git a/project/ReflectiveCodeGen.scala b/project/ReflectiveCodeGen.scala
index 8be6c288..e4dc7028 100644
--- a/project/ReflectiveCodeGen.scala
+++ b/project/ReflectiveCodeGen.scala
@@ -56,7 +56,7 @@ object ReflectiveCodeGen extends AutoPlugin {
val oldResolver = PB.artifactResolver.value
Def.task { (artifact: BridgeArtifact) =>
artifact.groupId match {
- case "com.lightbend.akka.grpc" =>
+ case "org.apache.pekko" =>
cp
case _ =>
oldResolver(artifact)
diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
diff --git a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
diff --git a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
diff --git a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
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 49bbc1ff..348739f7 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,13 +4,13 @@ scalaVersion := "2.12.16"
resolvers += "Apache Snapshots".at("https://repository.apache.org/content/repositories/snapshots/")
-organization := "com.lightbend.akka.grpc"
+organization := "org.apache.pekko"
val grpcVersion = "1.48.1" // checked synced by VersionSyncCheckPlugin
libraryDependencies ++= Seq(
"io.grpc" % "grpc-interop-testing" % grpcVersion % "protobuf-src",
- "com.lightbend.akka.grpc" %% "pekko-grpc-interop-tests" % sys.props("project.version") % "test",
+ "org.apache.pekko" %% "pekko-grpc-interop-tests" % sys.props("project.version") % "test",
"org.scalatest" %% "scalatest" % "3.0.4" % "test" // ApacheV2
)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/plugins.sbt
index 3b7d3eea..da199fa5 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
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
index d8b807df..e9847e67 100644
--- 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
@@ -6,8 +6,6 @@ resolvers += "Apache Snapshots".at("https://repository.apache.org/content/reposi
enablePlugins(PekkoGrpcPlugin)
-dependencyOverrides += "com.typesafe.akka" %% "akka-stream" % "2.6.5"
-
assembly / assemblyMergeStrategy := {
// https://github.com/akka/akka/issues/29456
case PathList("google", "protobuf", _) => MergeStrategy.discard
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/plugins.sbt
index 3b7d3eea..da199fa5 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/plugins.sbt
index ea1617ee..364cf97e 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
libraryDependencies ++= Seq("com.thesamet.scalapb" %% "scalapb-validate-codegen" % "0.3.0")
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
diff --git a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/plugins.sbt b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/plugins.sbt
index 3318ef19..fec47297 100644
--- a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/plugins.sbt
+++ b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % sys.props("project.version"))
+addSbtPlugin("org.apache.pekko" % "sbt-pekko-grpc" % sys.props("project.version"))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org