This is an automated email from the ASF dual-hosted git repository. martijnvisser pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git
commit f0249e82bea6bce6ae775260931e1669006cf78f Author: Martijn Visser <[email protected]> AuthorDate: Tue Apr 4 10:44:10 2023 +0200 [FLINK-31698][Connector/Cassandra] Upgrade and sync related dependencies from Flink 1.16.0 to Flink 1.17.0 / Flink 1.17.0-SNAPSHOT --- .github/workflows/push_pr.yml | 2 +- .github/workflows/release.yml | 31 ---------------------- .github/workflows/weekly.yml | 3 ++- flink-connector-cassandra/pom.xml | 26 +++++++++++------- .../src/test/resources/archunit.properties | 3 +++ pom.xml | 2 +- 6 files changed, 23 insertions(+), 44 deletions(-) diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml index e1ba2d4..335f108 100644 --- a/.github/workflows/push_pr.yml +++ b/.github/workflows/push_pr.yml @@ -25,4 +25,4 @@ jobs: compile_and_test: uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils with: - flink_version: 1.16.0 + flink_version: 1.17.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index e080288..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -################################################################################ - -name: Release Build -on: - workflow_dispatch: -jobs: - compile_and_test: - if: github.repository_owner == 'apache' - strategy: - matrix: - flink: [1.16.1, 1.17.0] - uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils - with: - flink_version: ${{ matrix.flink }} - run_dependency_convergence: false diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 76c0f74..f4645db 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -20,12 +20,13 @@ name: Nightly on: schedule: - cron: "0 0 * * 0" + workflow_dispatch: jobs: compile_and_test: if: github.repository_owner == 'apache' strategy: matrix: - flink: [1.16-SNAPSHOT, 1.17-SNAPSHOT] + flink: [1.16-SNAPSHOT, 1.17-SNAPSHOT, 1.18-SNAPSHOT] uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils with: flink_version: ${{ matrix.flink }} diff --git a/flink-connector-cassandra/pom.xml b/flink-connector-cassandra/pom.xml index 58d70b4..04c5e19 100644 --- a/flink-connector-cassandra/pom.xml +++ b/flink-connector-cassandra/pom.xml @@ -37,16 +37,16 @@ under the License. <!-- Allow users to pass custom connector versions --> <properties> - <flink.shaded.version>15.0</flink.shaded.version> + <flink.shaded.version>16.1</flink.shaded.version> <scala.binary.version>2.12</scala.binary.version> <scala-library.version>2.12.7</scala-library.version> <slf4j.version>1.7.36</slf4j.version> <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> @@ -188,6 +188,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> @@ -302,6 +307,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> @@ -315,13 +328,6 @@ under the License. <version>2.24.0</version> </dependency> - <!-- For dependency convergence --> - <dependency> - <groupId>org.junit.platform</groupId> - <artifactId>junit-platform-engine</artifactId> - <version>1.8.1</version> - </dependency> - <!-- For dependency convergence --> <dependency> <groupId>org.scala-lang</groupId> 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 85ce634..f57be22 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ under the License. </scm> <properties> - <flink.version>1.16.0</flink.version> + <flink.version>1.17.0</flink.version> <japicmp.referenceVersion>1.16.0</japicmp.referenceVersion> </properties>
