You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tz...@apache.org on 2021/02/25 05:13:18 UTC
[flink-statefun] branch master updated (ed73ce7 -> 0dab43a)
This is an automated email from the ASF dual-hosted git repository.
tzulitai pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink-statefun.git.
from ed73ce7 [FLINK-21491] [sdk] Depend on statefun-protocol-shaded in Java SDK
new ec762a7 [FLINK-21496] [e2e] Upgrade Testcontainers to 1.15.2
new 0dab43a [hotfix] [e2e] Re-enable E2E tests in CI
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/java8-build.yml | 2 +-
statefun-e2e-tests/pom.xml | 4 ++++
statefun-e2e-tests/statefun-e2e-tests-common/pom.xml | 15 ++++++++++++++-
.../statefun-exactly-once-remote-e2e/pom.xml | 1 -
statefun-e2e-tests/statefun-sanity-e2e/pom.xml | 4 ----
statefun-e2e-tests/statefun-smoke-e2e/pom.xml | 8 +++++++-
6 files changed, 26 insertions(+), 8 deletions(-)
[flink-statefun] 02/02: [hotfix] [e2e] Re-enable E2E tests in CI
Posted by tz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tzulitai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-statefun.git
commit 0dab43a81a02603f3aa0a748272473199b536efd
Author: Tzu-Li (Gordon) Tai <tz...@apache.org>
AuthorDate: Thu Feb 25 13:12:28 2021 +0800
[hotfix] [e2e] Re-enable E2E tests in CI
---
.github/workflows/java8-build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/java8-build.yml b/.github/workflows/java8-build.yml
index 563ae8e..3cf9fc2 100644
--- a/.github/workflows/java8-build.yml
+++ b/.github/workflows/java8-build.yml
@@ -13,4 +13,4 @@ jobs:
with:
java-version: 1.8
- name: Build
- run: mvn clean install
\ No newline at end of file
+ run: mvn clean install -Prun-e2e-tests
[flink-statefun] 01/02: [FLINK-21496] [e2e] Upgrade Testcontainers
to 1.15.2
Posted by tz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tzulitai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-statefun.git
commit ec762a7413c3f94470ee13d57edc47350feb1569
Author: Tzu-Li (Gordon) Tai <tz...@apache.org>
AuthorDate: Thu Feb 25 13:11:37 2021 +0800
[FLINK-21496] [e2e] Upgrade Testcontainers to 1.15.2
---
statefun-e2e-tests/pom.xml | 4 ++++
statefun-e2e-tests/statefun-e2e-tests-common/pom.xml | 15 ++++++++++++++-
.../statefun-exactly-once-remote-e2e/pom.xml | 1 -
statefun-e2e-tests/statefun-sanity-e2e/pom.xml | 4 ----
statefun-e2e-tests/statefun-smoke-e2e/pom.xml | 8 +++++++-
5 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/statefun-e2e-tests/pom.xml b/statefun-e2e-tests/pom.xml
index e38a954..94a8994 100644
--- a/statefun-e2e-tests/pom.xml
+++ b/statefun-e2e-tests/pom.xml
@@ -28,6 +28,10 @@ under the License.
<artifactId>statefun-e2e-tests</artifactId>
<packaging>pom</packaging>
+ <properties>
+ <testcontainers.version>1.15.2</testcontainers.version>
+ </properties>
+
<modules>
<module>statefun-e2e-tests-common</module>
<module>statefun-sanity-e2e</module>
diff --git a/statefun-e2e-tests/statefun-e2e-tests-common/pom.xml b/statefun-e2e-tests/statefun-e2e-tests-common/pom.xml
index 3fed811..5510f92 100644
--- a/statefun-e2e-tests/statefun-e2e-tests-common/pom.xml
+++ b/statefun-e2e-tests/statefun-e2e-tests-common/pom.xml
@@ -28,7 +28,6 @@ under the License.
<artifactId>statefun-e2e-tests-common</artifactId>
<properties>
- <testcontainers.version>1.12.5</testcontainers.version>
<kafka.version>2.4.1</kafka.version>
</properties>
@@ -67,10 +66,24 @@ under the License.
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-common</artifactId>
</exclusion>
+ <!--
+ This dependency leads to a version convergence error caused solely by Testcontainers.
+ See https://github.com/testcontainers/testcontainers-java/issues/3308.
+ -->
+ <exclusion>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>5.5.0</version>
+ </dependency>
+
+ <dependency>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-common</artifactId>
<version>${unixsocket.version}</version>
diff --git a/statefun-e2e-tests/statefun-exactly-once-remote-e2e/pom.xml b/statefun-e2e-tests/statefun-exactly-once-remote-e2e/pom.xml
index f8b4dcf..0909b16 100644
--- a/statefun-e2e-tests/statefun-exactly-once-remote-e2e/pom.xml
+++ b/statefun-e2e-tests/statefun-exactly-once-remote-e2e/pom.xml
@@ -28,7 +28,6 @@ under the License.
<artifactId>statefun-exactly-once-remote-e2e</artifactId>
<properties>
- <testcontainers.version>1.12.5</testcontainers.version>
<kafka.version>2.2.0</kafka.version>
</properties>
diff --git a/statefun-e2e-tests/statefun-sanity-e2e/pom.xml b/statefun-e2e-tests/statefun-sanity-e2e/pom.xml
index f2ac99a..02f1486 100644
--- a/statefun-e2e-tests/statefun-sanity-e2e/pom.xml
+++ b/statefun-e2e-tests/statefun-sanity-e2e/pom.xml
@@ -27,10 +27,6 @@ under the License.
<artifactId>statefun-sanity-e2e</artifactId>
- <properties>
- <testcontainers.version>1.12.5</testcontainers.version>
- </properties>
-
<dependencies>
<!-- Stateful Functions -->
<dependency>
diff --git a/statefun-e2e-tests/statefun-smoke-e2e/pom.xml b/statefun-e2e-tests/statefun-smoke-e2e/pom.xml
index 26318c2..126cf5c 100644
--- a/statefun-e2e-tests/statefun-smoke-e2e/pom.xml
+++ b/statefun-e2e-tests/statefun-smoke-e2e/pom.xml
@@ -28,7 +28,6 @@ under the License.
<artifactId>statefun-smoke-e2e</artifactId>
<properties>
- <testcontainers.version>1.12.5</testcontainers.version>
<commons-math3.version>3.5</commons-math3.version>
<additional-sources.dir>target/additional-sources</additional-sources.dir>
</properties>
@@ -133,6 +132,13 @@ under the License.
<artifactId>statefun-flink-harness</artifactId>
<version>${project.version}</version>
<scope>test</scope>
+ <exclusions>
+ <!-- conflicts with testcontainers -->
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>