diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml index a59a644725..1b2f9e2db7 100644 --- a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml +++ b/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml index a59a644725..1b2f9e2db7 100644 --- a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml +++ b/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 82ed8b5359..0395c2e247 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,7 +5,7 @@ object Dependencies { object Kalix { val ProtocolVersionMajor = 0 val ProtocolVersionMinor = 10 - val FrameworkVersion = "0.10.0-M3" + val FrameworkVersion = "0.10.0-M4" } // changing the Scala version of the Java SDK affects end users @@ -31,9 +31,9 @@ object Dependencies { val MunitVersion = "0.7.20" val ScoptVersions = "4.0.0" - val akkaslsProxyProtocol = "com.akkaserverless" % "kalix-proxy-protocol" % Kalix.FrameworkVersion - val akkaslsSdkProtocol = "com.akkaserverless" % "kalix-sdk-protocol" % Kalix.FrameworkVersion - val akkaslsTckProtocol = "com.akkaserverless" % "kalix-tck-protocol" % Kalix.FrameworkVersion + val akkaslsProxyProtocol = "io.kalix" % "kalix-proxy-protocol" % Kalix.FrameworkVersion + val akkaslsSdkProtocol = "io.kalix" % "kalix-sdk-protocol" % Kalix.FrameworkVersion + val akkaslsTckProtocol = "io.kalix" % "kalix-tck-protocol" % Kalix.FrameworkVersion val commonsIo = "commons-io" % "commons-io" % CommonsIoVerison val logback = "ch.qos.logback" % "logback-classic" % LogbackVersion diff --git a/samples/java-customer-registry-kafka-quickstart/docker-compose.yml b/samples/java-customer-registry-kafka-quickstart/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-customer-registry-kafka-quickstart/docker-compose.yml +++ b/samples/java-customer-registry-kafka-quickstart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/java-customer-registry-kafka-quickstart/kafka/docker-compose.yml b/samples/java-customer-registry-kafka-quickstart/kafka/docker-compose.yml index 6bb900297b..869136356a 100644 --- a/samples/java-customer-registry-kafka-quickstart/kafka/docker-compose.yml +++ b/samples/java-customer-registry-kafka-quickstart/kafka/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=kafka ports: - "9000:9000" diff --git a/samples/java-customer-registry-quickstart/docker-compose.yml b/samples/java-customer-registry-quickstart/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-customer-registry-quickstart/docker-compose.yml +++ b/samples/java-customer-registry-quickstart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/java-customer-registry-views-quickstart/docker-compose.yml b/samples/java-customer-registry-views-quickstart/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-customer-registry-views-quickstart/docker-compose.yml +++ b/samples/java-customer-registry-views-quickstart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/java-eventsourced-counter/docker-compose.yml b/samples/java-eventsourced-counter/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-eventsourced-counter/docker-compose.yml +++ b/samples/java-eventsourced-counter/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/java-eventsourced-shopping-cart/docker-compose.yml b/samples/java-eventsourced-shopping-cart/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-eventsourced-shopping-cart/docker-compose.yml +++ b/samples/java-eventsourced-shopping-cart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/java-fibonacci-action/docker-compose.yml b/samples/java-fibonacci-action/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-fibonacci-action/docker-compose.yml +++ b/samples/java-fibonacci-action/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/java-first-service/docker-compose.yml b/samples/java-first-service/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-first-service/docker-compose.yml +++ b/samples/java-first-service/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/java-replicatedentity-examples/docker-compose.yml b/samples/java-replicatedentity-examples/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-replicatedentity-examples/docker-compose.yml +++ b/samples/java-replicatedentity-examples/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/java-replicatedentity-shopping-cart/docker-compose.yml b/samples/java-replicatedentity-shopping-cart/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-replicatedentity-shopping-cart/docker-compose.yml +++ b/samples/java-replicatedentity-shopping-cart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/java-shopping-cart-quickstart/docker-compose.yml b/samples/java-shopping-cart-quickstart/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-shopping-cart-quickstart/docker-compose.yml +++ b/samples/java-shopping-cart-quickstart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/java-valueentity-counter/docker-compose.yml b/samples/java-valueentity-counter/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-valueentity-counter/docker-compose.yml +++ b/samples/java-valueentity-counter/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/java-valueentity-customer-registry/docker-compose.yml b/samples/java-valueentity-customer-registry/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-valueentity-customer-registry/docker-compose.yml +++ b/samples/java-valueentity-customer-registry/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/java-valueentity-shopping-cart/docker-compose.yml b/samples/java-valueentity-shopping-cart/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/java-valueentity-shopping-cart/docker-compose.yml +++ b/samples/java-valueentity-shopping-cart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/scala-customer-registry-quickstart/docker-compose.yml b/samples/scala-customer-registry-quickstart/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/scala-customer-registry-quickstart/docker-compose.yml +++ b/samples/scala-customer-registry-quickstart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/scala-eventsourced-counter/docker-compose.yml b/samples/scala-eventsourced-counter/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/scala-eventsourced-counter/docker-compose.yml +++ b/samples/scala-eventsourced-counter/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/scala-eventsourced-customer-registry/docker-compose.yml b/samples/scala-eventsourced-customer-registry/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/scala-eventsourced-customer-registry/docker-compose.yml +++ b/samples/scala-eventsourced-customer-registry/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/scala-eventsourced-shopping-cart/docker-compose.yml b/samples/scala-eventsourced-shopping-cart/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/scala-eventsourced-shopping-cart/docker-compose.yml +++ b/samples/scala-eventsourced-shopping-cart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/scala-fibonacci-action/docker-compose.yml b/samples/scala-fibonacci-action/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/scala-fibonacci-action/docker-compose.yml +++ b/samples/scala-fibonacci-action/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/scala-first-service/docker-compose.yml b/samples/scala-first-service/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/scala-first-service/docker-compose.yml +++ b/samples/scala-first-service/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/scala-replicatedentity-examples/docker-compose.yml b/samples/scala-replicatedentity-examples/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/scala-replicatedentity-examples/docker-compose.yml +++ b/samples/scala-replicatedentity-examples/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/scala-replicatedentity-shopping-cart/docker-compose.yml b/samples/scala-replicatedentity-shopping-cart/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/scala-replicatedentity-shopping-cart/docker-compose.yml +++ b/samples/scala-replicatedentity-shopping-cart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/scala-valueentity-counter/docker-compose.yml b/samples/scala-valueentity-counter/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/scala-valueentity-counter/docker-compose.yml +++ b/samples/scala-valueentity-counter/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/scala-valueentity-customer-registry/docker-compose.yml b/samples/scala-valueentity-customer-registry/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/scala-valueentity-customer-registry/docker-compose.yml +++ b/samples/scala-valueentity-customer-registry/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/scala-valueentity-shopping-cart/docker-compose.yml b/samples/scala-valueentity-shopping-cart/docker-compose.yml index e84b16c7df..10658d472c 100644 --- a/samples/scala-valueentity-shopping-cart/docker-compose.yml +++ b/samples/scala-valueentity-shopping-cart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: akka-serverless-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3 + image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/sbt-plugin/src/main/scala/kalix/sbt/KalixPlugin.scala b/sbt-plugin/src/main/scala/kalix/sbt/KalixPlugin.scala index f153c53151..a5f29a86a0 100644 --- a/sbt-plugin/src/main/scala/kalix/sbt/KalixPlugin.scala +++ b/sbt-plugin/src/main/scala/kalix/sbt/KalixPlugin.scala @@ -54,7 +54,7 @@ object KalixPlugin extends AutoPlugin { override def projectSettings: Seq[sbt.Setting[_]] = Seq( libraryDependencies ++= Seq( - "com.akkaserverless" % "kalix-sdk-protocol" % KalixProtocolVersion % "protobuf-src", + "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), Compile / PB.targets +=