From 170d6baa3002d3aa665e6a7abaf54456547898a7 Mon Sep 17 00:00:00 2001 From: Renato Cavalcanti Date: Wed, 30 Mar 2022 14:18:48 +0200 Subject: [PATCH] rename: change group id and maven artifacts (#875) * rename: change groupId and maven artifacts names * and the scala samples as well * fix plugin deps * more referneces to io.kalix in samples --- .circleci/config.yml | 154 +++++++++--------- maven-java/README.md | 8 +- .../README.md | 14 +- .../pom.xml | 10 +- .../META-INF/maven/archetype-metadata.xml | 0 .../resources/archetype-resources/.gitignore | 0 .../resources/archetype-resources/README.md | 8 +- .../archetype-resources/docker-compose.yml | 4 +- .../resources/archetype-resources/pom.xml | 16 +- .../__packageInPathFormat__/counter_api.proto | 0 .../domain/counter_domain.proto | 0 .../src/main/resources/application.conf | 0 .../src/main/resources/logback.xml | 0 .../src/test/resources/logback-test.xml | 0 .../README.md | 14 +- .../pom.xml | 10 +- .../META-INF/maven/archetype-metadata.xml | 0 .../resources/archetype-resources/.gitignore | 0 .../resources/archetype-resources/README.md | 8 +- .../archetype-resources/docker-compose.yml | 4 +- .../resources/archetype-resources/pom.xml | 16 +- .../__packageInPathFormat__/counter_api.proto | 0 .../domain/counter_domain.proto | 0 .../src/main/resources/application.conf | 0 .../src/main/resources/logback.xml | 0 .../src/test/resources/logback-test.xml | 0 .../README.md | 8 +- .../pom.xml | 12 +- .../src/main/java/kalix/DeployMojo.java | 20 +-- .../src/main/java/kalix/GenerateMojo.java | 4 +- .../m2e/lifecycle-mapping-metadata.xml | 0 maven-java/pom.xml | 18 +- project/Common.scala | 9 +- .../pom.xml | 16 +- .../java-customer-registry-quickstart/pom.xml | 16 +- .../pom.xml | 16 +- samples/java-doc-snippets/pom.xml | 16 +- samples/java-eventsourced-counter/pom.xml | 16 +- .../README.md | 2 +- .../pom.xml | 18 +- .../java-eventsourced-shopping-cart/pom.xml | 16 +- samples/java-fibonacci-action/README.md | 4 +- samples/java-fibonacci-action/pom.xml | 16 +- samples/java-first-service/pom.xml | 16 +- .../java-replicatedentity-examples/pom.xml | 16 +- .../pom.xml | 16 +- samples/java-shopping-cart-quickstart/pom.xml | 16 +- .../pom.xml | 6 +- samples/java-valueentity-counter/README.md | 4 +- samples/java-valueentity-counter/pom.xml | 16 +- .../README.md | 2 +- .../pom.xml | 18 +- .../java-valueentity-shopping-cart/pom.xml | 16 +- .../project/plugins.sbt | 2 +- samples/scala-doc-snippets/build.sbt | 2 +- .../scala-doc-snippets/project/plugins.sbt | 2 +- samples/scala-eventsourced-counter/build.sbt | 2 +- .../project/plugins.sbt | 2 +- .../build.sbt | 2 +- .../project/plugins.sbt | 2 +- .../build.sbt | 2 +- .../project/plugins.sbt | 2 +- samples/scala-fibonacci-action/build.sbt | 2 +- .../project/plugins.sbt | 2 +- .../scala-first-service/project/plugins.sbt | 2 +- .../scala-replicatedentity-examples/build.sbt | 2 +- .../project/plugins.sbt | 2 +- .../build.sbt | 2 +- .../project/plugins.sbt | 2 +- samples/scala-valueentity-counter/build.sbt | 2 +- .../project/plugins.sbt | 2 +- .../build.sbt | 2 +- .../project/plugins.sbt | 2 +- .../scala-valueentity-shopping-cart/build.sbt | 2 +- .../project/plugins.sbt | 2 +- .../main/scala/kalix/sbt/KalixPlugin.scala | 2 +- .../compile-only/project/plugins.sbt | 4 +- .../eventsourcedentity/project/plugins.sbt | 4 +- .../no-common-pkg-root/project/plugins.sbt | 4 +- 79 files changed, 329 insertions(+), 328 deletions(-) rename maven-java/{akkaserverless-maven-archetype-event-sourced-entity => kalix-maven-archetype-event-sourced-entity}/README.md (50%) rename maven-java/{akkaserverless-maven-archetype-value-entity => kalix-maven-archetype-event-sourced-entity}/pom.xml (86%) rename maven-java/{akkaserverless-maven-archetype-event-sourced-entity => kalix-maven-archetype-event-sourced-entity}/src/main/resources/META-INF/maven/archetype-metadata.xml (100%) rename maven-java/{akkaserverless-maven-archetype-event-sourced-entity => kalix-maven-archetype-event-sourced-entity}/src/main/resources/archetype-resources/.gitignore (100%) rename maven-java/{akkaserverless-maven-archetype-event-sourced-entity => kalix-maven-archetype-event-sourced-entity}/src/main/resources/archetype-resources/README.md (88%) rename maven-java/{akkaserverless-maven-archetype-value-entity => kalix-maven-archetype-event-sourced-entity}/src/main/resources/archetype-resources/docker-compose.yml (81%) rename maven-java/{akkaserverless-maven-archetype-event-sourced-entity => kalix-maven-archetype-event-sourced-entity}/src/main/resources/archetype-resources/pom.xml (95%) rename maven-java/{akkaserverless-maven-archetype-event-sourced-entity => kalix-maven-archetype-event-sourced-entity}/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/counter_api.proto (100%) rename maven-java/{akkaserverless-maven-archetype-event-sourced-entity => kalix-maven-archetype-event-sourced-entity}/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/domain/counter_domain.proto (100%) rename maven-java/{akkaserverless-maven-archetype-event-sourced-entity => kalix-maven-archetype-event-sourced-entity}/src/main/resources/archetype-resources/src/main/resources/application.conf (100%) rename maven-java/{akkaserverless-maven-archetype-event-sourced-entity => kalix-maven-archetype-event-sourced-entity}/src/main/resources/archetype-resources/src/main/resources/logback.xml (100%) rename maven-java/{akkaserverless-maven-archetype-event-sourced-entity => kalix-maven-archetype-event-sourced-entity}/src/main/resources/archetype-resources/src/test/resources/logback-test.xml (100%) rename maven-java/{akkaserverless-maven-archetype-value-entity => kalix-maven-archetype-value-entity}/README.md (53%) rename maven-java/{akkaserverless-maven-archetype-event-sourced-entity => kalix-maven-archetype-value-entity}/pom.xml (85%) rename maven-java/{akkaserverless-maven-archetype-value-entity => kalix-maven-archetype-value-entity}/src/main/resources/META-INF/maven/archetype-metadata.xml (100%) rename maven-java/{akkaserverless-maven-archetype-value-entity => kalix-maven-archetype-value-entity}/src/main/resources/archetype-resources/.gitignore (100%) rename maven-java/{akkaserverless-maven-archetype-value-entity => kalix-maven-archetype-value-entity}/src/main/resources/archetype-resources/README.md (89%) rename maven-java/{akkaserverless-maven-archetype-event-sourced-entity => kalix-maven-archetype-value-entity}/src/main/resources/archetype-resources/docker-compose.yml (81%) rename maven-java/{akkaserverless-maven-archetype-value-entity => kalix-maven-archetype-value-entity}/src/main/resources/archetype-resources/pom.xml (95%) rename maven-java/{akkaserverless-maven-archetype-value-entity => kalix-maven-archetype-value-entity}/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/counter_api.proto (100%) rename maven-java/{akkaserverless-maven-archetype-value-entity => kalix-maven-archetype-value-entity}/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/domain/counter_domain.proto (100%) rename maven-java/{akkaserverless-maven-archetype-value-entity => kalix-maven-archetype-value-entity}/src/main/resources/archetype-resources/src/main/resources/application.conf (100%) rename maven-java/{akkaserverless-maven-archetype-value-entity => kalix-maven-archetype-value-entity}/src/main/resources/archetype-resources/src/main/resources/logback.xml (100%) rename maven-java/{akkaserverless-maven-archetype-value-entity => kalix-maven-archetype-value-entity}/src/main/resources/archetype-resources/src/test/resources/logback-test.xml (100%) rename maven-java/{akkaserverless-maven-plugin => kalix-maven-plugin}/README.md (84%) rename maven-java/{akkaserverless-maven-plugin => kalix-maven-plugin}/pom.xml (95%) rename maven-java/{akkaserverless-maven-plugin => kalix-maven-plugin}/src/main/java/kalix/DeployMojo.java (75%) rename maven-java/{akkaserverless-maven-plugin => kalix-maven-plugin}/src/main/java/kalix/GenerateMojo.java (98%) rename maven-java/{akkaserverless-maven-plugin => kalix-maven-plugin}/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 025476295a..e2c56a3bfc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -147,17 +147,17 @@ jobs: - run: name: Scala Samples command: | - if [ $(find ./samples -name plugins.sbt | xargs grep -h "akkaserverless-sdk.version" | uniq | wc -l) -ne 1 ]; then + if [ $(find ./samples -name plugins.sbt | xargs grep -h "kalix-sdk.version" | uniq | wc -l) -ne 1 ]; then echo "Not all Scala samples have the same SDK version:" - find ./samples -name plugins.sbt | xargs grep "akkaserverless-sdk.version" + find ./samples -name plugins.sbt | xargs grep "kalix-sdk.version" false fi - run: name: Java Samples command: | - if [ $(find ./samples -name pom.xml | xargs grep -h "" | tr -s [:space:] | uniq | wc -l) -ne 1 ]; then + if [ $(find ./samples -name pom.xml | xargs grep -h "" | tr -s [:space:] | uniq | wc -l) -ne 1 ]; then echo "Not all Java samples have the same SDK version:" - find ./samples -name pom.xml | xargs grep "" + find ./samples -name pom.xml | xargs grep "" false fi - run: @@ -321,14 +321,14 @@ jobs: name: Run integration tests for Value Entity Archetype command: | cd maven-java - mvn -B archetype:generate -DgroupId=com.example -DartifactId=counter-value-entity -DarchetypeGroupId=com.akkaserverless -DarchetypeArtifactId=akkaserverless-maven-archetype -DarchetypeVersion=$SDK_VERSION + mvn -B archetype:generate -DgroupId=com.example -DartifactId=counter-value-entity -DarchetypeGroupId=io.kalix -DarchetypeArtifactId=kalix-maven-archetype -DarchetypeVersion=$SDK_VERSION cd counter-value-entity mvn -B compile - run: name: Run integration tests for Event Sourced Entity Archetype command: | cd maven-java - mvn -B archetype:generate -DgroupId=com.example -DartifactId=counter-event-sourced-entity -DarchetypeGroupId=com.akkaserverless -DarchetypeArtifactId=akkaserverless-maven-archetype-event-sourced-entity -DarchetypeVersion=$SDK_VERSION + mvn -B archetype:generate -DgroupId=com.example -DartifactId=counter-event-sourced-entity -DarchetypeGroupId=io.kalix -DarchetypeArtifactId=kalix-maven-archetype-event-sourced-entity -DarchetypeVersion=$SDK_VERSION cd counter-event-sourced-entity mvn -B compile - save_deps_cache @@ -349,11 +349,11 @@ jobs: cd samples/java-customer-registry-quickstart echo "Running mvn with SDK version: '$SDK_VERSION'" # must also compile without the profile! - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-customer-registry-kafka-quickstart: machine: true @@ -370,11 +370,11 @@ jobs: cd samples/java-customer-registry-kafka-quickstart echo "Running mvn with SDK version: '$SDK_VERSION'" # must also compile without the profile! - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-customer-registry-views-quickstart: machine: @@ -392,11 +392,11 @@ jobs: cd samples/java-customer-registry-views-quickstart echo "Running mvn with SDK version: '$SDK_VERSION'" # must also compile without the profile! - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-shopping-cart-quickstart: machine: @@ -414,11 +414,11 @@ jobs: cd samples/java-shopping-cart-quickstart echo "Running mvn with SDK version: '$SDK_VERSION'" # must also compile without the profile! - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-fibonacci-action: machine: @@ -435,11 +435,11 @@ jobs: command: | cd samples/java-fibonacci-action echo "Running mvn with SDK version: '$SDK_VERSION'" - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-doc-snippets: machine: @@ -456,7 +456,7 @@ jobs: command: | cd samples/java-doc-snippets echo "Running mvn with SDK version: '$SDK_VERSION'" - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-first-service: machine: @@ -473,10 +473,10 @@ jobs: command: | cd samples/java-first-service echo "Running mvn with SDK version: '$SDK_VERSION'" - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-valueentity-customer-registry: machine: @@ -493,11 +493,11 @@ jobs: command: | cd samples/java-valueentity-customer-registry echo "Running mvn with SDK version: '$SDK_VERSION'" - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-eventsourced-customer-registry: machine: @@ -514,11 +514,11 @@ jobs: command: | cd samples/java-eventsourced-customer-registry echo "Running mvn with SDK version: '$SDK_VERSION'" - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-valueentity-shopping-cart: machine: @@ -535,11 +535,11 @@ jobs: command: | cd samples/java-valueentity-shopping-cart echo "Running mvn with SDK version: '$SDK_VERSION'" - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-eventsourced-shopping-cart: machine: @@ -556,11 +556,11 @@ jobs: command: | cd samples/java-eventsourced-shopping-cart echo "Running mvn with SDK version: '$SDK_VERSION'" - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-replicatedentity-shopping-cart: machine: @@ -577,11 +577,11 @@ jobs: command: | cd samples/java-replicatedentity-shopping-cart echo "Running mvn with SDK version: '$SDK_VERSION'" - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-eventsourced-counter: machine: @@ -598,13 +598,13 @@ jobs: command: | cd samples/java-eventsourced-counter echo "Running mvn with SDK version: '$SDK_VERSION'" - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test - # FIXME related to https://github.com/lightbend/akkaserverless-java-sdk/issues/297 - # mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test + # FIXME related to https://github.com/lightbend/kalix-jvm-sdk/issues/297 + # mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-valueentity-counter: machine: @@ -621,11 +621,11 @@ jobs: command: | cd samples/java-valueentity-counter echo "Running mvn with SDK version: '$SDK_VERSION'" - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-java-valueentity-counter-spring-client: machine: true @@ -641,11 +641,11 @@ jobs: command: | cd samples/java-valueentity-counter-spring-client echo "Running mvn with SDK version: '$SDK_VERSION'" - mvn -Dakkaserverless-sdk.version=$SDK_VERSION compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify + mvn -Dkalix-sdk.version=$SDK_VERSION compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION compile + mvn -Dkalix-sdk.version=$SDK_VERSION compile sample-java-replicatedentity-examples: machine: @@ -662,11 +662,11 @@ jobs: command: | cd samples/java-replicatedentity-examples echo "Running mvn with SDK version: '$SDK_VERSION'" - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile - mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION verify -Pit echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile + mvn -Dkalix-sdk.version=$SDK_VERSION test-compile sample-scala-doc-snippets: machine: @@ -683,11 +683,11 @@ jobs: command: | cd samples/scala-doc-snippets echo "Running sbt with SDK version: '$SDK_VERSION'" - sbt -Dakkaserverless-sdk.version=$SDK_VERSION compile + sbt -Dkalix-sdk.version=$SDK_VERSION compile # FIXME tests && integration tests echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/scala src/test/scala src/it/scala - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile sample-scala-fibonacci-action: machine: @@ -704,11 +704,11 @@ jobs: command: | cd samples/scala-fibonacci-action echo "Running sbt with SDK version: '$SDK_VERSION'" - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test + sbt -Dkalix-sdk.version=$SDK_VERSION test # FIXME tests && integration tests echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/scala src/test/scala src/it/scala - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile sample-scala-valueentity-customer-registry: machine: @@ -725,11 +725,11 @@ jobs: command: | cd samples/scala-valueentity-customer-registry echo "Running sbt with SDK version: '$SDK_VERSION'" - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test + sbt -Dkalix-sdk.version=$SDK_VERSION test # FIXME integration tests echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/scala src/test/scala src/it/scala - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile sample-scala-customer-registry-quickstart: machine: @@ -746,11 +746,11 @@ jobs: command: | cd samples/scala-customer-registry-quickstart echo "Running sbt with SDK version: '$SDK_VERSION'" - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test + sbt -Dkalix-sdk.version=$SDK_VERSION test # FIXME integration tests echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/scala src/test/scala src/it/scala - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile sample-scala-eventsourced-customer-registry: machine: @@ -767,11 +767,11 @@ jobs: command: | cd samples/scala-eventsourced-customer-registry echo "Running sbt with SDK version: '$SDK_VERSION'" - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test + sbt -Dkalix-sdk.version=$SDK_VERSION test # FIXME integration tests echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/scala src/test/scala src/it/scala - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile sample-scala-first-service: machine: @@ -788,11 +788,11 @@ jobs: command: | cd samples/scala-first-service echo "Running sbt with SDK version: '$SDK_VERSION'" - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile # FIXME integration tests echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/scala src/test/scala src/it/scala - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile sample-scala-valueentity-counter: machine: @@ -809,11 +809,11 @@ jobs: command: | cd samples/scala-valueentity-counter echo "Running sbt with SDK version: '$SDK_VERSION'" - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test + sbt -Dkalix-sdk.version=$SDK_VERSION test # FIXME integration tests echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/scala src/test/scala src/it/scala - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile sample-scala-eventsourced-counter: machine: @@ -830,11 +830,11 @@ jobs: command: | cd samples/scala-eventsourced-counter echo "Running sbt with SDK version: '$SDK_VERSION'" - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test + sbt -Dkalix-sdk.version=$SDK_VERSION test # FIXME integration tests echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/scala src/test/scala src/it/scala - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile sample-scala-eventsourced-shopping-cart: machine: @@ -851,11 +851,11 @@ jobs: command: | cd samples/scala-eventsourced-shopping-cart echo "Running sbt with SDK version: '$SDK_VERSION'" - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test + sbt -Dkalix-sdk.version=$SDK_VERSION test # FIXME integration tests echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/scala src/test/scala src/it/scala - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile sample-scala-replicatedentity-shopping-cart: machine: @@ -872,10 +872,10 @@ jobs: command: | cd samples/scala-replicatedentity-shopping-cart echo "Running sbt with SDK version: '$SDK_VERSION'" - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test + sbt -Dkalix-sdk.version=$SDK_VERSION test echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile sample-scala-replicatedentity-examples: machine: @@ -892,10 +892,10 @@ jobs: command: | cd samples/scala-replicatedentity-examples echo "Running sbt with SDK version: '$SDK_VERSION'" - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test + sbt -Dkalix-sdk.version=$SDK_VERSION test echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile sample-scala-valueentity-shopping-cart: machine: @@ -913,10 +913,10 @@ jobs: cd samples/scala-valueentity-shopping-cart echo "Running sbt with SDK version: '$SDK_VERSION'" echo "Version check: $VERSION_CHECK_ON_STARTUP" - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test + sbt -Dkalix-sdk.version=$SDK_VERSION test echo "==== Verifying that generated unmanaged sources compile ====" rm -rf src/main/java src/test/java src/it/java - sbt -Dakkaserverless-sdk.version=$SDK_VERSION test:compile + sbt -Dkalix-sdk.version=$SDK_VERSION test:compile publish: docker: diff --git a/maven-java/README.md b/maven-java/README.md index d09a4a9536..d03a1ec6ab 100644 --- a/maven-java/README.md +++ b/maven-java/README.md @@ -1,11 +1,11 @@ -# akkaserverless-maven-java +# kalix-maven-java This Maven parent project bundles projects to support the Apache Maven/Java toolchain. Please navigate to each project's README to comprehend what is provided in detail. -* [akkaserverless-maven-plugin](akkaserverless-maven-plugin/README.md) -* [akkaserverless-maven-archetype](akkaserverless-maven-archetype-value-entity/README.md) -* [akkaserverless-maven-archetype-event-sourced-entity](akkaserverless-maven-archetype-event-sourced-entity/README.md) +* [kalix-maven-plugin](kalix-maven-plugin/README.md) +* [kalix-maven-archetype](kalix-maven-archetype-value-entity/README.md) +* [kalix-maven-archetype-event-sourced-entity](kalix-maven-archetype-event-sourced-entity/README.md) See instructions for local building and testing in [Contributing](../CONTRIBUTING.md). diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/README.md b/maven-java/kalix-maven-archetype-event-sourced-entity/README.md similarity index 50% rename from maven-java/akkaserverless-maven-archetype-event-sourced-entity/README.md rename to maven-java/kalix-maven-archetype-event-sourced-entity/README.md index 87127372a2..1c0afa579a 100644 --- a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/README.md +++ b/maven-java/kalix-maven-archetype-event-sourced-entity/README.md @@ -1,18 +1,18 @@ -# akkaserverless-maven-archetype-event-sourced-entity +# kalix-maven-archetype-event-sourced-entity -This archetype can be used to generate a project suitable for a service using an Event-sourced Entity with [Akka Serverless](https://www.lightbend.com/akka-serverless). +This archetype can be used to generate a project suitable for a service using an Event-sourced Entity with [Kalix](https://www.lightbend.com/akka-serverless). **The Maven project created from the archetype will contain an Event Sourced entity protobuf definition.** -For the latest release see [GitHub releases](https://github.com/lightbend/akkaserverless-java-sdk/releases). +For the latest release see [GitHub releases](https://github.com/lightbend/kalix-jvm-sdk/releases). To kickstart a project on Linux and macOS: ``` mvn \ archetype:generate \ - -DarchetypeGroupId=com.akkaserverless \ - -DarchetypeArtifactId=akkaserverless-maven-archetype-event-sourced-entity \ + -DarchetypeGroupId=io.kalix \ + -DarchetypeArtifactId=kalix-maven-archetype-event-sourced-entity \ -DarchetypeVersion=LATEST ``` @@ -21,7 +21,7 @@ To kickstart a project on Windows 10 or later: ``` mvn ^ archetype:generate ^ - -DarchetypeGroupId=com.akkaserverless ^ - -DarchetypeArtifactId=akkaserverless-maven-archetype-event-sourced-entity ^ + -DarchetypeGroupId=io.kalix ^ + -DarchetypeArtifactId=kalix-maven-archetype-event-sourced-entity ^ -DarchetypeVersion=LATEST ``` diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/pom.xml b/maven-java/kalix-maven-archetype-event-sourced-entity/pom.xml similarity index 86% rename from maven-java/akkaserverless-maven-archetype-value-entity/pom.xml rename to maven-java/kalix-maven-archetype-event-sourced-entity/pom.xml index 666afb899f..183b5ace30 100644 --- a/maven-java/akkaserverless-maven-archetype-value-entity/pom.xml +++ b/maven-java/kalix-maven-archetype-event-sourced-entity/pom.xml @@ -1,17 +1,17 @@ 4.0.0 - akkaserverless-maven-archetype + kalix-maven-archetype-event-sourced-entity 0.10.6 maven-archetype - com.akkaserverless - akkaserverless-maven-java + io.kalix + kalix-maven-java 0.10.6 - Akka Serverless Maven Archetype (Value entity) - This archetype can be used to generate a project suitable for the general development of Akka Serverless applications + Kalix Maven Archetype (Event Sourced entity) + This archetype can be used to generate a project suitable for the general development of Kalix applications https://www.lightbend.com/akka-serverless diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/META-INF/maven/archetype-metadata.xml similarity index 100% rename from maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/META-INF/maven/archetype-metadata.xml rename to maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/META-INF/maven/archetype-metadata.xml diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/.gitignore b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/.gitignore similarity index 100% rename from maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/.gitignore rename to maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/.gitignore diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/README.md b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/README.md similarity index 88% rename from maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/README.md rename to maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/README.md index fb01917259..7f304b3927 100644 --- a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/README.md +++ b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/README.md @@ -25,8 +25,8 @@ mvn compile #[[ ## Running Locally ]]# -In order to run your application locally, you must run the Akka Serverless proxy. The included `docker-compose` file contains the configuration required to run the proxy for a locally running application. -It also contains the configuration to start a local Google Pub/Sub emulator that the Akka Serverless proxy will connect to. +In order to run your application locally, you must run the Kalix proxy. The included `docker-compose` file contains the configuration required to run the proxy for a locally running application. +It also contains the configuration to start a local Google Pub/Sub emulator that the Kalix proxy will connect to. To start the proxy, run the following command from this directory: ``` @@ -67,9 +67,9 @@ and configure a Docker Registry to upload your docker image to. You will need to update the `dockerImage` property in the `pom.xml` and refer to [Configuring registries](https://developer.lightbend.com/docs/akka-serverless/projects/container-registries.html) -for more information on how to make your docker image available to Akka Serverless. +for more information on how to make your docker image available to Kalix. -Finally, you can use the [Akka Serverless Console](https://console.akkaserverless.com) +Finally, you can use the [Kalix Console](https://console.kalix.io) to create a project and then deploy your service into the project either by using `mvn deploy` which will also conveniently package and publish your docker image prior to deployment, or by first packaging and publishing the docker image through `mvn clean package docker:push -DskipTests` and then deploying the image diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml similarity index 81% rename from maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml rename to maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml index 1b2f9e2db7..3a71163e87 100644 --- a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml +++ b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml @@ -2,8 +2,8 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 - command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" extra_hosts: diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/pom.xml b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/pom.xml similarity index 95% rename from maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/pom.xml rename to maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/pom.xml index 317195d17e..5997b8933e 100644 --- a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/pom.xml +++ b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/pom.xml @@ -19,7 +19,7 @@ 11 UTF-8 - @project.version@ + @project.version@ 2.1.2 @@ -234,9 +234,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${D}{akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${D}{kalix-sdk.version} @@ -296,14 +296,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${D}{akkaserverless-sdk.version} + ${D}{kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${D}{akkaserverless-sdk.version} + ${D}{kalix-sdk.version} test diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/counter_api.proto b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/counter_api.proto similarity index 100% rename from maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/counter_api.proto rename to maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/counter_api.proto diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/domain/counter_domain.proto b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/domain/counter_domain.proto similarity index 100% rename from maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/domain/counter_domain.proto rename to maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/domain/counter_domain.proto diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/resources/application.conf b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/resources/application.conf similarity index 100% rename from maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/resources/application.conf rename to maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/resources/application.conf diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/resources/logback.xml b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/resources/logback.xml similarity index 100% rename from maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/resources/logback.xml rename to maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/main/resources/logback.xml diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/test/resources/logback-test.xml similarity index 100% rename from maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/test/resources/logback-test.xml rename to maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/src/test/resources/logback-test.xml diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/README.md b/maven-java/kalix-maven-archetype-value-entity/README.md similarity index 53% rename from maven-java/akkaserverless-maven-archetype-value-entity/README.md rename to maven-java/kalix-maven-archetype-value-entity/README.md index 949bbfc3f5..2788c1de6e 100644 --- a/maven-java/akkaserverless-maven-archetype-value-entity/README.md +++ b/maven-java/kalix-maven-archetype-value-entity/README.md @@ -1,18 +1,18 @@ -# akkaserverless-maven-archetype +# kalix-maven-archetype -This archetype can be used to generate a project suitable for the development of a Service using a Value Entity with [Akka Serverless](https://www.lightbend.com/akka-serverless). +This archetype can be used to generate a project suitable for the development of a Service using a Value Entity with [Kalix](https://www.lightbend.com/akka-serverless). **The Maven project created from the archetype will contain a Value entity protobuf definition.** -For the latest release see [GitHub releases](https://github.com/lightbend/akkaserverless-java-sdk/releases). +For the latest release see [GitHub releases](https://github.com/lightbend/kalix-jvm-sdk/releases). To kickstart a project on Linux and macOS: ``` mvn \ archetype:generate \ - -DarchetypeGroupId=com.akkaserverless \ - -DarchetypeArtifactId=akkaserverless-maven-archetype \ + -DarchetypeGroupId=io.kalix \ + -DarchetypeArtifactId=kalix-maven-archetype \ -DarchetypeVersion=LATEST ``` @@ -21,7 +21,7 @@ To kickstart a project on Windows 10 or later: ``` mvn ^ archetype:generate ^ - -DarchetypeGroupId=com.akkaserverless ^ - -DarchetypeArtifactId=akkaserverless-maven-archetype ^ + -DarchetypeGroupId=io.kalix ^ + -DarchetypeArtifactId=kalix-maven-archetype ^ -DarchetypeVersion=LATEST ``` diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/pom.xml b/maven-java/kalix-maven-archetype-value-entity/pom.xml similarity index 85% rename from maven-java/akkaserverless-maven-archetype-event-sourced-entity/pom.xml rename to maven-java/kalix-maven-archetype-value-entity/pom.xml index f1afd1ffdd..1a094f465a 100644 --- a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/pom.xml +++ b/maven-java/kalix-maven-archetype-value-entity/pom.xml @@ -1,17 +1,17 @@ 4.0.0 - akkaserverless-maven-archetype-event-sourced-entity + kalix-maven-archetype 0.10.6 maven-archetype - com.akkaserverless - akkaserverless-maven-java + io.kalix + kalix-maven-java 0.10.6 - Akka Serverless Maven Archetype (Event Sourced entity) - This archetype can be used to generate a project suitable for the general development of Akka Serverless applications + Kalix Maven Archetype (Value entity) + This archetype can be used to generate a project suitable for the general development of Kalix applications https://www.lightbend.com/akka-serverless diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/META-INF/maven/archetype-metadata.xml similarity index 100% rename from maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/META-INF/maven/archetype-metadata.xml rename to maven-java/kalix-maven-archetype-value-entity/src/main/resources/META-INF/maven/archetype-metadata.xml diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/.gitignore b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/.gitignore similarity index 100% rename from maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/.gitignore rename to maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/.gitignore diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/README.md b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/README.md similarity index 89% rename from maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/README.md rename to maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/README.md index a11e0b00b9..3783d93e18 100644 --- a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/README.md +++ b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/README.md @@ -25,8 +25,8 @@ mvn compile #[[ ## Running Locally ]]# -In order to run your application locally, you must run the Akka Serverless proxy. The included `docker-compose` file contains the configuration required to run the proxy for a locally running application. -It also contains the configuration to start a local Google Pub/Sub emulator that the Akka Serverless proxy will connect to. +In order to run your application locally, you must run the Kalix proxy. The included `docker-compose` file contains the configuration required to run the proxy for a locally running application. +It also contains the configuration to start a local Google Pub/Sub emulator that the Kalix proxy will connect to. To start the proxy, run the following command from this directory: ``` @@ -67,9 +67,9 @@ and configure a Docker Registry to upload your docker image to. You will need to update the `dockerImage` property in the `pom.xml` and refer to [Configuring registries](https://developer.lightbend.com/docs/akka-serverless/projects/container-registries.html) -for more information on how to make your docker image available to Akka Serverless. +for more information on how to make your docker image available to Kalix. -Finally, you can use the [Akka Serverless Console](https://console.akkaserverless.com) +Finally, you can use the [Kalix Console](https://console.kalix.io) to create a project and then deploy your service into the project either by using `mvn deploy` which will also conveniently package and publish your docker image prior to deployment, or by first packaging and publishing the docker image through `mvn clean package docker:push -DskipTests` and then deploying the image diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml similarity index 81% rename from maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml rename to maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml index 1b2f9e2db7..3a71163e87 100644 --- a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml +++ b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml @@ -2,8 +2,8 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 - command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" extra_hosts: diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/pom.xml b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/pom.xml similarity index 95% rename from maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/pom.xml rename to maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/pom.xml index 317195d17e..5997b8933e 100644 --- a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/pom.xml +++ b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/pom.xml @@ -19,7 +19,7 @@ 11 UTF-8 - @project.version@ + @project.version@ 2.1.2 @@ -234,9 +234,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${D}{akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${D}{kalix-sdk.version} @@ -296,14 +296,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${D}{akkaserverless-sdk.version} + ${D}{kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${D}{akkaserverless-sdk.version} + ${D}{kalix-sdk.version} test diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/counter_api.proto b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/counter_api.proto similarity index 100% rename from maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/counter_api.proto rename to maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/counter_api.proto diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/domain/counter_domain.proto b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/domain/counter_domain.proto similarity index 100% rename from maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/domain/counter_domain.proto rename to maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/proto/__packageInPathFormat__/domain/counter_domain.proto diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/resources/application.conf b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/resources/application.conf similarity index 100% rename from maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/resources/application.conf rename to maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/resources/application.conf diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/resources/logback.xml b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/resources/logback.xml similarity index 100% rename from maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/resources/logback.xml rename to maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/src/main/resources/logback.xml diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/src/test/resources/logback-test.xml similarity index 100% rename from maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/src/test/resources/logback-test.xml rename to maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/src/test/resources/logback-test.xml diff --git a/maven-java/akkaserverless-maven-plugin/README.md b/maven-java/kalix-maven-plugin/README.md similarity index 84% rename from maven-java/akkaserverless-maven-plugin/README.md rename to maven-java/kalix-maven-plugin/README.md index cbf08dca7a..f9dc2e6fec 100644 --- a/maven-java/akkaserverless-maven-plugin/README.md +++ b/maven-java/kalix-maven-plugin/README.md @@ -1,12 +1,12 @@ -# akkaserverless-maven-plugin +# kalix-maven-plugin This plugin is designed for developers of Maven and Java projects that wish to target the -[Akka Serverless](https://www.lightbend.com/akka-serverless) environment. +[Kalix](https://www.lightbend.com/akka-serverless) environment. The plugin provides two functions: * generate templated source code from entity, command, event and state information declared by `.proto` files; and -* the ability to deploy directly to Akka Serverless. +* the ability to deploy directly to Kalix. ## Usage @@ -15,7 +15,7 @@ To use the plugin (substitute the version accordingly): ```xml com.lightbend -akkaserverless-maven-plugin +kalix-maven-plugin 1.0-SNAPSHOT diff --git a/maven-java/akkaserverless-maven-plugin/pom.xml b/maven-java/kalix-maven-plugin/pom.xml similarity index 95% rename from maven-java/akkaserverless-maven-plugin/pom.xml rename to maven-java/kalix-maven-plugin/pom.xml index f595171abe..dcd7aa5fdf 100644 --- a/maven-java/akkaserverless-maven-plugin/pom.xml +++ b/maven-java/kalix-maven-plugin/pom.xml @@ -4,17 +4,17 @@ 4.0.0 - com.akkaserverless - akkaserverless-maven-plugin + io.kalix + kalix-maven-plugin 0.10.6 maven-plugin - com.akkaserverless - akkaserverless-maven-java + io.kalix + kalix-maven-java 0.10.6 - Akka Serverless Maven Plugin + Kalix Maven Plugin @@ -62,7 +62,7 @@ - com.akkaserverless + io.kalix kalix-codegen-java_2.12 ${project.version} diff --git a/maven-java/akkaserverless-maven-plugin/src/main/java/kalix/DeployMojo.java b/maven-java/kalix-maven-plugin/src/main/java/kalix/DeployMojo.java similarity index 75% rename from maven-java/akkaserverless-maven-plugin/src/main/java/kalix/DeployMojo.java rename to maven-java/kalix-maven-plugin/src/main/java/kalix/DeployMojo.java index cc60cc467f..6796d91174 100644 --- a/maven-java/akkaserverless-maven-plugin/src/main/java/kalix/DeployMojo.java +++ b/maven-java/kalix-maven-plugin/src/main/java/kalix/DeployMojo.java @@ -14,7 +14,7 @@ import java.util.List; /** - * Goal which deploys the current project to Akka Serverless. + * Goal which deploys the current project to Kalix. */ @SuppressWarnings("unused") @Mojo(name = "deploy", defaultPhase = LifecyclePhase.DEPLOY) @@ -30,11 +30,11 @@ public class DeployMojo extends AbstractMojo { @Parameter(defaultValue = "${project.artifactId}", property = "service", required = true) private String service; - @Parameter(defaultValue = "akkasls", property = "akkaslsPath", required = true) - private String akkaslsPath; + @Parameter(defaultValue = "kalix", property = "kalixPath", required = true) + private String kalixPath; - @Parameter(property = "akkaslsContext") - private String akkaslsContext; + @Parameter(property = "kalixContext") + private String kalixContext; @Parameter(defaultValue = "30000", property = "cliTimeoutMs", required = true) private Long cliTimeoutMs; @@ -45,13 +45,13 @@ public class DeployMojo extends AbstractMojo { * We deploy by invoking the services deploy command */ public void execute() throws MojoExecutionException { - log.info("Deploying project to Akka Serverless"); + log.info("Deploying project to Kalix"); try { final List commandLine; - if (akkaslsContext != null) { - commandLine = Arrays.asList(akkaslsPath, "--context", akkaslsContext, "service", "deploy", service, dockerImage); + if (kalixContext != null) { + commandLine = Arrays.asList(kalixPath, "--context", kalixContext, "service", "deploy", service, dockerImage); } else { - commandLine = Arrays.asList(akkaslsPath, "service", "deploy", service, dockerImage); + commandLine = Arrays.asList(kalixPath, "service", "deploy", service, dockerImage); } log.info("Executing `" + String.join(" ", commandLine) + "`"); Process process = new ProcessBuilder().directory(baseDir).command(commandLine).start(); @@ -62,7 +62,7 @@ public void execute() throws MojoExecutionException { if (status == 0) { log.info("Done."); } else { - log.error("Unable to deploy. Ensure you can deploy by using the akkasls command line directly."); + log.error("Unable to deploy. Ensure you can deploy by using the kalix command line directly."); } } catch (IOException | InterruptedException e) { throw new MojoExecutionException("There was a problem deploying", e); diff --git a/maven-java/akkaserverless-maven-plugin/src/main/java/kalix/GenerateMojo.java b/maven-java/kalix-maven-plugin/src/main/java/kalix/GenerateMojo.java similarity index 98% rename from maven-java/akkaserverless-maven-plugin/src/main/java/kalix/GenerateMojo.java rename to maven-java/kalix-maven-plugin/src/main/java/kalix/GenerateMojo.java index 5b302b29d9..ecfe84f1c1 100644 --- a/maven-java/akkaserverless-maven-plugin/src/main/java/kalix/GenerateMojo.java +++ b/maven-java/kalix-maven-plugin/src/main/java/kalix/GenerateMojo.java @@ -46,11 +46,11 @@ public class GenerateMojo extends AbstractMojo { private File descriptorSetOutputDirectory; @SuppressWarnings("unused") - @Parameter(defaultValue = "${project.build.directory}/generated-sources/akkaserverless/java", required = true) + @Parameter(defaultValue = "${project.build.directory}/generated-sources/kalix/java", required = true) private File generatedSourceDirectory; @SuppressWarnings("unused") - @Parameter(defaultValue = "${project.build.directory}/generated-test-sources/akkaserverless/java", required = true) + @Parameter(defaultValue = "${project.build.directory}/generated-test-sources/kalix/java", required = true) private File generatedTestSourceDirectory; // src/main/java diff --git a/maven-java/akkaserverless-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/maven-java/kalix-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml similarity index 100% rename from maven-java/akkaserverless-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml rename to maven-java/kalix-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml diff --git a/maven-java/pom.xml b/maven-java/pom.xml index 9aa346e8ba..182bf6da14 100644 --- a/maven-java/pom.xml +++ b/maven-java/pom.xml @@ -3,13 +3,13 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.akkaserverless - akkaserverless-maven-java + io.kalix + kalix-maven-java 0.10.6 pom - Akka Serverless Java Maven parent pom - This is the parent pom for the Akka Serverless Maven plugin and archetypes + Kalix Java Maven parent pom + This is the parent pom for the Kalix Maven plugin and archetypes Apache-2.0 @@ -18,9 +18,9 @@ - https://www.lightbend.com/akkaserverless + https://www.lightbend.com/kalix - https://github.com/lightbend/akkaserverless-java-sdk + https://github.com/lightbend/kalix-jvm-sdk @@ -125,8 +125,8 @@ - akkaserverless-maven-plugin - akkaserverless-maven-archetype-value-entity - akkaserverless-maven-archetype-event-sourced-entity + kalix-maven-plugin + kalix-maven-archetype-value-entity + kalix-maven-archetype-event-sourced-entity diff --git a/project/Common.scala b/project/Common.scala index 3056b11b0b..ea7a3f75df 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -15,18 +15,19 @@ object CommonSettings extends AutoPlugin { override def globalSettings = Seq( - organization := "com.akkaserverless", + organization := "io.kalix", organizationName := "Lightbend Inc.", organizationHomepage := Some(url("https://lightbend.com")), - homepage := Some(url("https://akkaserverless.com")), + homepage := Some(url("https://kalix.io")), developers := List( Developer( - id = "akka-serverless-team", - name = "Akka Serverless Team", + id = "kalix-team", + name = "Kalix Team", email = "info@lightbend.com", url = url("https://lightbend.com"))), scmInfo := Some( ScmInfo( + // TODO: change this after we rename the repo url("https://github.com/lightbend/akkaserverless-java-sdk"), "scm:git@github.com:lightbend/akkaserverless-java-sdk.git")), startYear := Some(2021), diff --git a/samples/java-customer-registry-kafka-quickstart/pom.xml b/samples/java-customer-registry-kafka-quickstart/pom.xml index adf5888132..8386a01b1d 100644 --- a/samples/java-customer-registry-kafka-quickstart/pom.xml +++ b/samples/java-customer-registry-kafka-quickstart/pom.xml @@ -17,7 +17,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 @@ -232,9 +232,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -294,14 +294,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-customer-registry-quickstart/pom.xml b/samples/java-customer-registry-quickstart/pom.xml index 532e388bd4..3c17fbd8e7 100644 --- a/samples/java-customer-registry-quickstart/pom.xml +++ b/samples/java-customer-registry-quickstart/pom.xml @@ -17,7 +17,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 @@ -232,9 +232,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -294,14 +294,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-customer-registry-views-quickstart/pom.xml b/samples/java-customer-registry-views-quickstart/pom.xml index abdecefea8..7e579a0cd1 100644 --- a/samples/java-customer-registry-views-quickstart/pom.xml +++ b/samples/java-customer-registry-views-quickstart/pom.xml @@ -17,7 +17,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 @@ -232,9 +232,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -294,14 +294,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-doc-snippets/pom.xml b/samples/java-doc-snippets/pom.xml index 05d11fb9f5..fbfa957d8b 100644 --- a/samples/java-doc-snippets/pom.xml +++ b/samples/java-doc-snippets/pom.xml @@ -18,7 +18,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 @@ -234,9 +234,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -296,14 +296,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-eventsourced-counter/pom.xml b/samples/java-eventsourced-counter/pom.xml index 048bb0075d..593e1a64be 100644 --- a/samples/java-eventsourced-counter/pom.xml +++ b/samples/java-eventsourced-counter/pom.xml @@ -18,7 +18,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 1.1.1 @@ -234,9 +234,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -296,14 +296,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-eventsourced-customer-registry/README.md b/samples/java-eventsourced-customer-registry/README.md index 4dc1648615..08eb7367e6 100644 --- a/samples/java-eventsourced-customer-registry/README.md +++ b/samples/java-eventsourced-customer-registry/README.md @@ -12,7 +12,7 @@ To run the example locally: * trigger codegen, compile and run from Maven ``` cd samples/java-eventsourced-customer-registry - mvn -Dakkaserverless-sdk.version=0.7.0-beta....-dev-SNAPSHOT compile exec:exec + mvn -Dkalix-sdk.version=0.7.0-beta....-dev-SNAPSHOT compile exec:exec ``` * Start the proxy diff --git a/samples/java-eventsourced-customer-registry/pom.xml b/samples/java-eventsourced-customer-registry/pom.xml index a939f098a4..8d763a8489 100644 --- a/samples/java-eventsourced-customer-registry/pom.xml +++ b/samples/java-eventsourced-customer-registry/pom.xml @@ -2,7 +2,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.akkaserverless.samples + io.kalix.samples eventsourced-customer-registry 1.0-SNAPSHOT jar @@ -18,7 +18,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.3 @@ -234,9 +234,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -296,14 +296,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-eventsourced-shopping-cart/pom.xml b/samples/java-eventsourced-shopping-cart/pom.xml index d74cc38114..87923967d4 100644 --- a/samples/java-eventsourced-shopping-cart/pom.xml +++ b/samples/java-eventsourced-shopping-cart/pom.xml @@ -19,7 +19,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 @@ -237,9 +237,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -299,14 +299,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-fibonacci-action/README.md b/samples/java-fibonacci-action/README.md index dafa55babc..e7762546cb 100644 --- a/samples/java-fibonacci-action/README.md +++ b/samples/java-fibonacci-action/README.md @@ -4,8 +4,8 @@ This project is based on the Kalix Maven archetype. ```shell mvn archetype:generate \ - -DarchetypeGroupId=com.akkaserverless \ - -DarchetypeArtifactId=akkaserverless-maven-archetype \ + -DarchetypeGroupId=io.kalix \ + -DarchetypeArtifactId=kalix-maven-archetype \ -DarchetypeVersion=LATEST ``` diff --git a/samples/java-fibonacci-action/pom.xml b/samples/java-fibonacci-action/pom.xml index 73ed9bf7d0..72b0ea05c6 100644 --- a/samples/java-fibonacci-action/pom.xml +++ b/samples/java-fibonacci-action/pom.xml @@ -18,7 +18,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 @@ -234,9 +234,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -296,14 +296,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-first-service/pom.xml b/samples/java-first-service/pom.xml index 639fe74f9c..4b14eef23e 100644 --- a/samples/java-first-service/pom.xml +++ b/samples/java-first-service/pom.xml @@ -18,7 +18,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 @@ -234,9 +234,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -296,14 +296,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-replicatedentity-examples/pom.xml b/samples/java-replicatedentity-examples/pom.xml index 95a99744f9..8a3f38846c 100644 --- a/samples/java-replicatedentity-examples/pom.xml +++ b/samples/java-replicatedentity-examples/pom.xml @@ -19,7 +19,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 @@ -232,9 +232,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -294,14 +294,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-replicatedentity-shopping-cart/pom.xml b/samples/java-replicatedentity-shopping-cart/pom.xml index 51fda2ad70..36c884f82f 100644 --- a/samples/java-replicatedentity-shopping-cart/pom.xml +++ b/samples/java-replicatedentity-shopping-cart/pom.xml @@ -19,7 +19,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 @@ -232,9 +232,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -294,14 +294,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-shopping-cart-quickstart/pom.xml b/samples/java-shopping-cart-quickstart/pom.xml index a83ac22705..9460ff9b92 100644 --- a/samples/java-shopping-cart-quickstart/pom.xml +++ b/samples/java-shopping-cart-quickstart/pom.xml @@ -17,7 +17,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 @@ -233,9 +233,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -295,14 +295,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-valueentity-counter-spring-client/pom.xml b/samples/java-valueentity-counter-spring-client/pom.xml index 3cb0a9e904..2ad9953edb 100644 --- a/samples/java-valueentity-counter-spring-client/pom.xml +++ b/samples/java-valueentity-counter-spring-client/pom.xml @@ -21,7 +21,7 @@ 11 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 3.19.2 0.6.1 @@ -55,9 +55,9 @@ 2.13.1.RELEASE - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} org.springframework.boot diff --git a/samples/java-valueentity-counter/README.md b/samples/java-valueentity-counter/README.md index fea4571010..b75fb3dd00 100644 --- a/samples/java-valueentity-counter/README.md +++ b/samples/java-valueentity-counter/README.md @@ -4,8 +4,8 @@ This project is based on the Kalix Maven archetype. ```shell mvn archetype:generate \ - -DarchetypeGroupId=com.akkaserverless \ - -DarchetypeArtifactId=akkaserverless-maven-archetype \ + -DarchetypeGroupId=io.kalix \ + -DarchetypeArtifactId=kalix-maven-archetype \ -DarchetypeVersion=LATEST ``` diff --git a/samples/java-valueentity-counter/pom.xml b/samples/java-valueentity-counter/pom.xml index 9482ff1aff..3c0622e42d 100644 --- a/samples/java-valueentity-counter/pom.xml +++ b/samples/java-valueentity-counter/pom.xml @@ -19,7 +19,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 @@ -245,9 +245,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -307,14 +307,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-valueentity-customer-registry/README.md b/samples/java-valueentity-customer-registry/README.md index 2fadd391fd..273a736d4d 100644 --- a/samples/java-valueentity-customer-registry/README.md +++ b/samples/java-valueentity-customer-registry/README.md @@ -12,7 +12,7 @@ To run the example locally: * trigger codegen, compile and run form Maven ``` cd samples/java-valueentity-customer-registry - mvn -Dakkaserverless-sdk.version=0.7.0-beta....-dev-SNAPSHOT compile exec:exec + mvn -Dkalix-sdk.version=0.7.0-beta....-dev-SNAPSHOT compile exec:exec ``` * Start the proxy diff --git a/samples/java-valueentity-customer-registry/pom.xml b/samples/java-valueentity-customer-registry/pom.xml index 94fd95c84d..b0dfc7e73f 100644 --- a/samples/java-valueentity-customer-registry/pom.xml +++ b/samples/java-valueentity-customer-registry/pom.xml @@ -2,7 +2,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.akkaserverless.samples + io.kalix.samples customer-registry 1.0-SNAPSHOT jar @@ -18,7 +18,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.3 @@ -234,9 +234,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -296,14 +296,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/java-valueentity-shopping-cart/pom.xml b/samples/java-valueentity-shopping-cart/pom.xml index f13201f25d..d6ff2e58a1 100644 --- a/samples/java-valueentity-shopping-cart/pom.xml +++ b/samples/java-valueentity-shopping-cart/pom.xml @@ -19,7 +19,7 @@ 11 UTF-8 - 0.10.6 + 0.10.6 2.1.2 @@ -235,9 +235,9 @@ - com.akkaserverless - akkaserverless-maven-plugin - ${akkaserverless-sdk.version} + io.kalix + kalix-maven-plugin + ${kalix-sdk.version} @@ -297,14 +297,14 @@ - com.akkaserverless + io.kalix kalix-java-sdk - ${akkaserverless-sdk.version} + ${kalix-sdk.version} - com.akkaserverless + io.kalix kalix-java-sdk-testkit - ${akkaserverless-sdk.version} + ${kalix-sdk.version} test diff --git a/samples/scala-customer-registry-quickstart/project/plugins.sbt b/samples/scala-customer-registry-quickstart/project/plugins.sbt index d81f0a6a05..c25941080d 100644 --- a/samples/scala-customer-registry-quickstart/project/plugins.sbt +++ b/samples/scala-customer-registry-quickstart/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.akkaserverless" % "sbt-kalix" % System.getProperty("akkaserverless-sdk.version", "0.10.6")) +addSbtPlugin("io.kalix" % "sbt-kalix" % System.getProperty("kalix-sdk.version", "0.10.6")) addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") diff --git a/samples/scala-doc-snippets/build.sbt b/samples/scala-doc-snippets/build.sbt index 46a7484c53..1121aee1c5 100644 --- a/samples/scala-doc-snippets/build.sbt +++ b/samples/scala-doc-snippets/build.sbt @@ -1,6 +1,6 @@ name := "doc-snippets" -organization := "com.akkaseverless.samples" +organization := "io.kalix.samples" organizationHomepage := Some(url("https://akkaserverless.com")) licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0"))) diff --git a/samples/scala-doc-snippets/project/plugins.sbt b/samples/scala-doc-snippets/project/plugins.sbt index d81f0a6a05..c25941080d 100644 --- a/samples/scala-doc-snippets/project/plugins.sbt +++ b/samples/scala-doc-snippets/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.akkaserverless" % "sbt-kalix" % System.getProperty("akkaserverless-sdk.version", "0.10.6")) +addSbtPlugin("io.kalix" % "sbt-kalix" % System.getProperty("kalix-sdk.version", "0.10.6")) addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") diff --git a/samples/scala-eventsourced-counter/build.sbt b/samples/scala-eventsourced-counter/build.sbt index b74d8bb113..cc1dcfba82 100644 --- a/samples/scala-eventsourced-counter/build.sbt +++ b/samples/scala-eventsourced-counter/build.sbt @@ -1,6 +1,6 @@ name := "eventsourcedentity-counter" -organization := "com.akkaseverless.samples" +organization := "io.kalix.samples" organizationHomepage := Some(url("https://akkaserverless.com")) licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0"))) diff --git a/samples/scala-eventsourced-counter/project/plugins.sbt b/samples/scala-eventsourced-counter/project/plugins.sbt index d81f0a6a05..c25941080d 100644 --- a/samples/scala-eventsourced-counter/project/plugins.sbt +++ b/samples/scala-eventsourced-counter/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.akkaserverless" % "sbt-kalix" % System.getProperty("akkaserverless-sdk.version", "0.10.6")) +addSbtPlugin("io.kalix" % "sbt-kalix" % System.getProperty("kalix-sdk.version", "0.10.6")) addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") diff --git a/samples/scala-eventsourced-customer-registry/build.sbt b/samples/scala-eventsourced-customer-registry/build.sbt index 786cca5566..1c1d07fc5a 100644 --- a/samples/scala-eventsourced-customer-registry/build.sbt +++ b/samples/scala-eventsourced-customer-registry/build.sbt @@ -1,6 +1,6 @@ name := "customer-registry" -organization := "com.akkaserverless.samples" +organization := "io.kalix.samples" organizationHomepage := Some(url("https://akkaserverless.com")) licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0"))) diff --git a/samples/scala-eventsourced-customer-registry/project/plugins.sbt b/samples/scala-eventsourced-customer-registry/project/plugins.sbt index d81f0a6a05..c25941080d 100644 --- a/samples/scala-eventsourced-customer-registry/project/plugins.sbt +++ b/samples/scala-eventsourced-customer-registry/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.akkaserverless" % "sbt-kalix" % System.getProperty("akkaserverless-sdk.version", "0.10.6")) +addSbtPlugin("io.kalix" % "sbt-kalix" % System.getProperty("kalix-sdk.version", "0.10.6")) addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") diff --git a/samples/scala-eventsourced-shopping-cart/build.sbt b/samples/scala-eventsourced-shopping-cart/build.sbt index 1d0f9f01a7..88bf9e0d8d 100644 --- a/samples/scala-eventsourced-shopping-cart/build.sbt +++ b/samples/scala-eventsourced-shopping-cart/build.sbt @@ -1,6 +1,6 @@ name := "eventsourced-shopping-cart" -organization := "com.akkaseverless.samples" +organization := "io.kalix.samples" organizationHomepage := Some(url("https://akkaserverless.com")) licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0"))) diff --git a/samples/scala-eventsourced-shopping-cart/project/plugins.sbt b/samples/scala-eventsourced-shopping-cart/project/plugins.sbt index d81f0a6a05..c25941080d 100644 --- a/samples/scala-eventsourced-shopping-cart/project/plugins.sbt +++ b/samples/scala-eventsourced-shopping-cart/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.akkaserverless" % "sbt-kalix" % System.getProperty("akkaserverless-sdk.version", "0.10.6")) +addSbtPlugin("io.kalix" % "sbt-kalix" % System.getProperty("kalix-sdk.version", "0.10.6")) addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") diff --git a/samples/scala-fibonacci-action/build.sbt b/samples/scala-fibonacci-action/build.sbt index ec759162c7..338bf396a3 100644 --- a/samples/scala-fibonacci-action/build.sbt +++ b/samples/scala-fibonacci-action/build.sbt @@ -1,6 +1,6 @@ name := "fibonacci-action" -organization := "com.akkaserverless.samples" +organization := "io.kalix.samples" organizationHomepage := Some(url("https://akkaserverless.com")) licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0"))) diff --git a/samples/scala-fibonacci-action/project/plugins.sbt b/samples/scala-fibonacci-action/project/plugins.sbt index d81f0a6a05..c25941080d 100644 --- a/samples/scala-fibonacci-action/project/plugins.sbt +++ b/samples/scala-fibonacci-action/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.akkaserverless" % "sbt-kalix" % System.getProperty("akkaserverless-sdk.version", "0.10.6")) +addSbtPlugin("io.kalix" % "sbt-kalix" % System.getProperty("kalix-sdk.version", "0.10.6")) addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") diff --git a/samples/scala-first-service/project/plugins.sbt b/samples/scala-first-service/project/plugins.sbt index d81f0a6a05..c25941080d 100644 --- a/samples/scala-first-service/project/plugins.sbt +++ b/samples/scala-first-service/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.akkaserverless" % "sbt-kalix" % System.getProperty("akkaserverless-sdk.version", "0.10.6")) +addSbtPlugin("io.kalix" % "sbt-kalix" % System.getProperty("kalix-sdk.version", "0.10.6")) addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") diff --git a/samples/scala-replicatedentity-examples/build.sbt b/samples/scala-replicatedentity-examples/build.sbt index ec3680a411..3910a73296 100644 --- a/samples/scala-replicatedentity-examples/build.sbt +++ b/samples/scala-replicatedentity-examples/build.sbt @@ -1,6 +1,6 @@ name := "replicatedentity-examples" -organization := "com.akkaseverless.samples" +organization := "io.kalix.samples" organizationHomepage := Some(url("https://akkaserverless.com")) licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0"))) diff --git a/samples/scala-replicatedentity-examples/project/plugins.sbt b/samples/scala-replicatedentity-examples/project/plugins.sbt index d81f0a6a05..c25941080d 100644 --- a/samples/scala-replicatedentity-examples/project/plugins.sbt +++ b/samples/scala-replicatedentity-examples/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.akkaserverless" % "sbt-kalix" % System.getProperty("akkaserverless-sdk.version", "0.10.6")) +addSbtPlugin("io.kalix" % "sbt-kalix" % System.getProperty("kalix-sdk.version", "0.10.6")) addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") diff --git a/samples/scala-replicatedentity-shopping-cart/build.sbt b/samples/scala-replicatedentity-shopping-cart/build.sbt index 4bd069867f..fa86153bac 100644 --- a/samples/scala-replicatedentity-shopping-cart/build.sbt +++ b/samples/scala-replicatedentity-shopping-cart/build.sbt @@ -1,6 +1,6 @@ name := "replicatedentity-shopping-cart" -organization := "com.akkaseverless.samples" +organization := "io.kalix.samples" organizationHomepage := Some(url("https://akkaserverless.com")) licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0"))) diff --git a/samples/scala-replicatedentity-shopping-cart/project/plugins.sbt b/samples/scala-replicatedentity-shopping-cart/project/plugins.sbt index d81f0a6a05..c25941080d 100644 --- a/samples/scala-replicatedentity-shopping-cart/project/plugins.sbt +++ b/samples/scala-replicatedentity-shopping-cart/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.akkaserverless" % "sbt-kalix" % System.getProperty("akkaserverless-sdk.version", "0.10.6")) +addSbtPlugin("io.kalix" % "sbt-kalix" % System.getProperty("kalix-sdk.version", "0.10.6")) addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") diff --git a/samples/scala-valueentity-counter/build.sbt b/samples/scala-valueentity-counter/build.sbt index 69f58e4442..ca20dea09e 100644 --- a/samples/scala-valueentity-counter/build.sbt +++ b/samples/scala-valueentity-counter/build.sbt @@ -1,6 +1,6 @@ name := "valueentity-counter" -organization := "com.akkaseverless.samples" +organization := "io.kalix.samples" organizationHomepage := Some(url("https://akkaserverless.com")) licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0"))) diff --git a/samples/scala-valueentity-counter/project/plugins.sbt b/samples/scala-valueentity-counter/project/plugins.sbt index d81f0a6a05..c25941080d 100644 --- a/samples/scala-valueentity-counter/project/plugins.sbt +++ b/samples/scala-valueentity-counter/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.akkaserverless" % "sbt-kalix" % System.getProperty("akkaserverless-sdk.version", "0.10.6")) +addSbtPlugin("io.kalix" % "sbt-kalix" % System.getProperty("kalix-sdk.version", "0.10.6")) addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") diff --git a/samples/scala-valueentity-customer-registry/build.sbt b/samples/scala-valueentity-customer-registry/build.sbt index de0112a308..67ebb0a183 100644 --- a/samples/scala-valueentity-customer-registry/build.sbt +++ b/samples/scala-valueentity-customer-registry/build.sbt @@ -1,6 +1,6 @@ name := "customer-registry" -organization := "com.akkaserverless.samples" +organization := "io.kalix.samples" organizationHomepage := Some(url("https://akkaserverless.com")) licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0"))) diff --git a/samples/scala-valueentity-customer-registry/project/plugins.sbt b/samples/scala-valueentity-customer-registry/project/plugins.sbt index d81f0a6a05..c25941080d 100644 --- a/samples/scala-valueentity-customer-registry/project/plugins.sbt +++ b/samples/scala-valueentity-customer-registry/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.akkaserverless" % "sbt-kalix" % System.getProperty("akkaserverless-sdk.version", "0.10.6")) +addSbtPlugin("io.kalix" % "sbt-kalix" % System.getProperty("kalix-sdk.version", "0.10.6")) addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") diff --git a/samples/scala-valueentity-shopping-cart/build.sbt b/samples/scala-valueentity-shopping-cart/build.sbt index 9b31a5044d..389b42cda2 100644 --- a/samples/scala-valueentity-shopping-cart/build.sbt +++ b/samples/scala-valueentity-shopping-cart/build.sbt @@ -1,6 +1,6 @@ name := "valueentity-shopping-cart" -organization := "com.akkaseverless.samples" +organization := "io.kalix.samples" organizationHomepage := Some(url("https://akkaserverless.com")) licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0"))) diff --git a/samples/scala-valueentity-shopping-cart/project/plugins.sbt b/samples/scala-valueentity-shopping-cart/project/plugins.sbt index d81f0a6a05..c25941080d 100644 --- a/samples/scala-valueentity-shopping-cart/project/plugins.sbt +++ b/samples/scala-valueentity-shopping-cart/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.akkaserverless" % "sbt-kalix" % System.getProperty("akkaserverless-sdk.version", "0.10.6")) +addSbtPlugin("io.kalix" % "sbt-kalix" % System.getProperty("kalix-sdk.version", "0.10.6")) addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") diff --git a/sbt-plugin/src/main/scala/kalix/sbt/KalixPlugin.scala b/sbt-plugin/src/main/scala/kalix/sbt/KalixPlugin.scala index a5f29a86a0..b4035ba0d6 100644 --- a/sbt-plugin/src/main/scala/kalix/sbt/KalixPlugin.scala +++ b/sbt-plugin/src/main/scala/kalix/sbt/KalixPlugin.scala @@ -56,7 +56,7 @@ object KalixPlugin extends AutoPlugin { libraryDependencies ++= Seq( "io.kalix" % "kalix-sdk-protocol" % KalixProtocolVersion % "protobuf-src", "com.google.protobuf" % "protobuf-java" % "3.17.3" % "protobuf", - "com.akkaserverless" %% "kalix-scala-sdk-testkit" % KalixSdkVersion % Test), + "io.kalix" %% "kalix-scala-sdk-testkit" % KalixSdkVersion % Test), Compile / PB.targets += gen( (akkaGrpcCodeGeneratorSettings.value :+ KalixGenerator.enableDebug) diff --git a/sbt-plugin/src/sbt-test/sbt-kalix/compile-only/project/plugins.sbt b/sbt-plugin/src/sbt-test/sbt-kalix/compile-only/project/plugins.sbt index 21d9b71906..c6b56a2eb3 100644 --- a/sbt-plugin/src/sbt-test/sbt-kalix/compile-only/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/sbt-kalix/compile-only/project/plugins.sbt @@ -1,6 +1,6 @@ sys.props.get("plugin.version") match { - case Some(x) => addSbtPlugin("com.akkaserverless" % "sbt-kalix" % x) + case Some(x) => addSbtPlugin("io.kalix" % "sbt-kalix" % x) case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.3") // FIXME should be included via sbt-akkaserverless \ No newline at end of file +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.3") // FIXME should be included via sbt-kalix \ No newline at end of file diff --git a/sbt-plugin/src/sbt-test/sbt-kalix/eventsourcedentity/project/plugins.sbt b/sbt-plugin/src/sbt-test/sbt-kalix/eventsourcedentity/project/plugins.sbt index 8880ca1538..eaf9c4abfd 100644 --- a/sbt-plugin/src/sbt-test/sbt-kalix/eventsourcedentity/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/sbt-kalix/eventsourcedentity/project/plugins.sbt @@ -1,6 +1,6 @@ sys.props.get("plugin.version") match { - case Some(x) => addSbtPlugin("com.akkaserverless" % "sbt-kalix" % x) + case Some(x) => addSbtPlugin("io.kalix" % "sbt-kalix" % x) case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.2") // FIXME should be included via sbt-akkaserverless \ No newline at end of file +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.2") // FIXME should be included via sbt-kalix \ No newline at end of file diff --git a/sbt-plugin/src/sbt-test/sbt-kalix/no-common-pkg-root/project/plugins.sbt b/sbt-plugin/src/sbt-test/sbt-kalix/no-common-pkg-root/project/plugins.sbt index 8880ca1538..eaf9c4abfd 100644 --- a/sbt-plugin/src/sbt-test/sbt-kalix/no-common-pkg-root/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/sbt-kalix/no-common-pkg-root/project/plugins.sbt @@ -1,6 +1,6 @@ sys.props.get("plugin.version") match { - case Some(x) => addSbtPlugin("com.akkaserverless" % "sbt-kalix" % x) + case Some(x) => addSbtPlugin("io.kalix" % "sbt-kalix" % x) case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.2") // FIXME should be included via sbt-akkaserverless \ No newline at end of file +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.2") // FIXME should be included via sbt-kalix \ No newline at end of file