Skip to content

Commit

Permalink
rename: change group id and maven artifacts (#875)
Browse files Browse the repository at this point in the history
* rename: change groupId and maven artifacts names

* and the scala samples as well

* fix plugin deps

* more referneces to io.kalix in samples
  • Loading branch information
octonato authored Mar 30, 2022
1 parent 22d7cd0 commit 170d6ba
Show file tree
Hide file tree
Showing 79 changed files with 329 additions and 328 deletions.
154 changes: 77 additions & 77 deletions .circleci/config.yml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions maven-java/README.md
Original file line number Diff line number Diff line change
@@ -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).
Original file line number Diff line number Diff line change
@@ -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
```

Expand All @@ -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
```
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<artifactId>akkaserverless-maven-archetype</artifactId>
<artifactId>kalix-maven-archetype-event-sourced-entity</artifactId>
<version>0.10.6</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>com.akkaserverless</groupId>
<artifactId>akkaserverless-maven-java</artifactId>
<groupId>io.kalix</groupId>
<artifactId>kalix-maven-java</artifactId>
<version>0.10.6</version>
</parent>

<name>Akka Serverless Maven Archetype (Value entity)</name>
<description>This archetype can be used to generate a project suitable for the general development of Akka Serverless applications</description>
<name>Kalix Maven Archetype (Event Sourced entity)</name>
<description>This archetype can be used to generate a project suitable for the general development of Kalix applications</description>
<url>https://www.lightbend.com/akka-serverless</url>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:

```
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<jdk.target>11</jdk.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<akkaserverless-sdk.version>@project.version@</akkaserverless-sdk.version>
<kalix-sdk.version>@project.version@</kalix-sdk.version>
<akka-grpc.version>2.1.2</akka-grpc.version>
</properties>

Expand Down Expand Up @@ -234,9 +234,9 @@
</plugin>

<plugin>
<groupId>com.akkaserverless</groupId>
<artifactId>akkaserverless-maven-plugin</artifactId>
<version>${D}{akkaserverless-sdk.version}</version>
<groupId>io.kalix</groupId>
<artifactId>kalix-maven-plugin</artifactId>
<version>${D}{kalix-sdk.version}</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -296,14 +296,14 @@

<dependencies>
<dependency>
<groupId>com.akkaserverless</groupId>
<groupId>io.kalix</groupId>
<artifactId>kalix-java-sdk</artifactId>
<version>${D}{akkaserverless-sdk.version}</version>
<version>${D}{kalix-sdk.version}</version>
</dependency>
<dependency>
<groupId>com.akkaserverless</groupId>
<groupId>io.kalix</groupId>
<artifactId>kalix-java-sdk-testkit</artifactId>
<version>${D}{akkaserverless-sdk.version}</version>
<version>${D}{kalix-sdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
```

Expand All @@ -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
```
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<artifactId>akkaserverless-maven-archetype-event-sourced-entity</artifactId>
<artifactId>kalix-maven-archetype</artifactId>
<version>0.10.6</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>com.akkaserverless</groupId>
<artifactId>akkaserverless-maven-java</artifactId>
<groupId>io.kalix</groupId>
<artifactId>kalix-maven-java</artifactId>
<version>0.10.6</version>
</parent>

<name>Akka Serverless Maven Archetype (Event Sourced entity)</name>
<description>This archetype can be used to generate a project suitable for the general development of Akka Serverless applications</description>
<name>Kalix Maven Archetype (Value entity)</name>
<description>This archetype can be used to generate a project suitable for the general development of Kalix applications</description>
<url>https://www.lightbend.com/akka-serverless</url>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:

```
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<jdk.target>11</jdk.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<akkaserverless-sdk.version>@project.version@</akkaserverless-sdk.version>
<kalix-sdk.version>@project.version@</kalix-sdk.version>
<akka-grpc.version>2.1.2</akka-grpc.version>
</properties>

Expand Down Expand Up @@ -234,9 +234,9 @@
</plugin>

<plugin>
<groupId>com.akkaserverless</groupId>
<artifactId>akkaserverless-maven-plugin</artifactId>
<version>${D}{akkaserverless-sdk.version}</version>
<groupId>io.kalix</groupId>
<artifactId>kalix-maven-plugin</artifactId>
<version>${D}{kalix-sdk.version}</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -296,14 +296,14 @@

<dependencies>
<dependency>
<groupId>com.akkaserverless</groupId>
<groupId>io.kalix</groupId>
<artifactId>kalix-java-sdk</artifactId>
<version>${D}{akkaserverless-sdk.version}</version>
<version>${D}{kalix-sdk.version}</version>
</dependency>
<dependency>
<groupId>com.akkaserverless</groupId>
<groupId>io.kalix</groupId>
<artifactId>kalix-java-sdk-testkit</artifactId>
<version>${D}{akkaserverless-sdk.version}</version>
<version>${D}{kalix-sdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -15,7 +15,7 @@ To use the plugin (substitute the version accordingly):
```xml
<plugin>
<groupId>com.lightbend</groupId>
<artifactId>akkaserverless-maven-plugin</artifactId>
<artifactId>kalix-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<executions>
<execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.akkaserverless</groupId>
<artifactId>akkaserverless-maven-plugin</artifactId>
<groupId>io.kalix</groupId>
<artifactId>kalix-maven-plugin</artifactId>
<version>0.10.6</version>
<packaging>maven-plugin</packaging>
<parent>
<groupId>com.akkaserverless</groupId>
<artifactId>akkaserverless-maven-java</artifactId>
<groupId>io.kalix</groupId>
<artifactId>kalix-maven-java</artifactId>
<version>0.10.6</version>
</parent>

<name>Akka Serverless Maven Plugin</name>
<name>Kalix Maven Plugin</name>

<dependencies>
<dependency>
Expand Down Expand Up @@ -62,7 +62,7 @@

<!-- Plugin-specific dependencies -->
<dependency>
<groupId>com.akkaserverless</groupId>
<groupId>io.kalix</groupId>
<artifactId>kalix-codegen-java_2.12</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
Expand All @@ -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<String> 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();
Expand All @@ -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);
Expand Down
Loading

0 comments on commit 170d6ba

Please sign in to comment.