This is an automated email from the ASF dual-hosted git repository.
tzulitai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/flink-statefun-playground.git
The following commit(s) were added to refs/heads/dev by this push:
new ebbf53e [release-3.0] Updating all examples for 3.0 release
ebbf53e is described below
commit ebbf53e9bdc0809dd4533c54096ea7dc2db8fb80
Author: Tzu-Li (Gordon) Tai <tzuli...@apache.org>
AuthorDate: Fri Apr 9 15:43:22 2021 +0800
[release-3.0] Updating all examples for 3.0 release
---
deployments/aws-lambda/pom.xml | 4 ++--
java/greeter/Dockerfile | 9 ---------
java/greeter/docker-compose.yml | 4 ++--
java/greeter/pom.xml | 4 ++--
java/greeter/statefun-sdk-java-3.0-SNAPSHOT.jar | Bin 1856788 -> 0 bytes
java/shopping-cart/Dockerfile | 11 +----------
java/shopping-cart/docker-compose.yml | 4 ++--
java/shopping-cart/pom.xml | 4 ++--
java/shopping-cart/statefun-sdk-java-3.0-SNAPSHOT.jar | Bin 1856788 -> 0 bytes
java/showcase/pom.xml | 4 ++--
.../serving/StatefulFunctionsRuntimeProcesses.java | 4 ++--
python/greeter/Dockerfile | 4 ----
python/greeter/docker-compose.yml | 4 ++--
python/greeter/lib-dev/README.md | 4 ----
...pache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl | Bin 32861 -> 0 bytes
python/greeter/requirements.txt | 2 +-
python/showcase/docker-compose.yml | 4 ++--
python/showcase/lib-dev/README.md | 4 ----
...pache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl | Bin 32861 -> 0 bytes
python/showcase/setup.py | 4 ++--
20 files changed, 22 insertions(+), 52 deletions(-)
diff --git a/deployments/aws-lambda/pom.xml b/deployments/aws-lambda/pom.xml
index 82228b7..63d9f6a 100644
--- a/deployments/aws-lambda/pom.xml
+++ b/deployments/aws-lambda/pom.xml
@@ -22,11 +22,11 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>aws-lambda-example</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0.0</version>
<packaging>jar</packaging>
<properties>
- <statefun.version>3.0-SNAPSHOT</statefun.version>
+ <statefun.version>3.0.0</statefun.version>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
diff --git a/java/greeter/Dockerfile b/java/greeter/Dockerfile
index f87ea11..4049186 100644
--- a/java/greeter/Dockerfile
+++ b/java/greeter/Dockerfile
@@ -17,15 +17,6 @@
FROM maven:3.6.3-jdk-11 AS builder
COPY src /usr/src/app/src
COPY pom.xml /usr/src/app
-# TODO remove these commented lines and the jar; this is needed now only
because we don't have the latest Java SDK published to Maven central yet
-COPY statefun-sdk-java-3.0-SNAPSHOT.jar /usr/src/app
-RUN mvn install:install-file \
- -Dfile=/usr/src/app/statefun-sdk-java-3.0-SNAPSHOT.jar \
- -DgroupId=org.apache.flink \
- -DartifactId=statefun-sdk-java \
- -Dversion=3.0-SNAPSHOT \
- -Dpackaging=jar \
- -DgeneratePom=true
RUN mvn -f /usr/src/app/pom.xml clean package
# ... and run the web server!
diff --git a/java/greeter/docker-compose.yml b/java/greeter/docker-compose.yml
index 22b2dd3..77555c5 100644
--- a/java/greeter/docker-compose.yml
+++ b/java/greeter/docker-compose.yml
@@ -35,7 +35,7 @@ services:
###############################################################
statefun-manager:
- image: flink-statefun:3.0-SNAPSHOT
+ image: apache/flink-statefun:3.0.0-java11
expose:
- "6123"
ports:
@@ -47,7 +47,7 @@ services:
- ./module.yaml:/opt/statefun/modules/greeter/module.yaml
statefun-worker:
- image: flink-statefun:3.0-SNAPSHOT
+ image: apache/flink-statefun:3.0.0-java11
expose:
- "6121"
- "6122"
diff --git a/java/greeter/pom.xml b/java/greeter/pom.xml
index 89f7616..6ad0e01 100644
--- a/java/greeter/pom.xml
+++ b/java/greeter/pom.xml
@@ -22,11 +22,11 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>greeter-functions-app</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0.0</version>
<packaging>jar</packaging>
<properties>
- <statefun.version>3.0-SNAPSHOT</statefun.version>
+ <statefun.version>3.0.0</statefun.version>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
diff --git a/java/greeter/statefun-sdk-java-3.0-SNAPSHOT.jar
b/java/greeter/statefun-sdk-java-3.0-SNAPSHOT.jar
deleted file mode 100644
index 47f65ac..0000000
Binary files a/java/greeter/statefun-sdk-java-3.0-SNAPSHOT.jar and /dev/null
differ
diff --git a/java/shopping-cart/Dockerfile b/java/shopping-cart/Dockerfile
index 61b8684..2e3864f 100644
--- a/java/shopping-cart/Dockerfile
+++ b/java/shopping-cart/Dockerfile
@@ -15,15 +15,6 @@
# Build the functions code ...
FROM maven:3.6.3-jdk-11 AS builder
-# TODO remove these commented lines and the jar; this is needed now only
because we don't have the latest Java SDK published to Maven central yet
-COPY statefun-sdk-java-3.0-SNAPSHOT.jar /usr/src/app/
-RUN mvn install:install-file \
- -Dfile=/usr/src/app/statefun-sdk-java-3.0-SNAPSHOT.jar \
- -DgroupId=org.apache.flink \
- -DartifactId=statefun-sdk-java \
- -Dversion=3.0-SNAPSHOT \
- -Dpackaging=jar \
- -DgeneratePom=true
COPY pom.xml /usr/src/app/
# Build dependencies and cache this layer
RUN mvn -f /usr/src/app dependency:go-offline package -B
@@ -35,4 +26,4 @@ FROM openjdk:8
WORKDIR /
COPY --from=builder
/usr/src/app/target/shopping-cart*jar-with-dependencies.jar shopping-cart.jar
EXPOSE 1108
-CMD java -jar shopping-cart.jar
\ No newline at end of file
+CMD java -jar shopping-cart.jar
diff --git a/java/shopping-cart/docker-compose.yml
b/java/shopping-cart/docker-compose.yml
index 7b039f6..0deba9c 100644
--- a/java/shopping-cart/docker-compose.yml
+++ b/java/shopping-cart/docker-compose.yml
@@ -35,7 +35,7 @@ services:
###############################################################
statefun-manager:
- image: flink-statefun:3.0-SNAPSHOT
+ image: apache/flink-statefun:3.0.0
expose:
- "6123"
ports:
@@ -47,7 +47,7 @@ services:
- ./module.yaml:/opt/statefun/modules/shopping-cart/module.yaml
statefun-worker:
- image: flink-statefun:3.0-SNAPSHOT
+ image: apache/flink-statefun:3.0.0
expose:
- "6121"
- "6122"
diff --git a/java/shopping-cart/pom.xml b/java/shopping-cart/pom.xml
index be316f5..a5a51ad 100644
--- a/java/shopping-cart/pom.xml
+++ b/java/shopping-cart/pom.xml
@@ -22,11 +22,11 @@ under the License.
<artifactId>shopping-cart</artifactId>
<groupId>org.apache.flink</groupId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0.0</version>
<packaging>jar</packaging>
<properties>
- <statefun.version>3.0-SNAPSHOT</statefun.version>
+ <statefun.version>3.0.0</statefun.version>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<untertow.version>1.4.18.Final</untertow.version>
diff --git a/java/shopping-cart/statefun-sdk-java-3.0-SNAPSHOT.jar
b/java/shopping-cart/statefun-sdk-java-3.0-SNAPSHOT.jar
deleted file mode 100644
index 47f65ac..0000000
Binary files a/java/shopping-cart/statefun-sdk-java-3.0-SNAPSHOT.jar and
/dev/null differ
diff --git a/java/showcase/pom.xml b/java/showcase/pom.xml
index 55d17bd..c175c25 100644
--- a/java/showcase/pom.xml
+++ b/java/showcase/pom.xml
@@ -22,11 +22,11 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>statefun-java-showcase</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0.0</version>
<packaging>jar</packaging>
<properties>
- <statefun.version>3.0-SNAPSHOT</statefun.version>
+ <statefun.version>3.0.0</statefun.version>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
diff --git
a/java/showcase/src/main/java/org/apache/flink/statefun/playground/java/showcase/part6/serving/StatefulFunctionsRuntimeProcesses.java
b/java/showcase/src/main/java/org/apache/flink/statefun/playground/java/showcase/part6/serving/StatefulFunctionsRuntimeProcesses.java
index 993fc66..efc12c5 100644
---
a/java/showcase/src/main/java/org/apache/flink/statefun/playground/java/showcase/part6/serving/StatefulFunctionsRuntimeProcesses.java
+++
b/java/showcase/src/main/java/org/apache/flink/statefun/playground/java/showcase/part6/serving/StatefulFunctionsRuntimeProcesses.java
@@ -86,7 +86,7 @@ public final class StatefulFunctionsRuntimeProcesses {
}
private static GenericContainer<?> managerContainer(Network network) {
- return new
GenericContainer<>(DockerImageName.parse("flink-statefun:3.0-SNAPSHOT"))
+ return new
GenericContainer<>(DockerImageName.parse("apache/flink-statefun:3.0.0"))
.withNetwork(network)
.withNetworkAliases("statefun-manager")
.withEnv("ROLE", "master")
@@ -98,7 +98,7 @@ public final class StatefulFunctionsRuntimeProcesses {
}
private static GenericContainer<?> workerContainer(Network network) {
- return new
GenericContainer<>(DockerImageName.parse("flink-statefun:3.0-SNAPSHOT"))
+ return new
GenericContainer<>(DockerImageName.parse("apache/flink-statefun:3.0.0"))
.withNetwork(network)
.withNetworkAliases("statefun-worker")
.withEnv("ROLE", "worker")
diff --git a/python/greeter/Dockerfile b/python/greeter/Dockerfile
index ef5e756..8381737 100644
--- a/python/greeter/Dockerfile
+++ b/python/greeter/Dockerfile
@@ -26,9 +26,5 @@ COPY functions.py /app
EXPOSE 8000
-# TODO: remove the following 2 lines, once apache_filink_statefun-3.0.0 will
be released.
-ADD lib-dev/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl /app
-RUN pip3 install /app/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl
-
CMD ["python3", "/app/functions.py"]
diff --git a/python/greeter/docker-compose.yml
b/python/greeter/docker-compose.yml
index 8ab1daa..6ccf879 100644
--- a/python/greeter/docker-compose.yml
+++ b/python/greeter/docker-compose.yml
@@ -34,7 +34,7 @@ services:
###############################################################
statefun-manager:
- image: flink-statefun:3.0-SNAPSHOT
+ image: apache/flink-statefun:3.0.0
expose:
- "6123"
ports:
@@ -46,7 +46,7 @@ services:
- ./module.yaml:/opt/statefun/modules/greeter/module.yaml
statefun-worker:
- image: flink-statefun:3.0-SNAPSHOT
+ image: apache/flink-statefun:3.0.0
expose:
- "6121"
- "6122"
diff --git a/python/greeter/lib-dev/README.md b/python/greeter/lib-dev/README.md
deleted file mode 100644
index f7905bd..0000000
--- a/python/greeter/lib-dev/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Unreleased artifacts
-
-This directory contains unreleased artifacts.
-TODO: remove this once merging `dev` to `main`.
diff --git
a/python/greeter/lib-dev/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl
b/python/greeter/lib-dev/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl
deleted file mode 100644
index cf08fd2..0000000
Binary files
a/python/greeter/lib-dev/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl
and /dev/null differ
diff --git a/python/greeter/requirements.txt b/python/greeter/requirements.txt
index 0796d9b..0c22eb6 100644
--- a/python/greeter/requirements.txt
+++ b/python/greeter/requirements.txt
@@ -15,4 +15,4 @@
# limitations under the License.
aiohttp
-apache-flink-statefun
+apache-flink-statefun==3.0.0
diff --git a/python/showcase/docker-compose.yml
b/python/showcase/docker-compose.yml
index f3eff06..276b62e 100644
--- a/python/showcase/docker-compose.yml
+++ b/python/showcase/docker-compose.yml
@@ -24,7 +24,7 @@ services:
###############################################################
statefun-manager:
- image: flink-statefun:3.0-SNAPSHOT
+ image: apache/flink-statefun:3.0.0
expose:
- "6123"
ports:
@@ -36,7 +36,7 @@ services:
- ./module.yaml:/opt/statefun/modules/greeter/module.yaml
statefun-worker:
- image: flink-statefun:3.0-SNAPSHOT
+ image: apache/flink-statefun:3.0.0
expose:
- "6121"
- "6122"
diff --git a/python/showcase/lib-dev/README.md
b/python/showcase/lib-dev/README.md
deleted file mode 100644
index f7905bd..0000000
--- a/python/showcase/lib-dev/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Unreleased artifacts
-
-This directory contains unreleased artifacts.
-TODO: remove this once merging `dev` to `main`.
diff --git
a/python/showcase/lib-dev/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl
b/python/showcase/lib-dev/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl
deleted file mode 100644
index 9ceb7dc..0000000
Binary files
a/python/showcase/lib-dev/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl
and /dev/null differ
diff --git a/python/showcase/setup.py b/python/showcase/setup.py
index 3e7af39..af36e68 100644
--- a/python/showcase/setup.py
+++ b/python/showcase/setup.py
@@ -27,7 +27,7 @@ with io.open(os.path.join(this_directory, 'README.md'), 'r',
encoding='utf-8') a
setup(
name='showcase',
- version='2.3-SNAPSHOT',
+ version='3.0.0',
packages=["showcase"],
url='https://github.com/apache/flink-statefun-playground',
license='https://www.apache.org/licenses/LICENSE-2.0',
@@ -38,7 +38,7 @@ setup(
long_description=long_description,
long_description_content_type='text/markdown',
install_requires=['protobuf>=3.11.3,<4.0.0',
- 'apache-flink-statefun',
+ 'apache-flink-statefun==3.0.0',
'aiohttp'],
tests_require=['pytest'],
python_requires='>=3.8',
