This is an automated email from the ASF dual-hosted git repository. dannycranmer pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git
The following commit(s) were added to refs/heads/main by this push: new 997a12e [FLINK-35133][Connectors/Cassandra] Adding support for Flink 1.19 997a12e is described below commit 997a12e4906c794c9de9e9db1a14d540002902c1 Author: Danny Cranmer <dannycran...@apache.org> AuthorDate: Fri Apr 19 10:37:18 2024 +0100 [FLINK-35133][Connectors/Cassandra] Adding support for Flink 1.19 --- .github/workflows/push_pr.yml | 17 ++++++++------- .github/workflows/weekly.yml | 44 ++++++++++++++------------------------- flink-connector-cassandra/pom.xml | 1 - pom.xml | 28 ++++++++++++++++++++++++- 4 files changed, 52 insertions(+), 38 deletions(-) diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml index c797bc3..63639e1 100644 --- a/.github/workflows/push_pr.yml +++ b/.github/workflows/push_pr.yml @@ -22,15 +22,16 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: - # 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: 1.17.2 - skip_archunit_tests: true - main-version: + compile_and_test: + strategy: + matrix: + flink: [ 1.19.0 ] + include: + - flink: 1.18.1 + uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils with: - flink_version: 1.18.0 + flink_version: ${{ matrix.flink }} + jdk_version: ${{ matrix.jdk || '8, 11, 17' }} diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 390906f..91355fe 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -22,36 +22,24 @@ on: - cron: "0 0 * * 0" workflow_dispatch: jobs: - # tests that current connector iteration does not break compatibility with last 2 minor released Flink versions - non-main-version: + compile_and_test: if: github.repository_owner == 'apache' + strategy: + matrix: + flink_branches: [{ + flink: 1.18-SNAPSHOT, + branch: main + }, { + flink: 1.19-SNAPSHOT, + branch: main + }, { + flink: 1.20-SNAPSHOT, + branch: main + }] uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils with: - 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 + flink_version: ${{ matrix.flink_branches.flink }} + connector_branch: ${{ matrix.flink_branches.branch }} + jdk_version: ${{ matrix.flink_branches.jdk || '8, 11, 17' }} run_dependency_convergence: false diff --git a/flink-connector-cassandra/pom.xml b/flink-connector-cassandra/pom.xml index 08508fc..0b3a002 100644 --- a/flink-connector-cassandra/pom.xml +++ b/flink-connector-cassandra/pom.xml @@ -51,7 +51,6 @@ under the License. <!--driver 3.x works with 3.x and 4.x versions of Cassandra but driver 4.x is a complete refactoring with different API--> <driver.version>3.11.2</driver.version> - <guava.version>19.0</guava.version> </properties> <dependencies> diff --git a/pom.xml b/pom.xml index 4f52479..858bc04 100644 --- a/pom.xml +++ b/pom.xml @@ -43,13 +43,39 @@ under the License. <properties> <flink.version>1.18.0</flink.version> - <japicmp.referenceVersion>3.0.0-1.16</japicmp.referenceVersion> + <japicmp.referenceVersion>3.1.0-1.17</japicmp.referenceVersion> + <guava.version>19.0</guava.version> </properties> <modules> <module>flink-connector-cassandra</module> </modules> + <dependencyManagement> + <dependencies> + <!-- For dependency convergence --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + </dependency> + + <!-- For dependency convergence --> + <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + <version>1.1.10.4</version> + </dependency> + + <!-- For dependency convergence --> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>3.2.2</version> + </dependency> + </dependencies> + </dependencyManagement> + <build> <plugins> <plugin>