You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ec...@apache.org on 2024/03/05 13:47:39 UTC
(flink-connector-cassandra) branch main updated (c541f70 -> 1f171fe)
This is an automated email from the ASF dual-hosted git repository.
echauchot pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git
from c541f70 [hotfix] Update copyright year to 2024
new 4d35e8b [hotfix] Fix: move back to weekly.yml naming
new 8881868 [FLINK-32353] Build on Flink 1.18.0 and refreeze archunit violations store. Test connector on 1.17.2 and 1.18.0. Skip archunit tests on 1.17.2
new 506165b [hotfix] Improve archunit conf comments
new 1f171fe [hotfix] exclude test containers from transitive deps for dependency convergence with Flink 1.17.2
The 4 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/push_pr.yml | 15 ++++--
.github/workflows/{nightly.yml => weekly.yml} | 55 ++++++++++++----------
...6ad9f3 => 7c16ca6f-4479-46d5-80cf-4f766ee5b442} | 0
.../dc1ba6f4-3d84-498c-a085-e02ba5936201 | 8 +---
flink-connector-cassandra/pom.xml | 28 ++++++++---
.../src/test/resources/archunit.properties | 10 ++--
pom.xml | 4 +-
tools/releasing/shared | 1 -
8 files changed, 72 insertions(+), 49 deletions(-)
rename .github/workflows/{nightly.yml => weekly.yml} (50%)
copy flink-connector-cassandra/archunit-violations/{01b274c9-e1ef-4fad-accd-703c7e6ad9f3 => 7c16ca6f-4479-46d5-80cf-4f766ee5b442} (100%)
delete mode 160000 tools/releasing/shared
(flink-connector-cassandra) 04/04: [hotfix] exclude test containers from transitive deps for dependency convergence with Flink 1.17.2
Posted by ec...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
echauchot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git
commit 1f171fe8d28388a9d2cd9ece56e03ca326d05762
Author: Etienne Chauchot <ec...@apache.org>
AuthorDate: Mon Mar 4 18:20:21 2024 +0100
[hotfix] exclude test containers from transitive deps for dependency convergence with Flink 1.17.2
---
flink-connector-cassandra/pom.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/flink-connector-cassandra/pom.xml b/flink-connector-cassandra/pom.xml
index 74833e3..08508fc 100644
--- a/flink-connector-cassandra/pom.xml
+++ b/flink-connector-cassandra/pom.xml
@@ -238,6 +238,13 @@ under the License.
<artifactId>flink-test-utils-junit</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
+ <!-- For dependency convergence-->
+ <exclusions>
+ <exclusion>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -275,6 +282,13 @@ under the License.
<artifactId>flink-connector-test-utils</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
+ <!-- For dependency convergence-->
+ <exclusions>
+ <exclusion>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
(flink-connector-cassandra) 01/04: [hotfix] Fix: move back to weekly.yml naming
Posted by ec...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
echauchot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git
commit 4d35e8b910e970a4dad6286f9c6a33c9dc91e69e
Author: Etienne Chauchot <ec...@apache.org>
AuthorDate: Fri Mar 1 15:16:55 2024 +0100
[hotfix] Fix: move back to weekly.yml naming
---
.github/workflows/{nightly.yml => weekly.yml} | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/nightly.yml b/.github/workflows/weekly.yml
similarity index 87%
rename from .github/workflows/nightly.yml
rename to .github/workflows/weekly.yml
index 5ed1995..7b37926 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/weekly.yml
@@ -16,7 +16,7 @@
# limitations under the License.
################################################################################
-name: Nightly
+name: Weekly
on:
schedule:
- cron: "0 0 * * 0"
@@ -26,24 +26,20 @@ jobs:
if: github.repository_owner == 'apache'
strategy:
matrix:
+ # checks that released cassandra version works with ongoing flink iterations
+ # and that ongoing cassandra iteration works with released flink version
flink_branches: [{
- flink: 1.16-SNAPSHOT,
- branch: main
- }, {
- flink: 1.17-SNAPSHOT,
- branch: main
- }, {
flink: 1.18-SNAPSHOT,
- branch: main
+ branch: v3.1
}, {
- flink: 1.16.2,
+ flink: 1.19-SNAPSHOT,
branch: v3.1
}, {
flink: 1.17.1,
- branch: v3.1
+ branch: main
}, {
- flink: 1.18-SNAPSHOT,
- branch: v3.1
+ flink: 1.18.0,
+ branch: main
}]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
(flink-connector-cassandra) 02/04: [FLINK-32353] Build on Flink 1.18.0 and refreeze archunit violations store. Test connector on 1.17.2 and 1.18.0. Skip archunit tests on 1.17.2
Posted by ec...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
echauchot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git
commit 88818685d195d9ab91b6c4ff31e91d00bc7858c9
Author: Etienne Chauchot <ec...@apache.org>
AuthorDate: Fri Mar 1 15:17:35 2024 +0100
[FLINK-32353] Build on Flink 1.18.0 and refreeze archunit violations store. Test connector on 1.17.2 and 1.18.0. Skip archunit tests on 1.17.2
---
.github/workflows/push_pr.yml | 15 ++++---
.github/workflows/weekly.yml | 49 +++++++++++++---------
.../7c16ca6f-4479-46d5-80cf-4f766ee5b442 | 0
.../dc1ba6f4-3d84-498c-a085-e02ba5936201 | 8 +---
flink-connector-cassandra/pom.xml | 14 ++++---
pom.xml | 4 +-
tools/releasing/shared | 1 -
7 files changed, 50 insertions(+), 41 deletions(-)
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 834edf1..c797bc3 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -22,10 +22,15 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
- compile_and_test:
- strategy:
- matrix:
- flink: [1.16.2, 1.17.1]
+ # tests that current PR does not break compatibility with last 2 minor released versions of Flink
+ non-main-version:
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
- flink_version: ${{ matrix.flink }}
+ flink_version: 1.17.2
+ skip_archunit_tests: true
+ main-version:
+ uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
+ with:
+ flink_version: 1.18.0
+
+
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 7b37926..390906f 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -22,27 +22,36 @@ on:
- cron: "0 0 * * 0"
workflow_dispatch:
jobs:
- compile_and_test:
+ # tests that current connector iteration does not break compatibility with last 2 minor released Flink versions
+ non-main-version:
if: github.repository_owner == 'apache'
- strategy:
- matrix:
- # checks that released cassandra version works with ongoing flink iterations
- # and that ongoing cassandra iteration works with released flink version
- flink_branches: [{
- flink: 1.18-SNAPSHOT,
- branch: v3.1
- }, {
- flink: 1.19-SNAPSHOT,
- branch: v3.1
- }, {
- flink: 1.17.1,
- branch: main
- }, {
- flink: 1.18.0,
- branch: main
- }]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
- flink_version: ${{ matrix.flink_branches.flink }}
- connector_branch: ${{ matrix.flink_branches.branch }}
+ flink_version: 1.17.2
+ connector_branch: main
+ skip_archunit_tests: true
+ main-version:
+ if: github.repository_owner == 'apache'
+ uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
+ with:
+ flink_version: 1.18.0
+ connector_branch: main
+ # tests that current Flink iterations do not break compatibility with current connector iteration
+ # (cannot test with released connector version because this version cannot skip archunit tests for now)
+ current-snapshot:
+ if: github.repository_owner == 'apache'
+ uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
+ with:
+ flink_version: 1.19-SNAPSHOT
+ connector_branch: main
+ skip_archunit_tests: true
run_dependency_convergence: false
+ previous-snapshot:
+ if: github.repository_owner == 'apache'
+ uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
+ with:
+ flink_version: 1.18-SNAPSHOT
+ connector_branch: main
+ skip_archunit_tests: true
+ run_dependency_convergence: false
+
diff --git a/flink-connector-cassandra/archunit-violations/7c16ca6f-4479-46d5-80cf-4f766ee5b442 b/flink-connector-cassandra/archunit-violations/7c16ca6f-4479-46d5-80cf-4f766ee5b442
new file mode 100644
index 0000000..e69de29
diff --git a/flink-connector-cassandra/archunit-violations/dc1ba6f4-3d84-498c-a085-e02ba5936201 b/flink-connector-cassandra/archunit-violations/dc1ba6f4-3d84-498c-a085-e02ba5936201
index 8484957..f80e520 100644
--- a/flink-connector-cassandra/archunit-violations/dc1ba6f4-3d84-498c-a085-e02ba5936201
+++ b/flink-connector-cassandra/archunit-violations/dc1ba6f4-3d84-498c-a085-e02ba5936201
@@ -1,12 +1,6 @@
-org.apache.flink.connector.cassandra.source.CassandraSourceITCase does not satisfy: only one of the following predicates match:\
-* reside in a package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type InternalMiniClusterExtension and annotated with @RegisterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type MiniClusterExtension and annotated with @RegisterExtension\
-* reside in a package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class InternalMiniClusterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class MiniClusterExtension\
- or contain any fields that are public, static, and of type MiniClusterWithClientResource and final and annotated with @ClassRule or contain any fields that is of type MiniClusterWithClientResource and public and final and not static and annotated with @Rule
org.apache.flink.streaming.connectors.cassandra.CassandraConnectorITCase does not satisfy: only one of the following predicates match:\
* reside in a package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type InternalMiniClusterExtension and annotated with @RegisterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type MiniClusterExtension and annotated with @RegisterExtension\
+* reside outside of package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type MiniClusterExtension and annotated with @RegisterExtension or are , and of type MiniClusterTestEnvironment and annotated with @TestEnv\
* reside in a package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class InternalMiniClusterExtension\
* reside outside of package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class MiniClusterExtension\
or contain any fields that are public, static, and of type MiniClusterWithClientResource and final and annotated with @ClassRule or contain any fields that is of type MiniClusterWithClientResource and public and final and not static and annotated with @Rule
\ No newline at end of file
diff --git a/flink-connector-cassandra/pom.xml b/flink-connector-cassandra/pom.xml
index 5d78331..74833e3 100644
--- a/flink-connector-cassandra/pom.xml
+++ b/flink-connector-cassandra/pom.xml
@@ -44,7 +44,7 @@ under the License.
<junit5.version>5.8.1</junit5.version>
<assertj.version>3.23.1</assertj.version>
<archunit.version>1.0.0</archunit.version>
- <testcontainers.version>1.17.2</testcontainers.version>
+ <testcontainers.version>1.18.3</testcontainers.version>
<mockito.version>3.4.6</mockito.version>
<byte-buddy.version>1.12.10</byte-buddy.version>
<findbugs.version>1.3.9</findbugs.version>
@@ -183,11 +183,6 @@ 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>
@@ -209,6 +204,13 @@ under the License.
<artifactId>junit-jupiter</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
+ <!-- for dependency convergence -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 97b4822..4f52479 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -42,7 +42,7 @@ under the License.
</scm>
<properties>
- <flink.version>1.17.1</flink.version>
+ <flink.version>1.18.0</flink.version>
<japicmp.referenceVersion>3.0.0-1.16</japicmp.referenceVersion>
</properties>
diff --git a/tools/releasing/shared b/tools/releasing/shared
deleted file mode 160000
index fdad9aa..0000000
--- a/tools/releasing/shared
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fdad9aa86c0764a30dacf342c9b8ff0068f68fc3
(flink-connector-cassandra) 03/04: [hotfix] Improve archunit conf comments
Posted by ec...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
echauchot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git
commit 506165b9d97f8da4f80fa5f4b316e80f00939ae0
Author: Etienne Chauchot <ec...@apache.org>
AuthorDate: Fri Mar 1 15:37:46 2024 +0100
[hotfix] Improve archunit conf comments
---
.../src/test/resources/archunit.properties | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/flink-connector-cassandra/src/test/resources/archunit.properties b/flink-connector-cassandra/src/test/resources/archunit.properties
index bcd0408..07b2ea7 100644
--- a/flink-connector-cassandra/src/test/resources/archunit.properties
+++ b/flink-connector-cassandra/src/test/resources/archunit.properties
@@ -16,13 +16,17 @@
# limitations under the License.
#
-# By default we allow removing existing violations, but fail when new violations are added.
+# This controls if the violation store is writable
freeze.store.default.allowStoreUpdate=true
-# Enable this if a new (frozen) rule has been added in order to create the initial store and record the existing violations.
+# Enable this if a new rule was added or the description of an existing rule has changed.
+# It is needed to record future violations of this rule.
+# If omitted, future violations of the rule will not be considered as violations as the initial store was not created for this rule.
#freeze.store.default.allowStoreCreation=true
-# Enable this to add allow new violations to be recorded.
+# Enable this to record the current state of violations.
+# This can make sense, because current violations are consciously accepted and should be added to the store
+# By default we allow removing existing violations, but fail when new violations are added
# NOTE: Adding new violations should be avoided when possible. If the rule was correct to flag a new
# violation, please try to avoid creating the violation. If the violation was created due to a
# shortcoming of the rule, file a JIRA issue so the rule can be improved.