This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch v3.0
in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git
The following commit(s) were added to refs/heads/v3.0 by this push:
new 48d1bce [FLINK-31698][BP] Support both Flink 1.16 and Flink 1.17 to
resolve failing nightly builds (#9)
48d1bce is described below
commit 48d1bcefa2f2d4d6342c681562c0656fe6ebe1a5
Author: MartijnVisser <[email protected]>
AuthorDate: Thu Apr 13 12:08:11 2023 +0200
[FLINK-31698][BP] Support both Flink 1.16 and Flink 1.17 to resolve failing
nightly builds (#9)
---
.github/workflows/push_pr.yml | 5 ++++-
flink-connector-cassandra/pom.xml | 17 +++++++++++++++--
.../src/test/resources/archunit.properties | 3 +++
pom.xml | 4 ++--
4 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index a807be7..0542242 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -23,6 +23,9 @@ concurrency:
cancel-in-progress: true
jobs:
compile_and_test:
+ strategy:
+ matrix:
+ flink: [1.16.1, 1.17.0]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
- flink_version: 1.16.1
+ flink_version: ${{ matrix.flink }}
diff --git a/flink-connector-cassandra/pom.xml
b/flink-connector-cassandra/pom.xml
index 0373ace..34dda81 100644
--- a/flink-connector-cassandra/pom.xml
+++ b/flink-connector-cassandra/pom.xml
@@ -43,9 +43,9 @@ under the License.
<log4j.version>2.17.1</log4j.version>
<junit5.version>5.8.1</junit5.version>
<assertj.version>3.23.1</assertj.version>
- <archunit.version>0.22.0</archunit.version>
+ <archunit.version>1.0.0</archunit.version>
<testcontainers.version>1.17.2</testcontainers.version>
- <mockito.version>2.21.0</mockito.version>
+ <mockito.version>3.4.6</mockito.version>
<byte-buddy.version>1.12.10</byte-buddy.version>
<findbugs.version>1.3.9</findbugs.version>
@@ -176,6 +176,11 @@ under the License.
</dependency>
<!-- Test dependencies -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.assertj</groupId>
@@ -290,6 +295,14 @@ under the License.
<dependencyManagement>
<dependencies>
<!-- For dependency convergence -->
+ <dependency>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ <version>${junit5.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
diff --git a/flink-connector-cassandra/src/test/resources/archunit.properties
b/flink-connector-cassandra/src/test/resources/archunit.properties
index 15be88c..bcd0408 100644
--- a/flink-connector-cassandra/src/test/resources/archunit.properties
+++ b/flink-connector-cassandra/src/test/resources/archunit.properties
@@ -29,3 +29,6 @@ freeze.store.default.allowStoreUpdate=true
#freeze.refreeze=true
freeze.store.default.path=archunit-violations
+
+# To allow all rules to be evaluated without checking any classes you can set
the following property
+archRule.failOnEmptyShould = false
diff --git a/pom.xml b/pom.xml
index 671f767..c628308 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@ under the License.
</scm>
<properties>
- <flink.version>1.16.0</flink.version>
- <japicmp.referenceVersion>1.16.0</japicmp.referenceVersion>
+ <flink.version>1.17.0</flink.version>
+ <japicmp.referenceVersion>3.0.0-1.16</japicmp.referenceVersion>
</properties>
<modules>
