[hotfix] Add support for jdk 17, 21

apache · Apr 13, 2024 · a3347c0 · a3347c0
1 parent 925be57
commit a3347c0
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 15 deletions.
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
@@ -25,8 +25,15 @@ jobs:
   compile_and_test:
     strategy:
       matrix:
-        flink: [ 1.17-SNAPSHOT, 1.18-SNAPSHOT, 1.19-SNAPSHOT, 1.20-SNAPSHOT ]
+        flink: [ 1.17-SNAPSHOT ]
         jdk: [ '8, 11' ]
+        include:
+          - flink: 1.18-SNAPSHOT
+            jdk: '8, 11, 17'
+          - flink: 1.19-SNAPSHOT
+            jdk: '8, 11, 17, 21'
+          - flink: 1.20-SNAPSHOT
+            jdk: '8, 11, 17, 21'
     uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
     with:
       flink_version: ${{ matrix.flink }}

diff --git a/flink-connector-opensearch/pom.xml b/flink-connector-opensearch/pom.xml
@@ -36,7 +36,11 @@ under the License.
 
 	<!-- Allow users to pass custom connector versions -->
 	<properties>
-		<opensearch.version>1.3.0</opensearch.version>
+		<opensearch.version>1.3.14</opensearch.version>
+		<flink.connector.module.config><!-- required by
+		OpensearchSinkITCase -->  --add-opens=java.base/java.lang=ALL-UNNAMED <!--
+		OpensearchSinkITCase --> --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED <!--
+		OpensearchDynamicSinkITCase --> --add-opens=java.base/java.util=ALL-UNNAMED </flink.connector.module.config>
 	</properties>
 
 	<dependencies>

diff --git a/flink-sql-connector-opensearch/src/main/resources/META-INF/NOTICE b/flink-sql-connector-opensearch/src/main/resources/META-INF/NOTICE
@@ -32,16 +32,16 @@ This project bundles the following dependencies under the Apache Software Licens
 - org.apache.lucene:lucene-spatial3d:8.10.1
 - org.apache.lucene:lucene-spatial-extras:8.10.1
 - org.apache.lucene:lucene-suggest:8.10.1
-- org.opensearch.client:opensearch-rest-client:1.3.0
-- org.opensearch.client:opensearch-rest-high-level-client:1.3.0
-- org.opensearch:opensearch-cli:1.3.0
-- org.opensearch:opensearch-core:1.3.0
-- org.opensearch:opensearch-geo:1.3.0
-- org.opensearch:opensearch:1.3.0
-- org.opensearch:opensearch-secure-sm:1.3.0
-- org.opensearch:opensearch-x-content:1.3.0
-- org.opensearch.plugin:aggs-matrix-stats-client:1.3.0
-- org.opensearch.plugin:lang-mustache-client:1.3.0
-- org.opensearch.plugin:mapper-extras-client:1.3.0
-- org.opensearch.plugin:parent-join-client:1.3.0
-- org.opensearch.plugin:rank-eval-client:1.3.0
+- org.opensearch.client:opensearch-rest-client:1.3.14
+- org.opensearch.client:opensearch-rest-high-level-client:1.3.14
+- org.opensearch:opensearch-cli:1.3.14
+- org.opensearch:opensearch-core:1.3.14
+- org.opensearch:opensearch-geo:1.3.14
+- org.opensearch:opensearch:1.3.14
+- org.opensearch:opensearch-secure-sm:1.3.14
+- org.opensearch:opensearch-x-content:1.3.14
+- org.opensearch.plugin:aggs-matrix-stats-client:1.3.14
+- org.opensearch.plugin:lang-mustache-client:1.3.14
+- org.opensearch.plugin:mapper-extras-client:1.3.14
+- org.opensearch.plugin:parent-join-client:1.3.14
+- org.opensearch.plugin:rank-eval-client:1.3.14
diff --git a/pom.xml b/pom.xml
@@ -73,6 +73,12 @@ under the License.
 		<log4j.version>2.17.2</log4j.version>
 
 		<flink.parent.artifactId>flink-connector-opensearch-parent</flink.parent.artifactId>
+		<!-- This property should contain the add-opens/add-exports commands required for the tests
+		 in the given connector's module to pass.
+		 It MUST be a space-separated list not containing any newlines,
+		 of entries in the form '[-]{2}add-[opens|exports]=<module>/<package>=ALL-UNNAMED'.-->
+		<flink.connector.module.config/>
+		<flink.surefire.baseArgLine>-XX:+UseG1GC -Xms256m -XX:+IgnoreUnrecognizedVMOptions ${flink.connector.module.config}</flink.surefire.baseArgLine>
 	</properties>
 
 	<dependencies>