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-elasticsearch.git
The following commit(s) were added to refs/heads/main by this push:
new 52f2afd [FLINK-34002] Bump CI flink version on
flink-connector-elasticsearch to support Flink 1.19. This closes #86
52f2afd is described below
commit 52f2afdda90d4d8881d64e6d13c8c8f8b94eb922
Author: Martijn Visser <[email protected]>
AuthorDate: Mon Jan 8 13:07:24 2024 +0100
[FLINK-34002] Bump CI flink version on flink-connector-elasticsearch to
support Flink 1.19. This closes #86
* [FLINK-34002] Bump CI Flink version on flink-connector-elasticsearch to
support Flink 1.19
* [FLINK-34002] Java 17 support for connector
* Make tests passing for jdk 17+
---------
Co-authored-by: Sergey Nuyanzin <[email protected]>
---
.github/workflows/push_pr.yml | 9 ++++++++-
.github/workflows/weekly.yml | 7 +++++++
.../flink-connector-elasticsearch6-e2e-tests/pom.xml | 2 ++
.../flink-connector-elasticsearch7-e2e-tests/pom.xml | 2 ++
flink-connector-elasticsearch-e2e-tests/pom.xml | 6 ++++++
flink-connector-elasticsearch6/pom.xml | 2 ++
flink-connector-elasticsearch7/pom.xml | 2 ++
pom.xml | 3 +++
8 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 0527357..9d349c0 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -25,7 +25,14 @@ jobs:
compile_and_test:
strategy:
matrix:
- flink: [1.17.1, 1.18.0, 1.19-SNAPSHOT]
+ flink: [ 1.16-SNAPSHOT, 1.17-SNAPSHOT ]
+ jdk: [ '8, 11' ]
+ include:
+ - flink: 1.18-SNAPSHOT
+ jdk: '8, 11, 17'
+ - flink: 1.19-SNAPSHOT
+ jdk: '8, 11, 17, 21'
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
flink_version: ${{ matrix.flink }}
+ jdk_version: ${{ matrix.jdk }}
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index f5b46f0..19904b2 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -34,9 +34,11 @@ jobs:
branch: main
}, {
flink: 1.18-SNAPSHOT,
+ jdk: '8, 11, 17',
branch: main
}, {
flink: 1.19-SNAPSHOT,
+ jdk: '8, 11, 17, 21',
branch: main
}, {
flink: 1.16.2,
@@ -44,9 +46,14 @@ jobs:
}, {
flink: 1.17.1,
branch: v3.0
+ }, {
+ flink: 1.18.0,
+ jdk: '8, 11, 17',
+ branch: v3.0
}]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
flink_version: ${{ matrix.flink_branches.flink }}
connector_branch: ${{ matrix.flink_branches.branch }}
+ jdk_version: ${{ matrix.flink_branches.jdk || '8, 11' }}
run_dependency_convergence: false
diff --git
a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch6-e2e-tests/pom.xml
b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch6-e2e-tests/pom.xml
index a4bf490..d778c61 100644
---
a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch6-e2e-tests/pom.xml
+++
b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch6-e2e-tests/pom.xml
@@ -35,6 +35,8 @@ under the License.
<properties>
<elasticsearch.version>6.8.20</elasticsearch.version>
+ <surefire.module.config><!-- required by
+ Elasticsearch6SinkE2ECase -->
--add-opens=java.base/java.util=ALL-UNNAMED </surefire.module.config>
</properties>
<dependencies>
diff --git
a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch7-e2e-tests/pom.xml
b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch7-e2e-tests/pom.xml
index 78ec83a..617be40 100644
---
a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch7-e2e-tests/pom.xml
+++
b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch7-e2e-tests/pom.xml
@@ -35,6 +35,8 @@ under the License.
<properties>
<elasticsearch.version>7.10.2</elasticsearch.version>
+ <surefire.module.config><!-- required by
+ Elasticsearch7SinkE2ECase -->
--add-opens=java.base/java.util=ALL-UNNAMED </surefire.module.config>
</properties>
<dependencies>
diff --git a/flink-connector-elasticsearch-e2e-tests/pom.xml
b/flink-connector-elasticsearch-e2e-tests/pom.xml
index 1114edc..c7f8a4b 100644
--- a/flink-connector-elasticsearch-e2e-tests/pom.xml
+++ b/flink-connector-elasticsearch-e2e-tests/pom.xml
@@ -39,6 +39,11 @@ under the License.
<module>flink-connector-elasticsearch7-e2e-tests</module>
</modules>
+ <properties>
+ <surefire.module.config><!-- required by
+ Elasticsearch6SinkE2ECase -->
--add-opens=java.base/java.util=ALL-UNNAMED </surefire.module.config>
+ </properties>
+
<profiles>
<profile>
<id>run-end-to-end-tests</id>
@@ -63,6 +68,7 @@ under the License.
<systemPropertyVariables>
<moduleDir>${project.basedir}</moduleDir>
</systemPropertyVariables>
+
<argLine>${flink.surefire.baseArgLine} -Xmx${flink.XmxUnitTest}</argLine>
</configuration>
</execution>
</executions>
diff --git a/flink-connector-elasticsearch6/pom.xml
b/flink-connector-elasticsearch6/pom.xml
index 05fae5e..8e64630 100644
--- a/flink-connector-elasticsearch6/pom.xml
+++ b/flink-connector-elasticsearch6/pom.xml
@@ -37,6 +37,8 @@ under the License.
<!-- Allow users to pass custom connector versions -->
<properties>
<elasticsearch.version>6.8.20</elasticsearch.version>
+ <surefire.module.config><!-- required by
+ Elasticsearch6DynamicSinkITCase -->
--add-opens=java.base/java.util=ALL-UNNAMED </surefire.module.config>
</properties>
<dependencies>
diff --git a/flink-connector-elasticsearch7/pom.xml
b/flink-connector-elasticsearch7/pom.xml
index 3f55bfb..620e412 100644
--- a/flink-connector-elasticsearch7/pom.xml
+++ b/flink-connector-elasticsearch7/pom.xml
@@ -37,6 +37,8 @@ under the License.
<!-- Allow users to pass custom connector versions -->
<properties>
<elasticsearch.version>7.10.2</elasticsearch.version>
+ <surefire.module.config><!-- required by
+ Elasticsearch7DynamicSinkITCase -->
--add-opens=java.base/java.util=ALL-UNNAMED </surefire.module.config>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index c235070..fd3e80f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,9 @@ under the License.
<test.randomization.seed/>
<flink.parent.artifactId>flink-connector-elasticsearch-parent</flink.parent.artifactId>
+ <!-- These 2 properties should be removed together with upgrade
of flink-connector-parent to 1.1.x -->
+ <flink.surefire.baseArgLine>-XX:+UseG1GC -Xms256m
-XX:+IgnoreUnrecognizedVMOptions
${surefire.module.config}</flink.surefire.baseArgLine>
+ <surefire.module.config/>
</properties>
<dependencies>
