Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FLINK-35133][Connectors/Cassandra] Adding support for Flink 1.19 #28

Merged
merged 1 commit into from
Apr 22, 2024
Merged

[FLINK-35133][Connectors/Cassandra] Adding support for Flink 1.19 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions .github/workflows/push_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}


44 changes: 16 additions & 28 deletions .github/workflows/weekly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: [{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is true that all the PRs are tested against last 2 Flink versions but don't you think that the weekly workflow should also test against these versions and not only the snapshots ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that makes sense. I need to update to include the new v3.2 branch, so will add them then.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perfect 👍

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool that we no more need to test against 1.17.2 and skip the archunit tests !

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

1 change: 0 additions & 1 deletion flink-connector-cassandra/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
28 changes: 27 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading