You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by sn...@apache.org on 2026/09/21 20:32:53 UTC

(flink-connector-opensearch) branch main updated: [hotfix] [opensearch] Update to Apache Flink 2.3.0 baseline

This is an automated email from the ASF dual-hosted git repository.

snuyanzin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-opensearch.git


The following commit(s) were added to refs/heads/main by this push:
     new 6083f87  [hotfix] [opensearch] Update to Apache Flink 2.3.0 baseline
6083f87 is described below

commit 6083f875470c999b9b0da6a6c8bec5b0c09ba946
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Sep 21 16:32:48 2026 -0400

    [hotfix] [opensearch] Update to Apache Flink 2.3.0 baseline
---
 .github/workflows/push_pr.yml                            |  2 +-
 .github/workflows/weekly.yml                             | 15 +++++++++++++++
 flink-connector-opensearch/pom.xml                       | 16 ++++++++++++++++
 .../opensearch/table/OpensearchDynamicSinkITCase.java    |  2 +-
 flink-connector-opensearch2/pom.xml                      | 16 ++++++++++++++++
 .../opensearch/table/Opensearch2DynamicSinkITCase.java   |  2 +-
 flink-connector-opensearch3/pom.xml                      | 16 ++++++++++++++++
 pom.xml                                                  | 15 ++++++++-------
 8 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 9fe6615..8d80706 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -28,7 +28,7 @@ jobs:
   compile_and_test:
     strategy:
       matrix:
-        flink: [ 2.1-SNAPSHOT ]
+        flink: [ 2.4-SNAPSHOT ]
         jdk: [ '11, 17, 21' ]
     uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
     with:
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 05ae3ac..6a6c696 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -35,6 +35,21 @@ jobs:
     if: github.repository_owner == 'apache'
     strategy:
       matrix:
+        flink_branches: [ {
+          flink: 2.4-SNAPSHOT,
+          jdk: '11, 17, 21',
+          branch: main
+        },
+        flink_branches: [ {
+          flink: 2.3-SNAPSHOT,
+          jdk: '11, 17, 21',
+          branch: main
+        },
+        flink_branches: [ {
+          flink: 2.2-SNAPSHOT,
+          jdk: '11, 17, 21',
+          branch: main
+        },
         flink_branches: [ {
           flink: 2.1-SNAPSHOT,
           jdk: '11, 17, 21',
diff --git a/flink-connector-opensearch/pom.xml b/flink-connector-opensearch/pom.xml
index f56d6d8..d42fcac 100644
--- a/flink-connector-opensearch/pom.xml
+++ b/flink-connector-opensearch/pom.xml
@@ -136,6 +136,22 @@ under the License.
 			<scope>test</scope>
 		</dependency>
 
+		<!-- Table API integration tests -->
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-table-planner-loader</artifactId>
+			<version>${flink.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+			<version>${flink.version}</version>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
+
 		<!--
 			Including Log4j2 dependencies for tests is required for the
 			embedded Opensearch nodes used in tests to run correctly.
diff --git a/flink-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/table/OpensearchDynamicSinkITCase.java b/flink-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/table/OpensearchDynamicSinkITCase.java
index 7125211..d638549 100644
--- a/flink-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/table/OpensearchDynamicSinkITCase.java
+++ b/flink-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/table/OpensearchDynamicSinkITCase.java
@@ -163,7 +163,7 @@ class OpensearchDynamicSinkITCase {
                         .getSource();
         Map<Object, Object> expectedMap = new HashMap<>();
         expectedMap.put("a", 1);
-        expectedMap.put("b", "00:00:12");
+        expectedMap.put("b", "00:00:12.345");
         expectedMap.put("c", "ABCDE");
         expectedMap.put("d", 12.12d);
         expectedMap.put("e", 2);
diff --git a/flink-connector-opensearch2/pom.xml b/flink-connector-opensearch2/pom.xml
index c19f873..2d30738 100644
--- a/flink-connector-opensearch2/pom.xml
+++ b/flink-connector-opensearch2/pom.xml
@@ -161,6 +161,22 @@ under the License.
 			<scope>test</scope>
 		</dependency>
 
+		<!-- Table API integration tests -->
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-table-planner-loader</artifactId>
+			<version>${flink.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+			<version>${flink.version}</version>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-runtime</artifactId>
diff --git a/flink-connector-opensearch2/src/test/java/org/apache/flink/connector/opensearch/table/Opensearch2DynamicSinkITCase.java b/flink-connector-opensearch2/src/test/java/org/apache/flink/connector/opensearch/table/Opensearch2DynamicSinkITCase.java
index aeee80e..7cbf0b5 100644
--- a/flink-connector-opensearch2/src/test/java/org/apache/flink/connector/opensearch/table/Opensearch2DynamicSinkITCase.java
+++ b/flink-connector-opensearch2/src/test/java/org/apache/flink/connector/opensearch/table/Opensearch2DynamicSinkITCase.java
@@ -163,7 +163,7 @@ class Opensearch2DynamicSinkITCase {
                         .getSource();
         Map<Object, Object> expectedMap = new HashMap<>();
         expectedMap.put("a", 1);
-        expectedMap.put("b", "00:00:12");
+        expectedMap.put("b", "00:00:12.345");
         expectedMap.put("c", "ABCDE");
         expectedMap.put("d", 12.12d);
         expectedMap.put("e", 2);
diff --git a/flink-connector-opensearch3/pom.xml b/flink-connector-opensearch3/pom.xml
index 9e04f41..68a07ef 100644
--- a/flink-connector-opensearch3/pom.xml
+++ b/flink-connector-opensearch3/pom.xml
@@ -144,6 +144,22 @@ under the License.
 			<scope>test</scope>
 		</dependency>
 
+		<!-- Table API integration tests -->
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-table-planner-loader</artifactId>
+			<version>${flink.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+			<version>${flink.version}</version>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-runtime</artifactId>
diff --git a/pom.xml b/pom.xml
index f9903c3..aa1ff10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,16 +55,17 @@ under the License.
 	</modules>
 
 	<properties>
-		<flink.version>2.0.0</flink.version>
+		<flink.version>2.3.0</flink.version>
+		<scala.binary.version>2.12</scala.binary.version>
 		<commons-compress.version>1.26.1</commons-compress.version>
-		<jackson-bom.version>2.18.2</jackson-bom.version>
+		<jackson-bom.version>2.20.1</jackson-bom.version>
 		<junit5.version>5.11.4</junit5.version>
 		<assertj.version>3.27.7</assertj.version>
-		<testcontainers.version>1.19.7</testcontainers.version>
-		<mockito.version>5.14.2</mockito.version>
+		<testcontainers.version>1.21.4</testcontainers.version>
+		<mockito.version>5.19.0</mockito.version>
 
 		<japicmp.skip>false</japicmp.skip>
-		<japicmp.referenceVersion>1.0.0-1.20</japicmp.referenceVersion>
+		<japicmp.referenceVersion>1.0.0-1.23</japicmp.referenceVersion>
 
 		<slf4j.version>1.7.36</slf4j.version>
 		<log4j.version>2.25.5</log4j.version>
@@ -300,7 +301,7 @@ under the License.
 			<dependency>
 				<groupId>net.bytebuddy</groupId>
 				<artifactId>byte-buddy</artifactId>
-				<version>1.14.19</version>
+				<version>1.17.6</version>
 			</dependency>
 
 			<!-- For dependency convergence -->
@@ -374,7 +375,7 @@ under the License.
 				<!-- mockito/powermock mismatch -->
 				<groupId>net.bytebuddy</groupId>
 				<artifactId>byte-buddy-agent</artifactId>
-				<version>1.14.19</version>
+				<version>1.17.6</version>
 			</dependency>
 
 			<!-- OpenSearch Java client 3.x stack (dependency convergence) -->