Skip to content

Commit 7aa9497

Browse files
authored
Support Flink 1.18 and 1.19 (#32)
1 parent f36a447 commit 7aa9497

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

.github/workflows/build.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ jobs:
2323
runs-on: ubuntu-latest
2424
strategy:
2525
matrix:
26-
flink: [ "1.17.1" ]
26+
flink: [ "1.17.2", "1.18.1", "1.19.0" ]
27+
jdk: [ "11" ]
2728
steps:
2829
- uses: actions/checkout@v3
2930

30-
- name: Set up JDK 11
31+
- name: Set up JDK ${{ matrix.jdk }}
3132
uses: actions/setup-java@v3
3233
with:
33-
java-version: '11'
34+
java-version: ${{ matrix.jdk }}
3435
distribution: 'adopt'
3536
cache: maven
3637

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## [Unreleased]
44

5+
- Support Flink 1.19.0.
6+
57
## [0.2.0] - 2024-01-29
68

79
- Fix `catalog.include` option and add more logging.

pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4242

4343
<elastic.version>8.11.1</elastic.version>
44-
<flink.version>1.17.1</flink.version>
45-
<flink-connector-jdbc.version>3.1.1-1.17</flink-connector-jdbc.version>
44+
<flink.version>1.18.1</flink.version>
45+
<flink-connector-jdbc.version>3.1.2-1.18</flink-connector-jdbc.version>
4646
<flink-connector-jdbc-elasticsearch-dialect.version>0.2.0</flink-connector-jdbc-elasticsearch-dialect.version>
4747

4848
<!-- Test properties -->
@@ -176,6 +176,7 @@
176176
<groupId>com.getindata</groupId>
177177
<artifactId>flink-connector-jdbc-elasticsearch-dialect</artifactId>
178178
<version>${flink-connector-jdbc-elasticsearch-dialect.version}</version>
179+
<scope>provided</scope>
179180
</dependency>
180181
<dependency>
181182
<groupId>org.elasticsearch.plugin</groupId>

src/main/java/com/getindata/flink/connector/jdbc/catalog/IndexFilterResolver.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.getindata.flink.connector.jdbc.catalog;
22

3-
import org.apache.flink.shaded.guava30.com.google.common.base.Strings;
43
import org.slf4j.Logger;
54
import org.slf4j.LoggerFactory;
65

@@ -24,7 +23,7 @@ static IndexFilterResolver of(String rawIncludePatterns, String rawExcludePatter
2423
}
2524

2625
private static List<Pattern> parseRaw(String commaSeparatedList) {
27-
if (Strings.isNullOrEmpty(commaSeparatedList)) {
26+
if (commaSeparatedList == null || commaSeparatedList.isEmpty()) {
2827
return emptyList();
2928
}
3029
return Arrays.stream(commaSeparatedList.split(","))

0 commit comments

Comments
 (0)