From 6861be849e2be34cddfee21ae67996dada071044 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 13 Jun 2023 15:54:29 +0100 Subject: [PATCH 01/21] upgrade action/cache because of node.js version warnings (#92) --- .github/workflows/build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 0076561b..9ed45680 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -149,7 +149,7 @@ jobs: cat ~/.version - name: Cache local Gradle repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.gradle/caches @@ -205,7 +205,7 @@ jobs: cat ~/.version - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('plugin-tester-*/pom.xml') }} From e3dfefb2256b7d6abbcbddb274cf195bd22e0182 Mon Sep 17 00:00:00 2001 From: Matthew de Detrich Date: Tue, 13 Jun 2023 17:04:40 +0200 Subject: [PATCH 02/21] Cache snapshots to prevent overloading Apache Nexus repo (#87) --- build.sbt | 2 ++ project/plugins.sbt | 1 + 2 files changed, 3 insertions(+) diff --git a/build.sbt b/build.sbt index 9cd7be53..2a167505 100644 --- a/build.sbt +++ b/build.sbt @@ -18,7 +18,9 @@ lazy val mkBatAssemblyTask = taskKey[File]("Create a Windows bat assembly") // gradle plugin compatibility (avoid `+` in snapshot versions) (ThisBuild / dynverSeparator) := "-" +// TODO: Remove when Pekko has a proper release ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo +ThisBuild / updateOptions := updateOptions.value.withLatestSnapshots(false) ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshot") // TODO Remove when proper release of pekko-http-cors is made val pekkoGrpcCodegenId = s"$pekkoPrefix-codegen" diff --git a/project/plugins.sbt b/project/plugins.sbt index 28fe81d2..1780ec6c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -21,6 +21,7 @@ addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.5") // allow access to snapshots for pekko-sbt-paradox resolvers += Resolver.ApacheMavenSnapshotsRepo +updateOptions := updateOptions.value.withLatestSnapshots(false) // See https://github.com/akka/akka-http/pull/3995 and https://github.com/akka/akka-http/pull/3995#issuecomment-1026978593 libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always" From 0900bb28a315325d1a61a24d4606757bf9bf9311 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 14 Jun 2023 03:03:01 +0100 Subject: [PATCH 03/21] fix some left over akka refs (#96) * fix some left over akka refs * Update PekkoDiscoveryNameResolverSpec.scala --- docs/src/main/paradox/server/pekko-http.md | 30 +++++++++---------- .../apache/pekko/grpc/GrpcInteropSpec.scala | 6 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/src/main/paradox/server/pekko-http.md b/docs/src/main/paradox/server/pekko-http.md index 945b6d65..2af182c4 100644 --- a/docs/src/main/paradox/server/pekko-http.md +++ b/docs/src/main/paradox/server/pekko-http.md @@ -125,7 +125,7 @@ We make three calls: one with a valid name, one with a lowercase name, and one w For the valid name, the RPC succeeds and the server prints only the response log: ``` -[INFO] [05/15/2022 09:24:36.850] [Server-akka.actor.default-dispatcher-8] [akka.actor.ActorSystemImpl(Server)] loggingErrorHandlingGrpcRoute: Response for +[INFO] [05/15/2022 09:24:36.850] [Server-pekko.actor.default-dispatcher-8] [org.apache.pekko.actor.ActorSystemImpl(Server)] loggingErrorHandlingGrpcRoute: Response for Request : HttpRequest(HttpMethod(POST),http://127.0.0.1/helloworld.GreeterService/SayHello,Vector(TE: trailers, User-Agent: grpc-java-netty/1.45.1, grpc-accept-encoding: gzip),HttpEntity.Chunked(application/grpc),HttpProtocol(HTTP/2.0)) Response: Complete(HttpResponse(200 OK,List(grpc-encoding: gzip),HttpEntity.Strict(application/grpc+proto,42 bytes total),HttpProtocol(HTTP/1.1))) ``` @@ -135,27 +135,27 @@ Note that the server still returns a status code 200, even though the RPC failed This is because gRPC encodes a failure as a successful HTTP response containing the error in the body. ``` -[ERROR] [05/15/2022 09:24:36.902] [Server-akka.actor.default-dispatcher-5] [akka.actor.ActorSystemImpl(Server)] Grpc failure handled and mapped to akka.grpc.Trailers@4ab49ff7 +[ERROR] [05/15/2022 09:24:36.902] [Server-pekko.actor.default-dispatcher-5] [org.apache.pekko.actor.ActorSystemImpl(Server)] Grpc failure handled and mapped to akka.grpc.Trailers@4ab49ff7 java.lang.IllegalArgumentException: Name must be capitalized at example.myapp.helloworld.LoggingErrorHandlingGreeterServer$Impl$1.sayHello(LoggingErrorHandlingGreeterServer.scala:43) at example.myapp.helloworld.grpc.GreeterServiceHandler$.$anonfun$partial$2(GreeterServiceHandler.scala:118) at scala.concurrent.Future.$anonfun$flatMap$1(Future.scala:307) at scala.concurrent.impl.Promise.$anonfun$transformWith$1(Promise.scala:41) at scala.concurrent.impl.CallbackRunnable.run(Promise.scala:64) - at akka.dispatch.BatchingExecutor$AbstractBatch.processBatch(BatchingExecutor.scala:56) - at akka.dispatch.BatchingExecutor$BlockableBatch.$anonfun$run$1(BatchingExecutor.scala:93) + at org.apache.pekko.dispatch.BatchingExecutor$AbstractBatch.processBatch(BatchingExecutor.scala:56) + at org.apache.pekko.dispatch.BatchingExecutor$BlockableBatch.$anonfun$run$1(BatchingExecutor.scala:93) at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.java:23) at scala.concurrent.BlockContext$.withBlockContext(BlockContext.scala:85) - at akka.dispatch.BatchingExecutor$BlockableBatch.run(BatchingExecutor.scala:93) - at akka.dispatch.TaskInvocation.run(AbstractDispatcher.scala:48) - at akka.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask.exec(ForkJoinExecutorConfigurator.scala:48) + at org.apache.pekko.dispatch.BatchingExecutor$BlockableBatch.run(BatchingExecutor.scala:93) + at org.apache.pekko.dispatch.TaskInvocation.run(AbstractDispatcher.scala:48) + at org.apache.pekko.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask.exec(ForkJoinExecutorConfigurator.scala:48) at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290) at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020) at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656) at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594) at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:183) -[INFO] [05/15/2022 09:24:36.905] [Server-akka.actor.default-dispatcher-5] [akka.actor.ActorSystemImpl(Server)] loggingErrorHandlingGrpcRoute: Response for +[INFO] [05/15/2022 09:24:36.905] [Server-pekko.actor.default-dispatcher-5] [org.apache.pekko.actor.ActorSystemImpl(Server)] loggingErrorHandlingGrpcRoute: Response for Request : HttpRequest(HttpMethod(POST),http://127.0.0.1/helloworld.GreeterService/SayHello,Vector(TE: trailers, User-Agent: grpc-java-netty/1.45.1, grpc-accept-encoding: gzip),HttpEntity.Chunked(application/grpc),HttpProtocol(HTTP/2.0)) Response: Complete(HttpResponse(200 OK,List(grpc-encoding: gzip),HttpEntity.Chunked(application/grpc+proto),HttpProtocol(HTTP/1.1))) ``` @@ -163,7 +163,7 @@ java.lang.IllegalArgumentException: Name must be capitalized For the empty name, the server prints a slightly different error log and the response log, ``` -[ERROR] [05/15/2022 09:24:36.914] [Server-akka.actor.default-dispatcher-5] [akka.actor.ActorSystemImpl(Server)] Grpc failure UNHANDLED and mapped to akka.grpc.Trailers@5e1d9001 +[ERROR] [05/15/2022 09:24:36.914] [Server-pekko.actor.default-dispatcher-5] [org.apache.pekko.actor.ActorSystemImpl(Server)] Grpc failure UNHANDLED and mapped to akka.grpc.Trailers@5e1d9001 java.util.NoSuchElementException: next on empty iterator at scala.collection.Iterator$$anon$2.next(Iterator.scala:41) at scala.collection.Iterator$$anon$2.next(Iterator.scala:39) @@ -178,20 +178,20 @@ java.util.NoSuchElementException: next on empty iterator at scala.concurrent.Future.$anonfun$flatMap$1(Future.scala:307) at scala.concurrent.impl.Promise.$anonfun$transformWith$1(Promise.scala:41) at scala.concurrent.impl.CallbackRunnable.run(Promise.scala:64) - at akka.dispatch.BatchingExecutor$AbstractBatch.processBatch(BatchingExecutor.scala:56) - at akka.dispatch.BatchingExecutor$BlockableBatch.$anonfun$run$1(BatchingExecutor.scala:93) + at org.apache.pekko.dispatch.BatchingExecutor$AbstractBatch.processBatch(BatchingExecutor.scala:56) + at org.apache.pekko.dispatch.BatchingExecutor$BlockableBatch.$anonfun$run$1(BatchingExecutor.scala:93) at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.java:23) at scala.concurrent.BlockContext$.withBlockContext(BlockContext.scala:85) - at akka.dispatch.BatchingExecutor$BlockableBatch.run(BatchingExecutor.scala:93) - at akka.dispatch.TaskInvocation.run(AbstractDispatcher.scala:48) - at akka.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask.exec(ForkJoinExecutorConfigurator.scala:48) + at org.apache.pekko.dispatch.BatchingExecutor$BlockableBatch.run(BatchingExecutor.scala:93) + at org.apache.pekko.dispatch.TaskInvocation.run(AbstractDispatcher.scala:48) + at org.apache.pekko.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask.exec(ForkJoinExecutorConfigurator.scala:48) at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290) at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020) at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656) at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594) at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:183) -[INFO] [05/15/2022 09:24:36.914] [Server-akka.actor.default-dispatcher-5] [akka.actor.ActorSystemImpl(Server)] loggingErrorHandlingGrpcRoute: Response for +[INFO] [05/15/2022 09:24:36.914] [Server-pekko.actor.default-dispatcher-5] [org.apache.pekko.actor.ActorSystemImpl(Server)] loggingErrorHandlingGrpcRoute: Response for Request : HttpRequest(HttpMethod(POST),http://127.0.0.1/helloworld.GreeterService/SayHello,Vector(TE: trailers, User-Agent: grpc-java-netty/1.45.1, grpc-accept-encoding: gzip),HttpEntity.Chunked(application/grpc),HttpProtocol(HTTP/2.0)) Response: Complete(HttpResponse(200 OK,List(grpc-encoding: gzip),HttpEntity.Chunked(application/grpc+proto),HttpProtocol(HTTP/1.1))) ``` diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/GrpcInteropSpec.scala b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/GrpcInteropSpec.scala index 8eac02df..a1aaf836 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/GrpcInteropSpec.scala +++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/GrpcInteropSpec.scala @@ -16,14 +16,14 @@ import scala.concurrent.ExecutionContext // Generated by our plugin import io.grpc.testing.integration.test.TestServiceHandler -class GrpcInteropIoWithAkkaSpec extends GrpcInteropTests(IoGrpcJavaServerProvider, PekkoHttpClientProviderScala) +class GrpcInteropIoWithPekkoSpec extends GrpcInteropTests(IoGrpcJavaServerProvider, PekkoHttpClientProviderScala) class GrpcInteropPekkoScalaWithIoSpec extends GrpcInteropTests(PekkoHttpServerProviderScala, IoGrpcJavaClientProvider) -class GrpcInteropPekkoScalaWithAkkaSpec +class GrpcInteropPekkoScalaWithPekkoSpec extends GrpcInteropTests(PekkoHttpServerProviderScala, PekkoHttpClientProviderScala) class GrpcInteropPekkoJavaWithIoSpec extends GrpcInteropTests(PekkoHttpServerProviderJava, IoGrpcJavaClientProvider) -class GrpcInteropPekkoJavaWithAkkaSpec +class GrpcInteropPekkoJavaWithPekkoSpec extends GrpcInteropTests(PekkoHttpServerProviderJava, PekkoHttpClientProviderScala) object PekkoHttpServerProviderScala extends PekkoHttpServerProvider { From 52f640175bb330803e8caf90a2664bac948ddf94 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 14 Jun 2023 12:41:59 +0100 Subject: [PATCH 04/21] run right scala 3 tests (#95) --- .github/workflows/build-test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 9ed45680..cfd50219 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -73,7 +73,7 @@ jobs: strategy: fail-fast: false matrix: - SCALA_VERSION: [2.12, 2.13] + SCALA_VERSION: [2.12, 2.13, 3.3] JAVA_VERSION: [8, 11] steps: - name: Checkout @@ -105,8 +105,6 @@ jobs: scala-version: 2.12 - test-set: gen-java scala-version: 2.12 - - test-set: scala3 - scala-version: 3.3 steps: - name: Checkout uses: actions/checkout@v3 From c42be2fdd10dbe9bc229903575178820f8b428aa Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 14 Jun 2023 13:02:32 +0100 Subject: [PATCH 05/21] add missing type on implicit value --- .../grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala index 63417fbf..80750b58 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala @@ -46,7 +46,7 @@ class PekkoDiscoveryNameResolverProviderSpec with Matchers with ScalaFutures { - implicit override val patienceConfig = + implicit override val patienceConfig: PatienceConfig = PatienceConfig(timeout = scaled(Span(2, Seconds)), interval = scaled(Span(5, Millis))) "PekkoDiscoveryNameResolverProviderSpec" should { From c6b2fefc04596f2fcb5d08b844590b4335323d45 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 16 Jun 2023 09:31:34 +0100 Subject: [PATCH 06/21] use coursier github actions (#94) wrong action Update link-validator.yml fix some doc issues more link fixes Update link-validator.conf Update link-validator.conf Update gradle.md Update link-validator.yml --- .github/workflows/link-validator.yml | 13 +++++++------ build.sbt | 6 +++--- docs/src/main/paradox/apidesign.md | 6 +++--- docs/src/main/paradox/buildtools/gradle.md | 8 +++++--- docs/src/main/paradox/client/details.md | 2 +- docs/src/main/paradox/overview.md | 2 +- docs/src/main/paradox/proto.md | 4 ++-- docs/src/main/paradox/server/details.md | 2 +- docs/src/main/paradox/server/kubernetes.md | 2 +- docs/src/main/paradox/server/pekko-http.md | 2 +- project/project-info.conf | 2 +- scripts/link-validator.conf | 2 ++ 12 files changed, 28 insertions(+), 23 deletions(-) diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml index aa2e2b71..90573ebb 100644 --- a/.github/workflows/link-validator.yml +++ b/.github/workflows/link-validator.yml @@ -2,6 +2,7 @@ name: Link Validator on: pull_request: + workflow_dispatch: schedule: - cron: '0 6 * * 1' @@ -17,23 +18,23 @@ jobs: # fetch everything https://github.com/actions/checkout#fetch-all-history-for-all-tags-and-branches fetch-depth: 0 - - name: Setup Java 8 + - name: Setup Java 11 uses: actions/setup-java@v3 with: distribution: temurin java-version: 11 - name: Cache Coursier cache - uses: coursier/cache-action@v6 + uses: coursier/cache-action@v6.4.0 + + - name: Setup Coursier + uses: coursier/setup-action@v1.3.3 - name: sbt site run: sbt docs/makeSite - - name: Install Coursier command line tool - run: curl -fLo cs https://git.io/coursier-cli-linux && chmod +x cs && ./cs - - name: Run Link Validator run: | VERSION=$(ls docs/target/site/docs/pekko-grpc) sed -e "s/snapshot/$VERSION/" scripts/link-validator.conf > /tmp/link-validator.conf - ./cs launch net.runne::site-link-validator:0.2.0 -- /tmp/link-validator.conf + cs launch net.runne::site-link-validator:0.2.2 -- /tmp/link-validator.conf diff --git a/build.sbt b/build.sbt index 2a167505..c9639e0c 100644 --- a/build.sbt +++ b/build.sbt @@ -205,9 +205,9 @@ lazy val docs = Project(id = "docs", base = file("docs")) "canonical.base_url" -> "https://pekko.apache.org/docs/pekko-grpc/current", "scaladoc.scala.base_url" -> s"https://www.scala-lang.org/api/current/", // Apache Pekko - "extref.pekko.base_url" -> s"https://pekko.apache.org/docs/pekko-grpc/current/%s", - "scaladoc.pekko.base_url" -> "https://pekko.apache.org/docs/pekko-grpc/current/", - "javadoc.pekko.base_url" -> "https://pekko.apache.org/docs/pekko-grpc/current/", + "extref.pekko.base_url" -> s"https://pekko.apache.org/docs/pekko/current/%s", + "scaladoc.pekko.base_url" -> "https://pekko.apache.org/docs/pekko/current/", + "javadoc.pekko.base_url" -> "https://pekko.apache.org/docs/pekko/current/", // Apache Pekko HTTP "extref.pekko-http.base_url" -> s"https://pekko.apache.org/docs/pekko-http/${Dependencies.Versions.pekkoHttpBinary}/%s", "scaladoc.pekko-http.base_url" -> s"https://pekko.apache.org/api/pekko-http/${Dependencies.Versions.pekkoHttpBinary}/", diff --git a/docs/src/main/paradox/apidesign.md b/docs/src/main/paradox/apidesign.md index 588ceced..e45a1dc8 100644 --- a/docs/src/main/paradox/apidesign.md +++ b/docs/src/main/paradox/apidesign.md @@ -7,7 +7,7 @@ When designing a gRPC API, you could take into consideration some of the If you want to create an endpoint that takes no parameters or produces no response, it might be tempting to use the `Empty` type as defined by -Google in their [empty.proto](https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/empty.proto). +Google in their [empty.proto](https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/empty.proto). It is recommended to introduce your own (empty) message types, however, as functionality may grow and this prepares you for adding additional (optional) fields @@ -15,14 +15,14 @@ over time. ## Declare and enforce constraints for your request and response payloads with `protoc-gen-validate` -[`protoc-gen-validate` (PGV)](https://github.com/envoyproxy/protoc-gen-validate) defines +[`protoc-gen-validate` (PGV)](https://github.com/bufbuild/protoc-gen-validate) defines a set of Protobuf options allowing to add additional rules on messages and fields in a declarative fashion. A set of validators for different languages is also provided, to enforce these rules at runtime. ### Java support -Validators for Java stubs are provided by [the project itself](https://github.com/envoyproxy/protoc-gen-validate#java). +Validators for Java stubs are provided by [the project itself](https://github.com/bufbuild/protoc-gen-validate#java). Follow the instructions there for Maven and Gradle. If your are using sbt, you can get `validate.proto` into the include path and run the protoc plugin generating the validators diff --git a/docs/src/main/paradox/buildtools/gradle.md b/docs/src/main/paradox/buildtools/gradle.md index 83a2013c..366c2e8c 100644 --- a/docs/src/main/paradox/buildtools/gradle.md +++ b/docs/src/main/paradox/buildtools/gradle.md @@ -1,6 +1,6 @@ # Gradle -To get started with Pekko gRPC read the @ref[client](../client/index.md) or @ref[server](../server/index.md) introductions. +To get started with Pekko gRPC, read the @ref[client](../client/index.md) or @ref[server](../server/index.md) introductions. ## Configuring plugin @@ -9,10 +9,12 @@ Most of the settings could be configured using related setting of `protobuf-grad Consult [protobuf-gradle-plugin](https://github.com/google/protobuf-gradle-plugin#protobuf-plugin-for-gradle-) documentation for details. The plugin can generate either Java or Scala classes, and then server and or client for the corresponding language. -By default both client and server are generated and Java or Scala is autodetected depending on the presence of source files with language extension in `src/main`. +By default, both client and server are generated and Java or Scala is autodetected depending on the presence of source files with language extension in `src/main`. ### Installation +**The Gradle plugin is not yet deployed to plugins.gradle.org.** + Follow instructions at [Gradle plugin portal](https://plugins.gradle.org/plugin/org.apache.pekko.grpc.gradle) to apply plugin. ### Available plugin options @@ -99,4 +101,4 @@ Then, the server can then be started from the command line with: ## Play Framework support -See the [Play gRPC documentation](https://developer.lightbend.com/docs/play-grpc/current/play/gradle-support.html) for details. +See the [Play gRPC documentation](https://github.com/playframework/play-grpc) for details. diff --git a/docs/src/main/paradox/client/details.md b/docs/src/main/paradox/client/details.md index 02d0d518..d22864e8 100644 --- a/docs/src/main/paradox/client/details.md +++ b/docs/src/main/paradox/client/details.md @@ -76,7 +76,7 @@ Java ## Rich error model -Beyond status codes you can also use the [Rich error model](https://www.grpc.io/docs/guides/error/#richer-error-model). Currently there is no particular support for consuming such error objects (such as the ones based on the [common protobuf](https://cloud.google.com/apis/design/errors#error_model), but you can obtain them 'manually'. +Beyond status codes you can also use the [Rich error model](https://grpc.io/docs/guides/error/#richer-error-model). Currently there is no particular support for consuming such error objects (such as the ones based on the [common protobuf](https://cloud.google.com/apis/design/errors#error_model), but you can obtain them 'manually'. Extract the `StatusRuntimeException` and parse the Rich error model to access `code`, `message` and `details`. Then find the details you are looking for based on their `typeUrl` and unpack them: diff --git a/docs/src/main/paradox/overview.md b/docs/src/main/paradox/overview.md index 971d8745..841f5d31 100644 --- a/docs/src/main/paradox/overview.md +++ b/docs/src/main/paradox/overview.md @@ -23,7 +23,7 @@ It features: - @extref[Pekko HTTP/2 support](pekko-http:server-side/http2.html) for the server side and - `grpc-netty-shaded` for the client side. * Support for @ref[sbt](buildtools/sbt.md), @ref[gradle](buildtools/gradle.md), @ref[Maven](buildtools/maven.md), - and the [Play Framework](https://developer.lightbend.com/docs/play-grpc/current/). + and the [Play Framework](https://github.com/playframework/play-grpc). ## Project Information diff --git a/docs/src/main/paradox/proto.md b/docs/src/main/paradox/proto.md index 4da9c593..3adb3474 100644 --- a/docs/src/main/paradox/proto.md +++ b/docs/src/main/paradox/proto.md @@ -3,7 +3,7 @@ gRPC uses the Protobuf `.proto` file format to define your messages, services and some aspects of the code generation. -For an in-depth description see the [Protocol buffers documentation](https://developers.google.com/protocol-buffers/docs/proto3), +For an in-depth description see the [Protocol buffers documentation](https://protobuf.dev/programming-guides/proto3), but here are a few quick examples: ## Messages @@ -26,7 +26,7 @@ There are a number of options that can be set in the `.proto` definition that in @@snip [helloworld.proto](/plugin-tester-scala/src/main/protobuf/helloworld.proto) { #options } -The (optional) [`package`](https://developers.google.com/protocol-buffers/docs/proto3#packages) +The (optional) [`package`](https://protobuf.dev/programming-guides/proto3#packages) in the `.proto` is used to resolve references from one `.proto` file to another. It can also be used for the package name in the generated code, but it is common to use the separate `java_package` option to override it. In the Pekko gRPC diff --git a/docs/src/main/paradox/server/details.md b/docs/src/main/paradox/server/details.md index 1a4b4da2..f3f47342 100644 --- a/docs/src/main/paradox/server/details.md +++ b/docs/src/main/paradox/server/details.md @@ -44,7 +44,7 @@ Java : @@snip[ExceptionGreeterServiceImpl](/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java) { #streaming } ## Rich error model -Beyond status codes you can also use the [Rich error model](https://www.grpc.io/docs/guides/error/#richer-error-model). +Beyond status codes you can also use the [Rich error model](https://grpc.io/docs/guides/error/#richer-error-model). This example uses an error model taken from [common protobuf](https://github.com/googleapis/googleapis/blob/master/google/rpc/error_details.proto) but every class that is based on `scalapb.GeneratedMessage` can be used. Build and return the error as a `PekkoGrpcException`: diff --git a/docs/src/main/paradox/server/kubernetes.md b/docs/src/main/paradox/server/kubernetes.md index 6ba8625c..f144f622 100644 --- a/docs/src/main/paradox/server/kubernetes.md +++ b/docs/src/main/paradox/server/kubernetes.md @@ -10,7 +10,7 @@ There are 3 ways to use HTTP/2: * HTTP/2 over plaintext TCP ('h2c'), without negotiation. This assumes the client has prior knowledge that the server supports HTTP/2. A straightforward way to expose a TCP endpoint outside the cluster is to create a Kubernetes `Service` of type `LoadBalancer`. Beyond that, Kubernetes supports many types of [Ingress Controllers](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/). -[GCE](https://github.com/kubernetes/ingress-gce/blob/master/README.md) and [NGINX](https://github.com/kubernetes/ingress-nginx/blob/master/README.md) +[GCE](https://github.com/kubernetes/ingress-gce/blob/master/README.md) and [NGINX](https://github.com/kubernetes/ingress-nginx/blob/main/README.md) are the most widely known. ## LoadBalancer Service diff --git a/docs/src/main/paradox/server/pekko-http.md b/docs/src/main/paradox/server/pekko-http.md index 2af182c4..9150b07c 100644 --- a/docs/src/main/paradox/server/pekko-http.md +++ b/docs/src/main/paradox/server/pekko-http.md @@ -1,6 +1,6 @@ # Pekko HTTP interop -Pekko gRPC is built on top of [Pekko HTTP](https://pekko.apache.org/docs/pekko-http). +Pekko gRPC is built on top of @extref[Pekko HTTP](pekko-http:). This means it is possible to leverage the Pekko HTTP API's to create more complicated services, for example serving non-gRPC endpoints next to gRPC endpoints or adding additional behavior around your gRPC routes. diff --git a/project/project-info.conf b/project/project-info.conf index 07c20b69..e3b754e0 100644 --- a/project/project-info.conf +++ b/project/project-info.conf @@ -3,7 +3,7 @@ project-info { shared-info { jdk-versions: ["OpenJDK 8", "OpenJDK 11", "OpenJDK 17"] snapshots: { - url: "https://repository.apache.org/content/groups/snapshots/org/apache/pekko/grpc/" + url: "https://repository.apache.org/content/groups/snapshots/org/apache/pekko/" text: "Snapshots are available from Apache Snapshots Repository" } issues: { diff --git a/scripts/link-validator.conf b/scripts/link-validator.conf index e3c1bc52..f3cb659a 100644 --- a/scripts/link-validator.conf +++ b/scripts/link-validator.conf @@ -22,6 +22,8 @@ site-link-validator { "https://github.com/apache/incubator-pekko-grpc/" # MVN repository forbids access after a few requests "https://mvnrepository.com/artifact/" + # we haven't yet set up the gradle plugin on plugins.gradle.org + "https://plugins.gradle.org/plugin/org.apache.pekko.grpc.gradle" ] non-https-whitelist = [] From 7f0140d6ad32e8a51a64e5231584b237ddad9cda Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 22 Jun 2023 14:46:14 +0100 Subject: [PATCH 07/21] use LEGAL-626 approved header (#102) --- .../scala/org/apache/pekko/grpc/BenchRunner.scala | 2 +- .../org/apache/pekko/grpc/CommonBenchmark.scala | 2 +- .../pekko/grpc/GrpcMarshallingBenchmark.scala | 2 +- .../pekko/grpc/HandlerProcessingBenchmark.scala | 2 +- build.sbt | 9 +++++++++ .../org/apache/pekko/grpc/gen/CodeGenerator.scala | 2 +- .../scala/org/apache/pekko/grpc/gen/Constants.scala | 2 +- .../scala/org/apache/pekko/grpc/gen/Logging.scala | 2 +- .../main/scala/org/apache/pekko/grpc/gen/Main.scala | 2 +- .../org/apache/pekko/grpc/gen/MethodType.scala | 2 +- .../org/apache/pekko/grpc/gen/ProtocSettings.scala | 2 +- .../grpc/gen/javadsl/JavaClientCodeGenerator.scala | 2 +- .../pekko/grpc/gen/javadsl/JavaCodeGenerator.scala | 2 +- .../gen/javadsl/JavaInterfaceCodeGenerator.scala | 2 +- .../grpc/gen/javadsl/JavaServerCodeGenerator.scala | 2 +- .../org/apache/pekko/grpc/gen/javadsl/Method.scala | 2 +- .../apache/pekko/grpc/gen/javadsl/Serializer.scala | 2 +- .../org/apache/pekko/grpc/gen/javadsl/Service.scala | 2 +- .../org/apache/pekko/grpc/gen/scaladsl/Method.scala | 2 +- .../gen/scaladsl/ScalaClientCodeGenerator.scala | 2 +- .../grpc/gen/scaladsl/ScalaCodeGenerator.scala | 2 +- .../scaladsl/ScalaMarshallersCodeGenerator.scala | 2 +- .../gen/scaladsl/ScalaServerCodeGenerator.scala | 2 +- .../grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala | 2 +- .../apache/pekko/grpc/gen/scaladsl/Serializer.scala | 2 +- .../apache/pekko/grpc/gen/scaladsl/Service.scala | 2 +- .../twirl/templates/JavaClient/Client.scala.txt | 2 +- .../templates/JavaClient/ClientPowerApi.scala.txt | 2 +- .../templates/JavaClient/GenMethodImports.scala.txt | 2 +- .../templates/JavaCommon/ApiInterface.scala.txt | 2 +- .../twirl/templates/JavaServer/Handler.scala.txt | 2 +- .../JavaServer/PowerApiInterface.scala.txt | 2 +- .../twirl/templates/ScalaClient/Client.scala.txt | 2 +- .../twirl/templates/ScalaCommon/ApiTrait.scala.txt | 2 +- .../templates/ScalaCommon/Marshallers.scala.txt | 2 +- .../twirl/templates/ScalaServer/Handler.scala.txt | 2 +- .../templates/ScalaServer/PowerApiTrait.scala.txt | 2 +- .../apache/pekko/grpc/gen/javadsl/ServiceSpec.scala | 2 +- .../io/grpc/testing/integration2/ClientTester.java | 2 +- .../testing/integration2/GrpcJavaClientTester.java | 2 +- .../pekko/grpc/interop/PekkoGrpcClientJava.java | 2 +- .../pekko/grpc/interop/PekkoGrpcServerJava.java | 2 +- .../grpc/testing/integration2/ChannelBuilder.scala | 2 +- .../io/grpc/testing/integration2/Settings.scala | 2 +- .../org/apache/pekko/grpc/interop/GrpcClient.scala | 2 +- .../pekko/grpc/interop/GrpcInteropTests.scala | 2 +- .../org/apache/pekko/grpc/interop/GrpcServer.scala | 2 +- .../apache/pekko/grpc/interop/IoGrpcClient.scala | 2 +- .../apache/pekko/grpc/interop/IoGrpcServer.scala | 2 +- .../pekko/grpc/interop/PekkoGrpcClientScala.scala | 2 +- .../pekko/grpc/interop/PekkoGrpcServerScala.scala | 2 +- .../grpc/ExceptionGreeterServiceImpl.java | 2 +- .../myapp/helloworld/grpc/RichErrorImpl.java | 2 +- .../myapp/helloworld/grpc/RichErrorModelTest.java | 2 +- .../myapp/helloworld/grpc/RichErrorNativeImpl.java | 2 +- .../pekko/grpc/interop/JavaTestServiceImpl.java | 2 +- .../grpc/interop/PekkoGrpcJavaClientTester.java | 2 +- .../apache/pekko/grpc/interop/GrpcInteropSpec.scala | 2 +- .../grpc/interop/PekkoGrpcScalaClientTester.scala | 2 +- .../grpc/interop/PekkoHttpServerProviderScala.scala | 2 +- .../apache/pekko/grpc/interop/TestServiceImpl.scala | 2 +- .../grpc/interop/app/PekkoHttpServerAppScala.scala | 2 +- .../grpc/scaladsl/CountingGreeterServiceImpl.scala | 2 +- .../pekko/grpc/scaladsl/GrpcChannelSpec.scala | 2 +- .../grpc/scaladsl/GrpcExceptionHandlerSpec.scala | 2 +- .../pekko/grpc/scaladsl/GrpcMarshallingSpec.scala | 2 +- .../scaladsl/LoadBalancingIntegrationSpec.scala | 2 +- .../grpc/scaladsl/NonBalancingIntegrationSpec.scala | 2 +- .../apache/pekko/grpc/scaladsl/PowerApiSpec.scala | 2 +- .../grpc/scaladsl/PowerGreeterServiceImpl.scala | 2 +- .../pekko/grpc/scaladsl/RichErrorModelSpec.scala | 2 +- .../apache/pekko/grpc/scaladsl/TelemetrySpec.scala | 2 +- .../scaladsl/tools/MutableServiceDiscovery.scala | 2 +- .../pekko/grpc/maven/AbstractGenerateMojo.scala | 2 +- .../org/apache/pekko/grpc/maven/GenerateMojo.scala | 2 +- .../grpc/maven/ProtocBridgeCodeGenerator.scala | 2 +- .../apache/pekko/grpc/maven/TestGenerateMojo.scala | 2 +- .../org/apache/pekko/grpc/maven/ProtocSpec.scala | 2 +- .../src/main/java/example/myapp/CombinedServer.java | 2 +- .../java/example/myapp/echo/EchoServiceImpl.java | 2 +- .../helloworld/AuthenticatedGreeterServer.java | 2 +- .../example/myapp/helloworld/GreeterClient.java | 2 +- .../example/myapp/helloworld/GreeterServer.java | 2 +- .../myapp/helloworld/GreeterServiceImpl.java | 2 +- .../helloworld/GreeterServicePowerApiImpl.java | 2 +- .../myapp/helloworld/LiftedGreeterClient.java | 2 +- .../LoggingErrorHandlingGreeterServer.java | 2 +- .../myapp/helloworld/PowerGreeterServer.java | 2 +- .../myapp/statefulhelloworld/GreeterActor.java | 2 +- .../statefulhelloworld/GreeterServiceImpl.java | 2 +- .../myapp/helloworld/ErrorReportingSpec.scala | 2 +- .../myapp/helloworld/JGreeterServiceSpec.scala | 2 +- .../main/scala/example/myapp/CombinedServer.scala | 2 +- .../scala/example/myapp/echo/EchoServiceImpl.scala | 2 +- .../helloworld/AuthenticatedGreeterClient.scala | 2 +- .../helloworld/AuthenticatedGreeterServer.scala | 2 +- .../example/myapp/helloworld/GreeterClient.scala | 2 +- .../example/myapp/helloworld/GreeterServer.scala | 2 +- .../myapp/helloworld/GreeterServiceImpl.scala | 2 +- .../myapp/helloworld/LiftedGreeterClient.scala | 2 +- .../LoggingErrorHandlingGreeterClient.scala | 2 +- .../LoggingErrorHandlingGreeterServer.scala | 2 +- .../myapp/helloworld/PowerGreeterServer.scala | 2 +- .../myapp/helloworld/PowerGreeterServiceImpl.scala | 2 +- .../myapp/statefulhelloworld/GreeterActor.scala | 2 +- .../statefulhelloworld/GreeterServiceImpl.scala | 2 +- .../myapp/helloworld/ErrorReportingSpec.scala | 2 +- .../myapp/helloworld/GreeterServiceSpec.scala | 2 +- project/Assemblies.scala | 2 +- project/AutomaticModuleName.scala | 2 +- project/Common.scala | 2 +- project/CopyrightHeader.scala | 4 ++-- project/Dependencies.scala | 2 +- project/NoPublish.scala | 2 +- project/ProjectExtensions.scala | 2 +- project/ReflectiveCodeGen.scala | 2 +- project/SbtMavenPlugin.scala | 2 +- project/VersionGenerator.scala | 2 +- project/VersionSyncCheckPlugin.scala | 2 +- project/plugins.sbt | 13 +++++++++++-- .../org/apache/pekko/grpc/PekkoGrpcGenerated.java | 2 +- .../scala/org/apache/pekko/grpc/GrpcChannel.scala | 2 +- .../pekko/grpc/GrpcClientCloseException.scala | 2 +- .../org/apache/pekko/grpc/GrpcClientResponse.scala | 2 +- .../org/apache/pekko/grpc/GrpcClientSettings.scala | 2 +- .../scala/org/apache/pekko/grpc/GrpcProtocol.scala | 2 +- .../apache/pekko/grpc/GrpcServiceException.scala | 2 +- .../org/apache/pekko/grpc/ProtobufSerializer.scala | 2 +- .../org/apache/pekko/grpc/SSLContextUtils.scala | 2 +- .../org/apache/pekko/grpc/ServiceDescription.scala | 2 +- .../main/scala/org/apache/pekko/grpc/Trailers.scala | 2 +- .../pekko/grpc/internal/AbstractGrpcProtocol.scala | 2 +- .../pekko/grpc/internal/ByteStringUtils.scala | 2 +- .../internal/CancellationBarrierGraphStage.scala | 2 +- .../apache/pekko/grpc/internal/ChannelUtils.scala | 2 +- .../apache/pekko/grpc/internal/ClientState.scala | 2 +- .../org/apache/pekko/grpc/internal/Codec.scala | 2 +- .../org/apache/pekko/grpc/internal/Codecs.scala | 2 +- .../apache/pekko/grpc/internal/DecodeBase64.scala | 2 +- .../pekko/grpc/internal/GrpcEntityHelpers.scala | 2 +- .../pekko/grpc/internal/GrpcProtocolNative.scala | 2 +- .../pekko/grpc/internal/GrpcProtocolWeb.scala | 2 +- .../pekko/grpc/internal/GrpcRequestHelpers.scala | 2 +- .../pekko/grpc/internal/GrpcResponseHelpers.scala | 2 +- .../scala/org/apache/pekko/grpc/internal/Gzip.scala | 2 +- .../grpc/internal/HardcodedServiceDiscovery.scala | 2 +- .../org/apache/pekko/grpc/internal/Identity.scala | 2 +- .../pekko/grpc/internal/InternalChannel.scala | 2 +- .../apache/pekko/grpc/internal/Marshallers.scala | 2 +- .../apache/pekko/grpc/internal/MetadataImpl.scala | 2 +- .../grpc/internal/MissingParameterException.scala | 2 +- .../pekko/grpc/internal/NettyClientUtils.scala | 2 +- .../grpc/internal/PekkoDiscoveryNameResolver.scala | 2 +- .../PekkoDiscoveryNameResolverProvider.scala | 2 +- .../pekko/grpc/internal/PekkoHttpClientUtils.scala | 2 +- .../internal/PekkoNettyGrpcClientGraphStage.scala | 2 +- .../pekko/grpc/internal/RequestBuilderImpl.scala | 2 +- .../pekko/grpc/internal/ServerReflectionImpl.scala | 2 +- .../grpc/internal/ServiceDescriptionImpl.scala | 2 +- .../pekko/grpc/internal/SingleParameterSink.scala | 2 +- .../apache/pekko/grpc/internal/TelemetrySpi.scala | 2 +- .../pekko/grpc/internal/UnaryCallAdapter.scala | 2 +- .../grpc/internal/WithProtobufSerializer.scala | 2 +- .../grpc/javadsl/GoogleProtobufSerializer.scala | 2 +- .../pekko/grpc/javadsl/GrpcExceptionHandler.scala | 2 +- .../apache/pekko/grpc/javadsl/GrpcMarshalling.scala | 2 +- .../org/apache/pekko/grpc/javadsl/Metadata.scala | 2 +- .../apache/pekko/grpc/javadsl/MetadataBuilder.scala | 2 +- .../apache/pekko/grpc/javadsl/MetadataEntry.scala | 2 +- .../apache/pekko/grpc/javadsl/PekkoGrpcClient.scala | 2 +- .../apache/pekko/grpc/javadsl/RequestBuilder.scala | 2 +- .../pekko/grpc/javadsl/ServerReflection.scala | 2 +- .../apache/pekko/grpc/javadsl/ServiceHandler.scala | 2 +- .../org/apache/pekko/grpc/javadsl/WebHandler.scala | 2 +- .../org/apache/pekko/grpc/javadsl/package.scala | 2 +- .../scala/org/apache/pekko/grpc/scaladsl/Grpc.scala | 2 +- .../pekko/grpc/scaladsl/GrpcExceptionHandler.scala | 2 +- .../pekko/grpc/scaladsl/GrpcMarshalling.scala | 2 +- .../org/apache/pekko/grpc/scaladsl/Metadata.scala | 2 +- .../pekko/grpc/scaladsl/MetadataBuilder.scala | 2 +- .../apache/pekko/grpc/scaladsl/MetadataEntry.scala | 2 +- .../pekko/grpc/scaladsl/PekkoGrpcClient.scala | 2 +- .../apache/pekko/grpc/scaladsl/RequestBuilder.scala | 2 +- .../grpc/scaladsl/ScalapbProtobufSerializer.scala | 2 +- .../pekko/grpc/scaladsl/ServerReflection.scala | 2 +- .../apache/pekko/grpc/scaladsl/ServiceHandler.scala | 2 +- .../org/apache/pekko/grpc/scaladsl/WebHandler.scala | 2 +- .../pekko/grpc/scaladsl/headers/headers.scala | 2 +- .../grpc/client/GrpcClientSettingsCompileOnly.java | 2 +- .../pekko/grpc/javadsl/ConcatOrNotFoundTest.java | 2 +- .../grpc/client/GrpcClientSettingsCompileOnly.scala | 2 +- .../scala/org/apache/pekko/grpc/CodecsSpec.scala | 2 +- .../apache/pekko/grpc/GrpcClientSettingsSpec.scala | 2 +- .../grpc/internal/AlwaysTimingOutDiscovery.scala | 2 +- .../pekko/grpc/internal/ChannelUtilsSpec.scala | 2 +- .../pekko/grpc/internal/DecodeBase64Spec.scala | 2 +- .../grpc/internal/GrpcProtocolWebTextSpec.scala | 2 +- .../pekko/grpc/internal/MetadataImplSpec.scala | 2 +- .../grpc/internal/NameResolverListenerProbe.scala | 2 +- .../pekko/grpc/internal/NettyClientUtilsSpec.scala | 2 +- .../PekkoDiscoveryNameResolverProviderSpec.scala | 2 +- .../internal/PekkoDiscoveryNameResolverSpec.scala | 2 +- .../grpc/internal/PekkoHttpClientUtilsSpec.scala | 2 +- .../grpc/internal/ServerReflectionImplSpec.scala | 2 +- .../grpc/javadsl/GoogleProtobufSerializerSpec.scala | 2 +- .../grpc/scaladsl/GrpcExceptionHandlerSpec.scala | 2 +- .../pekko/grpc/scaladsl/MetadataBuilderSpec.scala | 2 +- .../scaladsl/ScalapbProtobufSerializerSpec.scala | 2 +- .../pekko/grpc/scaladsl/headers/HeadersSpec.scala | 2 +- .../org/apache/pekko/grpc/sbt/GeneratorBridge.scala | 2 +- .../org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala | 2 +- .../scala/org/apache/pekko/grpc/scalapb/Main.scala | 2 +- 212 files changed, 231 insertions(+), 213 deletions(-) diff --git a/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala index abedb4ba..0fcb4239 100644 --- a/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala +++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala index 122f4b7d..4babe8e0 100644 --- a/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala +++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala index 9100cf5b..c666f824 100644 --- a/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala +++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala index 924b6b7b..0e8ed529 100644 --- a/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala +++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/build.sbt b/build.sbt index c9639e0c..14d19a6f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,3 +1,12 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * license agreements; and to You under the Apache License, version 2.0: + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * This file is part of the Apache Pekko project, derived from Akka. + */ + import org.apache.pekko.grpc.Dependencies import org.apache.pekko.grpc.Dependencies.Versions.{ scala212, scala213 } import org.apache.pekko.grpc.ProjectExtensions._ diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala index 683457d1..5e758e4d 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala index 3eb2b3e3..051dc189 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala index 3506f510..76d6ec75 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala index 8f97954f..bfe29ea8 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala index 84c76ab3..45d39fe7 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala index 703e1642..00f7dad8 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala index d1ea149b..2fe48f5b 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala index 43730d15..02f10f9a 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala index 08e8e005..ca731979 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala index 91ca91ce..bb0f95a8 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala index e068cb6b..e8ef2e8e 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala index c484032e..4db13e1f 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala index f7709862..b3603f31 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala index 93ba8219..96dda080 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala index 844c5a41..678bb367 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala index 9c67b38a..65a61c0a 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala index a9f59d1b..57442e18 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala index 7600d59d..be053dc3 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala index 488a45bb..9513e4ea 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala index 9bfcef2b..3d5040b8 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala index eaae97a2..94961807 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt b/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt index 48bdb17d..4ac7787c 100644 --- a/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt +++ b/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. *@ @* diff --git a/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt b/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt index 8756bc7b..82dba0a6 100644 --- a/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt +++ b/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. *@ @* diff --git a/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt b/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt index 06894340..b570aab0 100644 --- a/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt +++ b/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. *@ @* diff --git a/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt b/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt index 1e8d8f16..6f65307a 100644 --- a/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt +++ b/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. *@ @* diff --git a/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt b/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt index 517e4d1d..de246701 100644 --- a/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt +++ b/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. *@ @* diff --git a/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt b/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt index 3f3aba8d..4fb1cb6e 100644 --- a/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt +++ b/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. *@ @* diff --git a/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt b/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt index b4fd53b6..c59c5591 100644 --- a/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt +++ b/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. *@ @* diff --git a/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt b/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt index e06c0982..7de502e1 100644 --- a/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt +++ b/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. *@ @* diff --git a/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt b/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt index 167c4e89..b531649e 100644 --- a/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt +++ b/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. *@ @* diff --git a/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt b/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt index 55ce73e1..a5ce7393 100644 --- a/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt +++ b/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. *@ @* diff --git a/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt b/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt index 631e5e3f..962edee0 100644 --- a/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt +++ b/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. *@ @* diff --git a/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala b/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala index 11f1722d..0064f433 100644 --- a/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala +++ b/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java b/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java index 4e2a70d2..9673fed8 100644 --- a/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java +++ b/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java b/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java index 012fd91c..f88d339c 100644 --- a/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java +++ b/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java index d98b945d..816d6ac7 100644 --- a/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java +++ b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java index 5d55e06b..795dfe22 100644 --- a/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java +++ b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala b/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala index 7a6a46b9..95f0cfa1 100644 --- a/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala +++ b/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala b/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala index 18864dfc..dca3f479 100644 --- a/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala +++ b/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala index 9c6e8454..c0e3af20 100644 --- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala +++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala index 68c631c9..b1e4dd62 100644 --- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala +++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala index c0f39365..809d87e7 100644 --- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala +++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala index 9e324bb4..89d33581 100644 --- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala +++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala index 521d8e7c..e2d5e5f7 100644 --- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala +++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala index 10e545f3..b7dde754 100644 --- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala +++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala index 4593963a..8896e1ec 100644 --- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala +++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java index 538575af..b2f75369 100644 --- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java +++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java index 87d98f86..a5324dd9 100644 --- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java +++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java index 6c2ada2c..db859ba8 100644 --- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java +++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java index 1741ac5f..a5ef34b6 100644 --- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java +++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java index 1815b50b..efa13fb9 100644 --- a/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java +++ b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java index 244cd234..f27b9804 100644 --- a/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java +++ b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala index 488760cd..c056fba8 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala index dc64c4ae..fb7d23ac 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala index 7a05fd48..af3b3221 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala index 4be73bd1..dd48cd9d 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala index 694c44b3..0901c698 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala index b3356457..9c016ca7 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala index 6765463f..a7d81465 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala index 76228adc..3741768a 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala index 9bbbe92c..c32ac83f 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala index a7dda5cc..408a56f8 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala index cfe73435..7d1a46c2 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala index 9fb4bfcc..9a38b1bf 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala index 327e8bf4..a555d917 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala index 74bdd683..4013ab7a 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala index 21c8e4a0..b784e698 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala index 702ab915..1f088de6 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala index 3e32b1f8..947bf178 100644 --- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala +++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala index 32838a04..50d4d821 100644 --- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala +++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala index 827f378f..2312c6ed 100644 --- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala +++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala index d50db286..def4848c 100644 --- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala +++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala b/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala index accbb839..0eaabc70 100644 --- a/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala +++ b/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java b/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java index 6463c7a0..04b38df0 100644 --- a/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java +++ b/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/main/java/example/myapp/echo/EchoServiceImpl.java b/plugin-tester-java/src/main/java/example/myapp/echo/EchoServiceImpl.java index 21dcc7f1..4e82da2c 100644 --- a/plugin-tester-java/src/main/java/example/myapp/echo/EchoServiceImpl.java +++ b/plugin-tester-java/src/main/java/example/myapp/echo/EchoServiceImpl.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java index b92d3503..11fbdbaa 100644 --- a/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java +++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java index 9f19ce55..b82d3acd 100644 --- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java +++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java index 666653f2..bfe3bcfb 100644 --- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java +++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java index f49e2c8c..002c3fb0 100644 --- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java +++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java index be19e850..be6792e5 100644 --- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java +++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java index 7a554dff..f599e0ba 100644 --- a/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java +++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java index 8c0d9b5c..5f975f07 100644 --- a/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java +++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java index 10d2d32d..ebd8c51b 100644 --- a/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java +++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java index 8aa82c5a..11274b29 100644 --- a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java +++ b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java index a8f50f86..c941910d 100644 --- a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java +++ b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala b/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala index 553b3276..83fc07b8 100644 --- a/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala +++ b/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala b/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala index 3fb9496a..087fc789 100644 --- a/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala +++ b/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala index 339449d8..e17d02f0 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/echo/EchoServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/echo/EchoServiceImpl.scala index fd9e6701..5ea85446 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/echo/EchoServiceImpl.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/echo/EchoServiceImpl.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala index 77331d26..5156238f 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala index d7643681..4d022d90 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala index 28a2e30f..38f2321f 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala index bbf2e8bc..ebf27298 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala index 010a63cf..b80de2fe 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala index 401e08ab..70bc15e4 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala index 4a549a8b..18b2a6e3 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala index 3769f916..d99a7fc2 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala index 339305d4..bf093c78 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala index d3cf9e93..3c33c237 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala index 07a8660b..5ce53fed 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala index e29304ea..21d16d03 100644 --- a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala +++ b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala index 7d4bdc63..ae43a08d 100644 --- a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala +++ b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala index 0b642d27..3cdc4af4 100644 --- a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala +++ b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/project/Assemblies.scala b/project/Assemblies.scala index 12d881ba..ab57bdab 100644 --- a/project/Assemblies.scala +++ b/project/Assemblies.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ import java.io.{ File, FileInputStream, FileOutputStream } diff --git a/project/AutomaticModuleName.scala b/project/AutomaticModuleName.scala index 77c266ca..19caf808 100644 --- a/project/AutomaticModuleName.scala +++ b/project/AutomaticModuleName.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /** diff --git a/project/Common.scala b/project/Common.scala index 780413fa..84409012 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ package org.apache.pekko.grpc diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala index d17b58c2..30c65499 100644 --- a/project/CopyrightHeader.scala +++ b/project/CopyrightHeader.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* @@ -43,7 +43,7 @@ object CopyrightHeader extends AutoPlugin { | | https://www.apache.org/licenses/LICENSE-2.0 | - |This file is part of the Apache Pekko project, derived from Akka. + |This file is part of the Apache Pekko project, which was derived from Akka. |""".stripMargin val apacheSpdxHeader: String = "SPDX-License-Identifier: Apache-2.0" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 163d8970..71133a20 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ package org.apache.pekko.grpc diff --git a/project/NoPublish.scala b/project/NoPublish.scala index db3a554d..cb128013 100644 --- a/project/NoPublish.scala +++ b/project/NoPublish.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ package org.apache.pekko.grpc diff --git a/project/ProjectExtensions.scala b/project/ProjectExtensions.scala index 83ea6aec..4b702c55 100644 --- a/project/ProjectExtensions.scala +++ b/project/ProjectExtensions.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ package org.apache.pekko.grpc diff --git a/project/ReflectiveCodeGen.scala b/project/ReflectiveCodeGen.scala index eabf4ffb..b6bb22cd 100644 --- a/project/ReflectiveCodeGen.scala +++ b/project/ReflectiveCodeGen.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ package org.apache.pekko.grpc.build diff --git a/project/SbtMavenPlugin.scala b/project/SbtMavenPlugin.scala index 27379589..36214f44 100644 --- a/project/SbtMavenPlugin.scala +++ b/project/SbtMavenPlugin.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ package org.apache.pekko.grpc diff --git a/project/VersionGenerator.scala b/project/VersionGenerator.scala index 524084cc..7954131f 100644 --- a/project/VersionGenerator.scala +++ b/project/VersionGenerator.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ import sbt.Keys._ diff --git a/project/VersionSyncCheckPlugin.scala b/project/VersionSyncCheckPlugin.scala index 44443880..4c5c0fa4 100644 --- a/project/VersionSyncCheckPlugin.scala +++ b/project/VersionSyncCheckPlugin.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ package org.apache.pekko.grpc diff --git a/project/plugins.sbt b/project/plugins.sbt index 1780ec6c..5059c3d2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,12 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * license agreements; and to You under the Apache License, version 2.0: + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * This file is part of the Apache Pekko project, derived from Akka. + */ + enablePlugins(BuildInfoPlugin) val sbtProtocV = "1.0.6" @@ -6,7 +15,7 @@ buildInfoKeys := Seq[BuildInfoKey]("sbtProtocVersion" -> sbtProtocV) addSbtPlugin("lt.dvim.authors" % "sbt-authors" % "1.3") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0") addSbtPlugin("com.thesamet" % "sbt-protoc" % sbtProtocV) addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") @@ -17,7 +26,7 @@ addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.30") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10") -addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.5") +addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.6") // allow access to snapshots for pekko-sbt-paradox resolvers += Resolver.ApacheMavenSnapshotsRepo diff --git a/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java b/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java index 375b7b82..da1a272b 100644 --- a/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java +++ b/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala index f78b0c10..f9b94f2c 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala index 62482b0b..e665b193 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala index b762d861..f603d9b4 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala index 87f3adb9..1ef05014 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala index 9c63b810..1d8e2f04 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala index 2b1903e7..f0440a2b 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala index d836ef45..64538749 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala index 13e93e8a..78961019 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala b/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala index 179fc491..0105d22c 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala index a28b544e..2c757e68 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala index 99472070..d1d6379d 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala index 49cd4bb2..40e835b0 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala index 0f6cb125..a6cc7282 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala index 5fbd9928..f823e9a1 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala index fddd4a3c..75b3632e 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala index 3e4aaf6b..24b31a8f 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala index 3c782298..4d369184 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala index f704d4e3..1ecdf3ad 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala index 7f7e8c6b..75a7da03 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala index a5ca903d..b5c34865 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala index 62125743..9519e1d5 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala index 184597f9..0fc12b44 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala index 04717cee..bb41a680 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala index 8f9da932..ce9aea0c 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala index 36156d1c..4054faa6 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala index 8552611c..281f5b6b 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala index 99c1c907..5c22c5f4 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala index 6ea8e58e..dcc0bd04 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala index 61a7a84b..bccee659 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala index 767bd889..87dc1b00 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala index bebf8eeb..7d27799a 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala index 5fa97862..e8821305 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala index c5257a78..66b5735a 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala index 840f5156..01215c2b 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala index bdde0b5b..e129b5b3 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala index d2def109..0d51615f 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala index f56eee2e..c5a31131 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala index 4f6f8ffc..63a6a32d 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala index 6b3de601..3123c223 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala index d35ade43..67d5fa15 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala index 018fd147..1a491ccb 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala index b5847910..43966e11 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala index 795299e1..054f5aa1 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala index 65aeb167..76ec34c3 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala index 8fc5868d..9711ac30 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala index e6921205..4dc69c83 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala index 7adaf9a6..5148d945 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala index bd281c85..e504f391 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala index 695f1b69..ad6e64a0 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala index 06567e5c..860fb227 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala index 9004849c..d81d3521 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala index 6ed3c39b..a01303da 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala index ea178fa6..2669f436 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala index dd53f424..4c3b4aa1 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala index 05bb1e7f..69326e5c 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala index bb407664..157e21ee 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala index ec5ff3d2..e99285e3 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala index 743e02e1..d8ce6056 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala index 7b5b76f9..1a20fc8a 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala index f85aa719..14d937f1 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala index e86709c6..2d1f530a 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala index 2002e7fe..89e09f5a 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala index 3f6c2d21..1e997c66 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala index 9752f69e..3510f29f 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala index 7d1aba5c..c816321a 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala index 0beb80d0..d16f247b 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala index e903d0da..86c09741 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java b/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java index c6729af3..376dcd21 100644 --- a/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java +++ b/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java b/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java index e1b1885d..6f24a834 100644 --- a/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java +++ b/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala b/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala index 7135d3dd..ce91806f 100644 --- a/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala +++ b/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala index e2281d00..c5755913 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala index 0a080177..22f87a7b 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala index 0fab1b1a..c2975219 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala index 271bcd19..649107fa 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/DecodeBase64Spec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/DecodeBase64Spec.scala index c6ea585d..59118383 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/DecodeBase64Spec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/DecodeBase64Spec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/GrpcProtocolWebTextSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/GrpcProtocolWebTextSpec.scala index d050a8d8..1c326b6e 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/GrpcProtocolWebTextSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/GrpcProtocolWebTextSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala index be933c36..7aa38a2e 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala index b95df78e..cd4079e6 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NettyClientUtilsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NettyClientUtilsSpec.scala index c6fe2a27..55101a9b 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NettyClientUtilsSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NettyClientUtilsSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala index 80750b58..ba19adbd 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverSpec.scala index dffed656..d1c1f04b 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtilsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtilsSpec.scala index 9bcc3768..389b9d82 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtilsSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtilsSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/ServerReflectionImplSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ServerReflectionImplSpec.scala index 699a5719..d1f70434 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/ServerReflectionImplSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ServerReflectionImplSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializerSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializerSpec.scala index 88d47e80..212c0824 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializerSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializerSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala index 83e5d335..7da9d95e 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilderSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilderSpec.scala index 6e8b4974..b5aef8a6 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilderSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilderSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializerSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializerSpec.scala index 5f73005d..95150340 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializerSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializerSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala index 4d7e5146..e5fe5e0c 100644 --- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala +++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/GeneratorBridge.scala b/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/GeneratorBridge.scala index 80123347..13da7e15 100644 --- a/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/GeneratorBridge.scala +++ b/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/GeneratorBridge.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala b/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala index 0a473813..4a8eeb9b 100644 --- a/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala +++ b/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* diff --git a/scalapb-protoc-plugin/src/main/scala/org/apache/pekko/grpc/scalapb/Main.scala b/scalapb-protoc-plugin/src/main/scala/org/apache/pekko/grpc/scalapb/Main.scala index fabba65b..fcbf6132 100644 --- a/scalapb-protoc-plugin/src/main/scala/org/apache/pekko/grpc/scalapb/Main.scala +++ b/scalapb-protoc-plugin/src/main/scala/org/apache/pekko/grpc/scalapb/Main.scala @@ -4,7 +4,7 @@ * * https://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, derived from Akka. + * This file is part of the Apache Pekko project, which was derived from Akka. */ /* From 1a17b6570ffc43fdeb73c700005531115fbb11aa Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 28 Jun 2023 01:38:55 +0100 Subject: [PATCH 08/21] better to link to pekko source than akka source --- project/VersionGenerator.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/VersionGenerator.scala b/project/VersionGenerator.scala index 7954131f..b06e5692 100644 --- a/project/VersionGenerator.scala +++ b/project/VersionGenerator.scala @@ -13,7 +13,7 @@ import sbt._ /** * Generate version.conf file based on the version setting. * - * This was adapted from https://github.com/akka/akka/blob/v2.6.8/project/VersionGenerator.scala + * This was adapted from https://github.com/apache/incubator-pekko/blob/main/project/VersionGenerator.scala */ object VersionGenerator { From 90eb427d6c28ea03b183c6ed77dba549c47ce19e Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 28 Jun 2023 09:47:03 +0100 Subject: [PATCH 09/21] use pekko collection converter (#103) --- .../src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala index 69326e5c..827a2b75 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala @@ -13,17 +13,16 @@ package org.apache.pekko.grpc.scaladsl +import java.util.concurrent.ConcurrentHashMap import scala.concurrent.{ ExecutionContext, Future } -import scala.jdk.CollectionConverters._ import org.apache.pekko import pekko.Done import pekko.actor.{ CoordinatedShutdown, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider } import pekko.annotation.InternalApi -import java.util.concurrent.ConcurrentHashMap - import pekko.event.{ LogSource, Logging } import pekko.grpc.GrpcChannel +import pekko.util.ccompat.JavaConverters._ /** INTERNAL API */ @InternalApi From 44491bb7db84dea68d81ffe57634059769fca172 Mon Sep 17 00:00:00 2001 From: Matthew de Detrich Date: Wed, 5 Jul 2023 09:16:31 +0200 Subject: [PATCH 10/21] Update sbt --- benchmark-java/project/build.properties | 2 +- project/build.properties | 2 +- .../gen-java/01-gen-basic-java/project/build.properties | 2 +- .../gen-java/02-server-reflection/project/build.properties | 2 +- .../gen-java/03-no-java-package/project/build.properties | 2 +- .../gen-java/04-crash-on-keywords/project/build.properties | 2 +- .../project/build.properties | 2 +- .../gen-scala-server/00-interop/project/build.properties | 2 +- .../01-gen-basic-server/project/build.properties | 2 +- .../02-multiple-services/project/build.properties | 2 +- .../gen-scala-server/03-test-config/project/build.properties | 2 +- .../04-server-reflection/project/build.properties | 2 +- .../05-no-java-package/project/build.properties | 2 +- .../06-compatibility-plugins/project/build.properties | 2 +- .../07-gen-basic-server-with-pekko/project/build.properties | 2 +- .../09-scalapb-customizations/project/build.properties | 2 +- .../10-scalapb-validate/project/build.properties | 2 +- .../project/build.properties | 2 +- .../scala3/01-basic-client-server/project/build.properties | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/benchmark-java/project/build.properties b/benchmark-java/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/benchmark-java/project/build.properties +++ b/benchmark-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/project/build.properties b/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties index 40b3b8e7..3c0b78a7 100644 --- a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties +++ b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 From 614124414d28c7ef737e3e8866bff535d6311d02 Mon Sep 17 00:00:00 2001 From: Matthew de Detrich Date: Wed, 5 Jul 2023 10:28:04 +0200 Subject: [PATCH 11/21] Update latest pekko-http to bring in cors --- build.sbt | 4 ++-- docs/src/main/paradox/server/grpc-web.md | 6 +++--- plugin-tester-java/build.gradle | 6 +++--- plugin-tester-java/pom.xml | 14 +++++++------- plugin-tester-scala/build.gradle | 7 +++---- plugin-tester-scala/pom.xml | 16 ++++++++-------- project/Dependencies.scala | 15 +++++---------- .../apache/pekko/grpc/javadsl/WebHandler.scala | 4 ++-- .../apache/pekko/grpc/scaladsl/WebHandler.scala | 13 +++++++------ .../gen-java/01-gen-basic-java/build.sbt | 2 ++ .../gen-java/02-server-reflection/build.sbt | 2 ++ .../gen-java/03-no-java-package/build.sbt | 2 ++ .../gen-java/04-crash-on-keywords/build.sbt | 2 ++ .../build.sbt | 2 ++ .../gen-scala-server/00-interop/build.sbt | 2 ++ .../01-gen-basic-server/build.sbt | 2 ++ .../02-multiple-services/build.sbt | 2 ++ .../gen-scala-server/03-test-config/build.sbt | 2 ++ .../04-server-reflection/build.sbt | 2 ++ .../05-no-java-package/build.sbt | 2 ++ .../06-compatibility-plugins/build.sbt | 2 ++ .../07-gen-basic-server-with-pekko/build.sbt | 2 ++ .../09-scalapb-customizations/build.sbt | 2 ++ .../10-scalapb-validate/build.sbt | 2 ++ .../build.sbt | 2 ++ .../scala3/01-basic-client-server/build.sbt | 2 ++ 26 files changed, 74 insertions(+), 45 deletions(-) diff --git a/build.sbt b/build.sbt index 14d19a6f..b647a4d8 100644 --- a/build.sbt +++ b/build.sbt @@ -27,10 +27,10 @@ lazy val mkBatAssemblyTask = taskKey[File]("Create a Windows bat assembly") // gradle plugin compatibility (avoid `+` in snapshot versions) (ThisBuild / dynverSeparator) := "-" -// TODO: Remove when Pekko has a proper release +// 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) -ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshot") // TODO Remove when proper release of pekko-http-cors is made val pekkoGrpcCodegenId = s"$pekkoPrefix-codegen" lazy val codegen = Project(id = "codegen", base = file("codegen")) diff --git a/docs/src/main/paradox/server/grpc-web.md b/docs/src/main/paradox/server/grpc-web.md index 4b2b1f82..99c3477b 100644 --- a/docs/src/main/paradox/server/grpc-web.md +++ b/docs/src/main/paradox/server/grpc-web.md @@ -37,9 +37,9 @@ gRPC-Web endpoint with basic CORS infrastructure in place. To use CORS, you will need to add the pekko-http-cors dependency to your project: @@dependency[sbt,Maven,Gradle] { - group="ch.megard" - artifact="pekko-http-cors_2.12" - version="0.0.0-SNAPSHOT" // Update when proper release of pekko-http-cors is made + group="org.apache.pekko" + artifact="pekko-http-cors_$scala.binary.version$" + version="$pekko-http.version$" } And then serve the handlers with @apidoc[WebHandler.grpcWebHandler](WebHandler$) like this: diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle index 1fd506fe..966993ac 100644 --- a/plugin-tester-java/build.gradle +++ b/plugin-tester-java/build.gradle @@ -13,7 +13,7 @@ pekkoGrpc { repositories { mavenLocal() - maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } // TODO Remove when proper release of pekko-http-cors is made + 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 +21,9 @@ def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion) def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}" dependencies { - implementation group: 'ch.megard', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0-SNAPSHOT' + implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0+4456-9a4c0fc7-SNAPSHOT' implementation "org.scala-lang:scala-library:${scalaFullVersion}" - testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:0.0.0+26669-ec5b6764-SNAPSHOT" + testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0-RC3" 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 2fbc9e4a..3128d0d2 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-SNAPSHOT + 0.0.0+4456-9a4c0fc7-SNAPSHOT 1.48.1 UTF-8 @@ -26,11 +26,11 @@ Apache Snapshots Repository https://repository.apache.org/content/repositories/snapshots/ - + - sonatype-snapshots - Sonatype Snapshots Repository - https://oss.sonatype.org/content/repositories/snapshots/ + apache-staging + Apache Staging Repository + https://repository.apache.org/content/groups/staging/ @@ -41,9 +41,9 @@ ${pekko.grpc.project.version} - ch.megard + org.apache.pekko pekko-http-cors_2.12 - ${pekko.http.cors.version} + ${pekko.http.version} diff --git a/plugin-tester-scala/build.gradle b/plugin-tester-scala/build.gradle index f39836c0..60c56ebf 100644 --- a/plugin-tester-scala/build.gradle +++ b/plugin-tester-scala/build.gradle @@ -8,7 +8,7 @@ pekkoGrpc { repositories { mavenLocal() - maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } // TODO Remove when proper release of pekko-http-cors is made + 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,10 +16,9 @@ def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion) def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}" dependencies { - implementation group: 'ch.megard', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0-SNAPSHOT' + implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0+4456-9a4c0fc7-SNAPSHOT' implementation "org.scala-lang:scala-library:${scalaFullVersion}" - testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:0.0.0+26669-ec5b6764-SNAPSHOT" + testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0-RC3" 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 2440316a..1e05d30e 100644 --- a/plugin-tester-scala/pom.xml +++ b/plugin-tester-scala/pom.xml @@ -13,8 +13,8 @@ 1.8 1.8 - 0.0.0+26669-ec5b6764-SNAPSHOT - 0.0.0-SNAPSHOT + 1.0.0-RC3 + 0.0.0+4456-9a4c0fc7-SNAPSHOT 1.48.1 UTF-8 @@ -25,11 +25,11 @@ Apache Snapshots Repository https://repository.apache.org/content/repositories/snapshots/ - + - sonatype-snapshots - Sonatype Snapshots Repository - https://oss.sonatype.org/content/repositories/snapshots/ + apache-staging + Apache Staging Repository + https://repository.apache.org/content/groups/staging/ @@ -40,9 +40,9 @@ ${pekko.grpc.project.version} - ch.megard + org.apache.pekko pekko-http-cors_2.12 - ${pekko.http.cors.version} + ${pekko.http.version} diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 71133a20..fc04b5a9 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 = "0.0.0+26669-ec5b6764-SNAPSHOT" + val pekko = "1.0.0-RC3" val pekkoBinary = "current" - val pekkoHttp = "0.0.0+4411-6fe04045-SNAPSHOT" + val pekkoHttp = "0.0.0+4456-9a4c0fc7-SNAPSHOT" val pekkoHttpBinary = "current" val grpc = "1.48.1" // checked synced by VersionSyncCheckPlugin @@ -46,11 +46,10 @@ object Dependencies { val pekkoStream = "org.apache.pekko" %% "pekko-stream" % Versions.pekko val pekkoHttp = "org.apache.pekko" %% "pekko-http" % Versions.pekkoHttp val pekkoHttpCore = "org.apache.pekko" %% "pekko-http-core" % Versions.pekkoHttp + val pekkoHttpCors = "org.apache.pekko" %% "pekko-http-cors" % Versions.pekkoHttp val pekkoDiscovery = "org.apache.pekko" %% "pekko-discovery" % Versions.pekko val pekkoSlf4j = "org.apache.pekko" %% "pekko-slf4j" % Versions.pekko - val pekkoHttpCors = "ch.megard" %% "pekko-http-cors" % "0.0.0-SNAPSHOT" // Apache v2 - val scalapbCompilerPlugin = "com.thesamet.scalapb" %% "compilerplugin" % scalapb.compiler.Version.scalapbVersion val scalapbRuntime = ("com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion) .exclude("io.grpc", "grpc-netty") @@ -115,9 +114,7 @@ object Dependencies { Compile.pekkoHttpCore, Compile.pekkoHttp, Compile.pekkoDiscovery, - // TODO Remove exclusion rule when proper release of pekko-http-cors is made - (Compile.pekkoHttpCors % "provided").excludeAll( - "org.apache.pekko" %% "pekko-http"), + Compile.pekkoHttpCors, Compile.pekkoHttp % "provided", Test.pekkoTestkit, Test.pekkoStreamTestkit, @@ -151,9 +148,7 @@ object Dependencies { val pluginTester = l ++= Seq( // usually automatically added by `suggestedDependencies`, which doesn't work with ReflectiveCodeGen Compile.grpcStub, - // TODO Remove exclusion rule when proper release of pekko-http-cors is made - Compile.pekkoHttpCors.excludeAll( - "org.apache.pekko" %% "pekko-http"), + Compile.pekkoHttpCors, Compile.pekkoHttp, Test.scalaTest, Test.scalaTestPlusJunit, diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala index 2669f436..ad4ea480 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala @@ -21,6 +21,8 @@ import pekko.NotUsed import pekko.actor.ClassicActorSystemProvider import pekko.annotation.ApiMayChange import pekko.grpc.javadsl.ServiceHandler.{ concatOrNotFound, unsupportedMediaType } +import pekko.http.cors.javadsl.settings.CorsSettings +import pekko.http.cors.javadsl.CorsDirectives import pekko.http.javadsl.marshalling.Marshaller import pekko.http.javadsl.model.{ HttpRequest, HttpResponse } import pekko.http.javadsl.server.Route @@ -32,8 +34,6 @@ import pekko.japi.function.{ Function => JFunction } import pekko.stream.Materializer import pekko.stream.javadsl.{ Keep, Sink, Source } import pekko.util.ConstantFun -import ch.megard.pekko.http.cors.javadsl.settings.CorsSettings -import ch.megard.pekko.http.cors.javadsl.CorsDirectives @ApiMayChange object WebHandler { diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala index d16f247b..c6b3fa3a 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala @@ -15,23 +15,24 @@ package org.apache.pekko.grpc.scaladsl import scala.collection.immutable import scala.concurrent.Future +import com.typesafe.config.ConfigFactory import org.apache.pekko -import pekko.actor.ClassicActorSystemProvider +import pekko.actor.{ ActorSystem, ClassicActorSystemProvider } import pekko.annotation.ApiMayChange +import pekko.http.cors.scaladsl.CorsDirectives.cors +import pekko.http.cors.scaladsl.model.HttpHeaderRange +import pekko.http.cors.scaladsl.settings.CorsSettings import pekko.http.javadsl.{ model => jmodel } import pekko.http.scaladsl.model.{ HttpMethods, HttpRequest, HttpResponse } import pekko.http.scaladsl.model.headers._ import pekko.http.scaladsl.server.Route import pekko.http.scaladsl.server.directives.MarshallingDirectives.handleWith -import ch.megard.pekko.http.cors.scaladsl.CorsDirectives.cors -import ch.megard.pekko.http.cors.scaladsl.model.HttpHeaderRange -import ch.megard.pekko.http.cors.scaladsl.settings.CorsSettings @ApiMayChange object WebHandler { /** Default CORS settings to use for grpc-web */ - val defaultCorsSettings: CorsSettings = CorsSettings.defaultSettings + val defaultCorsSettings: CorsSettings = CorsSettings(ConfigFactory.load()) .withAllowCredentials(true) .withAllowedMethods(immutable.Seq(HttpMethods.POST, HttpMethods.OPTIONS)) .withExposedHeaders(immutable.Seq(headers.`Status`.name, headers.`Status-Message`.name, `Content-Encoding`.name)) @@ -60,7 +61,7 @@ object WebHandler { def grpcWebHandler(handlers: PartialFunction[HttpRequest, Future[HttpResponse]]*)( implicit as: ClassicActorSystemProvider, corsSettings: CorsSettings = defaultCorsSettings): HttpRequest => Future[HttpResponse] = { - implicit val system = as.classicSystem + implicit val system: ActorSystem = as.classicSystem val servicesHandler = ServiceHandler.concat(handlers: _*) Route.toFunction(cors(corsSettings) { handleWith(servicesHandler) 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 1a846a3b..956993cf 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 @@ -2,7 +2,9 @@ // 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-java/02-server-reflection/build.sbt b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt index 67696437..1d1776f3 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 @@ -2,7 +2,9 @@ // 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-java/03-no-java-package/build.sbt b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt index 67696437..1d1776f3 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 @@ -2,7 +2,9 @@ // 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-java/04-crash-on-keywords/build.sbt b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt index 1a846a3b..956993cf 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 @@ -2,7 +2,9 @@ // 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-java/05-duplicate-messages-different-packages/build.sbt b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt index 67696437..1d1776f3 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 @@ -2,7 +2,9 @@ // 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/00-interop/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt index 37b1e830..508c16c4 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 @@ -2,7 +2,9 @@ // 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/") organization := "org.apache.pekko" 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 index dbec69f0..649dbd04 100644 --- 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,7 +2,9 @@ // 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" 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 index 8f1460d6..dfa3d83f 100644 --- 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,6 +2,8 @@ // 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 index 5259b6a3..791c3670 100644 --- 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,7 +2,9 @@ // 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/04-server-reflection/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt index 8f1460d6..dfa3d83f 100644 --- 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,6 +2,8 @@ // 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 index 8f1460d6..dfa3d83f 100644 --- 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,6 +2,8 @@ // 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 index 01baaf2e..4699996c 100644 --- 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,7 +2,9 @@ // 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 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 c02bb22d..9e022e5d 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 @@ -2,7 +2,9 @@ // 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/09-scalapb-customizations/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt index 0b2892df..6efd8111 100644 --- 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,7 +2,9 @@ // 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/10-scalapb-validate/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt index eff58a72..e8b4d7c1 100644 --- 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,7 +2,9 @@ // 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 index 8f1460d6..dfa3d83f 100644 --- 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,6 +2,8 @@ // 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 index d9c5b4b7..db52cd0c 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 @@ -1,6 +1,8 @@ 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" From a605bcfbfd881d433fabdc12dfc05972c9f7b2b7 Mon Sep 17 00:00:00 2001 From: Matthew de Detrich Date: Thu, 6 Jul 2023 19:38:02 +0200 Subject: [PATCH 12/21] Fix typos --- .../org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy | 2 +- .../pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala | 2 +- .../apache/pekko/grpc/maven/AbstractGenerateMojo.scala | 4 ++-- .../scala/org/apache/pekko/grpc/javadsl/WebHandler.scala | 8 ++++---- .../scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) 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 687ff4b1..07d3101a 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 @@ -21,7 +21,7 @@ class PekkoGrpcPlugin implements Plugin { Project project - // workaround for test projects, when one only neesd to tests a new plugin version without rebuilding dependencies. + // workaround for test projects, when one only needs to tests a new plugin version without rebuilding dependencies. String getBaselineVersion(String pluginVersion) { def pv = System.getProperty("pekko.grpc.baseline.version", pluginVersion) if (VersionNumber.parse(pv).qualifier) { diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala index 7d1a46c2..6eedbee5 100644 --- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala +++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala @@ -98,7 +98,7 @@ class NonBalancingIntegrationSpec(backend: String) if (this.isInstanceOf[NonBalancingIntegrationSpecNetty] && service1.greetings.get != numberOfRequests) { system.log.warning( - s"Found only ${service1.greetings.get} requests rather than $numberOfRequests, likely a flakey test") + s"Found only ${service1.greetings.get} requests rather than $numberOfRequests, likely a flaky test") pending } else service1.greetings.get should be(numberOfRequests) diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala index 947bf178..c9ff2a1b 100644 --- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala +++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala @@ -42,7 +42,7 @@ object AbstractGenerateMojo { Right(unknown) } - private def captureStdOutAnderr[T](block: => T): (String, String, T) = { + private def captureStdOutAndErr[T](block: => T): (String, String, T) = { val errBao = new ByteArrayOutputStream() val errPrinter = new PrintStream(errBao, true, "UTF-8") val outBao = new ByteArrayOutputStream() @@ -265,7 +265,7 @@ abstract class AbstractGenerateMojo @Inject() (buildContext: BuildContext) exten getLog.debug("protoc options: %s".format(protocOptions.mkString(","))) getLog.info("Compiling protobuf") - val (out, err, exitCode) = captureStdOutAnderr { + val (out, err, exitCode) = captureStdOutAndErr { executeProtoc(protocCommand, schemas, protoDir, protocOptions, generatedTargets) } if (exitCode != 0) { diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala index ad4ea480..ee2e14e1 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala @@ -42,9 +42,9 @@ object WebHandler { * Creates a `HttpRequest` to `HttpResponse` handler for gRPC services that can be used in * for example `Http().bindAndHandleAsync` for the generated partial function handlers: * - The generated handler supports the `application/grpc-web` and `application/grpc-web-text` media types. - * - CORS is implemented for handled servives, including pre-flight requests and request enforcement. + * - CORS is implemented for handled services, including pre-flight requests and request enforcement. * - If the request s not a CORS pre-flight request, and has an invalid media type, then a _415: Unsupported Media Type_ response is produced. - * - Otherise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced. + * - Otherwise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced. */ def grpcWebHandler( handlers: util.List[JFunction[HttpRequest, CompletionStage[HttpResponse]]], @@ -66,9 +66,9 @@ object WebHandler { * Creates a `HttpRequest` to `HttpResponse` handler for gRPC services that can be used in * for example `Http().bind` for the generated partial function handlers: * - The generated handler supports the `application/grpc-web` and `application/grpc-web-text` media types. - * - CORS is implemented for handled servives, including pre-flight requests and request enforcement. + * - CORS is implemented for handled services, including pre-flight requests and request enforcement. * - If the request s not a CORS pre-flight request, and has an invalid media type, then a _415: Unsupported Media Type_ response is produced. - * - Otherise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced. + * - Otherwise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced. */ def grpcWebHandler( handlers: util.List[JFunction[HttpRequest, CompletionStage[HttpResponse]]], diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala index c6b3fa3a..933a0240 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala @@ -54,9 +54,9 @@ object WebHandler { * Creates a `HttpRequest` to `HttpResponse` handler for gRPC services that can be used in * for example `Http().bindAndHandleAsync` for the generated partial function handlers: * - The generated handler supports the `application/grpc-web` and `application/grpc-web-text` media types. - * - CORS is implemented for handled servives, including pre-flight requests and request enforcement. + * - CORS is implemented for handled services, including pre-flight requests and request enforcement. * - If the request is for a handled service, is not a CORS pre-flight request, and has an invalid media type, then a _415: Unsupported Media Type_ response is produced. - * - Otherise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced. + * - Otherwise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced. */ def grpcWebHandler(handlers: PartialFunction[HttpRequest, Future[HttpResponse]]*)( implicit as: ClassicActorSystemProvider, From 3aae4d2147a48e899f87e1de02ec08be4d8c0576 Mon Sep 17 00:00:00 2001 From: Matthew de Detrich Date: Thu, 13 Jul 2023 07:09:02 +0200 Subject: [PATCH 13/21] Update sbt-header to apply standard Apache Header for new sources --- project/CopyrightHeader.scala | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala index 30c65499..7bcb1378 100644 --- a/project/CopyrightHeader.scala +++ b/project/CopyrightHeader.scala @@ -37,7 +37,7 @@ object CopyrightHeader extends AutoPlugin { (headerCreate / unmanagedResourceDirectories) += baseDirectory.value / "src" / "main" / "twirl")) }) - val apacheHeader: String = + val apacheFromAkkaSourceHeader: String = """Licensed to the Apache Software Foundation (ASF) under one or more |license agreements; and to You under the Apache License, version 2.0: | @@ -46,6 +46,23 @@ object CopyrightHeader extends AutoPlugin { |This file is part of the Apache Pekko project, which was derived from Akka. |""".stripMargin + val apacheHeader: String = + """Licensed to the Apache Software Foundation (ASF) under one or more + |contributor license agreements. See the NOTICE file distributed with + |this work for additional information regarding copyright ownership. + |The ASF licenses this file to You under the Apache License, Version 2.0 + |(the "License"); you may not use this file except in compliance with + |the License. You may obtain a copy of the License at + | + | http://www.apache.org/licenses/LICENSE-2.0 + | + |Unless required by applicable law or agreed to in writing, software + |distributed under the License is distributed on an "AS IS" BASIS, + |WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + |See the License for the specific language governing permissions and + |limitations under the License. + |""".stripMargin + val apacheSpdxHeader: String = "SPDX-License-Identifier: Apache-2.0" val twirlStyleBlockComment = HeaderCommentStyle.twirlStyleBlockComment.copy(commentCreator = new CommentCreator() { @@ -55,7 +72,8 @@ object CopyrightHeader extends AutoPlugin { case Some(currentText) if isApacheCopyrighted(currentText) || isGenerated(currentText) => currentText case Some(currentText) if isOnlyLightbendCopyrightAnnotated(currentText) => - HeaderCommentStyle.twirlStyleBlockComment.commentCreator(text, existingText) + NewLine * 2 + currentText + HeaderCommentStyle.twirlStyleBlockComment.commentCreator(apacheFromAkkaSourceHeader, + existingText) + NewLine * 2 + currentText case Some(currentText) => throw new IllegalStateException(s"Unable to detect copyright for header: [$currentText]") case None => From 3692cf7c3bcfb2a8155147bae14c118bf4564a17 Mon Sep 17 00:00:00 2001 From: Matthew de Detrich Date: Thu, 13 Jul 2023 07:12:05 +0200 Subject: [PATCH 14/21] Fix new sources so that they use the Apache standard header --- project/MetaInfLicenseNoticeCopy.scala | 14 +++++++++++--- project/NoPublish.scala | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/project/MetaInfLicenseNoticeCopy.scala b/project/MetaInfLicenseNoticeCopy.scala index 36d856da..f3b19be4 100644 --- a/project/MetaInfLicenseNoticeCopy.scala +++ b/project/MetaInfLicenseNoticeCopy.scala @@ -1,10 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * license agreements; and to You under the Apache License, version 2.0: + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, which was derived from Akka. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import sbt.Keys._ diff --git a/project/NoPublish.scala b/project/NoPublish.scala index cb128013..22b301ab 100644 --- a/project/NoPublish.scala +++ b/project/NoPublish.scala @@ -1,10 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * license agreements; and to You under the Apache License, version 2.0: + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * This file is part of the Apache Pekko project, which was derived from Akka. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.pekko.grpc From e0db6f7f2c6dbb4f9a02b8a27aed7c205a25cb53 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 13 Jul 2023 10:23:39 +0100 Subject: [PATCH 15/21] use standard license on new files (#108) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 3c0b78a7..875b706a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 From d4d2f4ab82b796773e1b272073bb28f3e5b82cb9 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 13 Jul 2023 11:50:24 +0100 Subject: [PATCH 16/21] sbt 1.9.2 (#110) --- benchmark-java/project/build.properties | 2 +- .../gen-java/01-gen-basic-java/project/build.properties | 2 +- .../gen-java/02-server-reflection/project/build.properties | 2 +- .../gen-java/03-no-java-package/project/build.properties | 2 +- .../gen-java/04-crash-on-keywords/project/build.properties | 2 +- .../project/build.properties | 2 +- .../gen-scala-server/00-interop/project/build.properties | 2 +- .../01-gen-basic-server/project/build.properties | 2 +- .../02-multiple-services/project/build.properties | 2 +- .../gen-scala-server/03-test-config/project/build.properties | 2 +- .../04-server-reflection/project/build.properties | 2 +- .../05-no-java-package/project/build.properties | 2 +- .../06-compatibility-plugins/project/build.properties | 2 +- .../07-gen-basic-server-with-pekko/project/build.properties | 2 +- .../09-scalapb-customizations/project/build.properties | 2 +- .../10-scalapb-validate/project/build.properties | 2 +- .../project/build.properties | 2 +- .../scala3/01-basic-client-server/project/build.properties | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/benchmark-java/project/build.properties b/benchmark-java/project/build.properties index 3c0b78a7..875b706a 100644 --- a/benchmark-java/project/build.properties +++ b/benchmark-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties +++ b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 diff --git a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties index 3c0b78a7..875b706a 100644 --- a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties +++ b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 From 719d069aa0149642fbb797c764d677ffdc9f1c88 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 15 Jul 2023 07:43:07 +0100 Subject: [PATCH 17/21] pekko 1.0.0 release (#112) --- build.sbt | 1 - plugin-tester-java/build.gradle | 5 ++--- plugin-tester-java/pom.xml | 8 +------- plugin-tester-scala/build.gradle | 5 ++--- plugin-tester-scala/pom.xml | 10 ++-------- project/Dependencies.scala | 4 ++-- .../src/sbt-test/gen-java/01-gen-basic-java/build.sbt | 1 - .../sbt-test/gen-java/02-server-reflection/build.sbt | 1 - .../src/sbt-test/gen-java/03-no-java-package/build.sbt | 1 - .../sbt-test/gen-java/04-crash-on-keywords/build.sbt | 1 - .../05-duplicate-messages-different-packages/build.sbt | 1 - .../src/sbt-test/gen-scala-server/00-interop/build.sbt | 1 - .../sbt-test/scala3/01-basic-client-server/build.sbt | 1 - 13 files changed, 9 insertions(+), 31 deletions(-) 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" From 11e6f15b1e9edf425c8edb16c50b70e892f8b54b Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 17 Jul 2023 11:06:05 +0100 Subject: [PATCH 18/21] source dist name (#111) --- build.sbt | 3 ++- project/plugins.sbt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 653c481a..4e079616 100644 --- a/build.sbt +++ b/build.sbt @@ -16,7 +16,8 @@ import com.typesafe.tools.mima.core._ import sbt.Keys.scalaVersion ThisBuild / apacheSonatypeProjectProfile := "pekko" -sourceDistName := "incubating-pekko-grpc" +sourceDistName := "apache-pekko-grpc" +sourceDistIncubating := true ThisBuild / versionScheme := Some(VersionScheme.SemVerSpec) val pekkoPrefix = "pekko-grpc" diff --git a/project/plugins.sbt b/project/plugins.sbt index 5059c3d2..45b77d59 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -26,7 +26,7 @@ addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.30") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10") -addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.6") +addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.8") // allow access to snapshots for pekko-sbt-paradox resolvers += Resolver.ApacheMavenSnapshotsRepo From 9c381ecb3bd6cae4c876d4e9f8894710ad2340d8 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 24 Jul 2023 19:06:19 +0100 Subject: [PATCH 19/21] remove old javascript files (#114) --- .../_template/projectSpecificFooter.st | 4 ---- .../main/paradox/assets/js/warnOldVersion.js | 23 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 docs/src/main/paradox/_template/projectSpecificFooter.st delete mode 100644 docs/src/main/paradox/assets/js/warnOldVersion.js diff --git a/docs/src/main/paradox/_template/projectSpecificFooter.st b/docs/src/main/paradox/_template/projectSpecificFooter.st deleted file mode 100644 index c4a9441f..00000000 --- a/docs/src/main/paradox/_template/projectSpecificFooter.st +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/docs/src/main/paradox/assets/js/warnOldVersion.js b/docs/src/main/paradox/assets/js/warnOldVersion.js deleted file mode 100644 index 39da3c3c..00000000 --- a/docs/src/main/paradox/assets/js/warnOldVersion.js +++ /dev/null @@ -1,23 +0,0 @@ -function initOldVersionWarnings($, thisVersion, projectUrl) { - if (projectUrl && projectUrl !== "") { - var schemeLessUrl = projectUrl; - if (projectUrl.startsWith("http://")) projectUrl = schemeLessUrl.substring(5); - else if (projectUrl.startsWith("https://")) projectUrl = schemeLessUrl.substring(6); - const url = schemeLessUrl + (schemeLessUrl.endsWith("\/") ? "" : "/") + "paradox.json"; - $.get(url, function (versionData) { - const currentVersion = versionData.version; - if (thisVersion !== currentVersion) { - showVersionWarning(thisVersion, currentVersion, projectUrl); - } - }); - } -} - -function showVersionWarning(thisVersion, currentVersion, projectUrl) { - $('#docs').prepend( - '
' + - '

This documentation regards version ' + thisVersion + ', ' + - 'however the current version is ' + currentVersion + '.

' + - '
' - ); -} \ No newline at end of file From d95fb4a04031b960d4c4e469e405d473df7f2a2a Mon Sep 17 00:00:00 2001 From: Matthew de Detrich Date: Wed, 26 Jul 2023 14:47:16 +0200 Subject: [PATCH 20/21] Remove sonatype commands that shouldn't be run in release process --- build.sbt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.sbt b/build.sbt index 4e079616..1a1eac37 100644 --- a/build.sbt +++ b/build.sbt @@ -20,6 +20,12 @@ sourceDistName := "apache-pekko-grpc" sourceDistIncubating := true ThisBuild / versionScheme := Some(VersionScheme.SemVerSpec) +commands := commands.value.filterNot { command => + command.nameOption.exists { name => + name.contains("sonatypeRelease") || name.contains("sonatypeBundleRelease") + } +} + val pekkoPrefix = "pekko-grpc" val pekkoGrpcRuntimeName = s"$pekkoPrefix-runtime" From a59c6d61482b40f082ba59369244ee2d227fd19f Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 26 Jul 2023 15:01:45 +0100 Subject: [PATCH 21/21] upgrade paradox plugin (#116) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 45b77d59..ce78b2bf 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -37,7 +37,7 @@ libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always" // We have to deliberately use older versions of sbt-paradox because current Pekko sbt build // only loads on JDK 1.8 so we need to bring in older versions of parboiled which support JDK 1.8 -addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" % "0.0.0+37-3df33944-SNAPSHOT").excludeAll( +addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" % "0.0.0+56-bff08336-SNAPSHOT").excludeAll( "com.lightbend.paradox", "sbt-paradox", "com.lightbend.paradox" % "sbt-paradox-apidoc", "com.lightbend.paradox" % "sbt-paradox-project-info"))