Skip to content

Commit

Permalink
[FLINK-33379] Bump Flink version on flink-connector-elasticsearch to …
Browse files Browse the repository at this point in the history
…include 1.18 support. This closes apache#78

* [FLINK-33379] Bump Flink version on flink-connector-elasticsearch to include 1.18 support.

* pin commons-compress and snappy-java version

* update weekly.yml

(cherry picked from commit 6636b62)
  • Loading branch information
liyubin117 authored and MartijnVisser committed Oct 31, 2023
1 parent 36409d2 commit 9bfd872
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 4 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/push_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@
# limitations under the License.
################################################################################

name: Build flink-connector-elasticsearch
name: CI
on: [push, pull_request]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
compile_and_test:
strategy:
matrix:
flink: [1.16.2, 1.17.1, 1.18.0, 1.19-SNAPSHOT]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
flink_version: 1.16.2
flink_version: ${{ matrix.flink }}
23 changes: 21 additions & 2 deletions .github/workflows/weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,27 @@ jobs:
if: github.repository_owner == 'apache'
strategy:
matrix:
flink: [1.16-SNAPSHOT, 1.17-SNAPSHOT]
flink_branches: [{
flink: 1.16-SNAPSHOT,
branch: main
}, {
flink: 1.17-SNAPSHOT,
branch: main
}, {
flink: 1.18-SNAPSHOT,
branch: main
}, {
flink: 1.19-SNAPSHOT,
branch: main
}, {
flink: 1.16.2,
branch: v3.0
}, {
flink: 1.17.1,
branch: v3.0
}]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
flink_version: ${{ matrix.flink }}
flink_version: ${{ matrix.flink_branches.flink }}
connector_branch: ${{ matrix.flink_branches.branch }}
run_dependency_convergence: false
14 changes: 14 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,20 @@ under the License.
<version>${log4j.version}</version>
</dependency>

<!-- For dependency convergence -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.24.0</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>com.fasterxml.jackson</groupId>
Expand Down

0 comments on commit 9bfd872

Please sign in to comment.