[FLINK-37652][Connectors/Opensearch] Move to Flink to 2.0.0

Author: reta

.github/workflows/push_pr.yml

@@ -28,13 +28,8 @@ jobs:
   compile_and_test:
     strategy:
       matrix:
-        flink: [ 1.18-SNAPSHOT ]
-        jdk: [ '8, 11, 17' ]
-        include:
-          - flink: 1.19-SNAPSHOT
-            jdk: '8, 11, 17, 21'
-          - flink: 1.20-SNAPSHOT
-            jdk: '8, 11, 17, 21'
+        flink: [ 2.1-SNAPSHOT ]
+        jdk: [ '11', '17, 21' ]
     uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
     with:
       flink_version: ${{ matrix.flink }}

.github/workflows/weekly.yml

@@ -30,23 +30,16 @@ jobs:
     strategy:
       matrix:
         flink_branches: [ {
-          flink: 1.18-SNAPSHOT,
+          flink: 2.1-SNAPSHOT,
+          jdk: '11, 17, 21',
           branch: main
-        }, {
-          flink: 1.19-SNAPSHOT,
-          jdk: '8, 11, 17, 21',
-          branch: main
-        }, {
-            flink: 1.20-SNAPSHOT,
-            jdk: '8, 11, 17, 21',
-            branch: main
-          }, 
+        }, 
         {
           flink: 1.20,
           jdk: '8, 11, 17, 21',
           branch: main
         }, {
-          flink: 1.19.0,
+          flink: 1.19.1,
           jdk: '8, 11, 17, 21',
           branch: v1.2
         }, {

flink-connector-opensearch-base/pom.xml

@@ -26,7 +26,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.flink</groupId>
 		<artifactId>flink-connector-opensearch-parent</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>flink-connector-opensearch-base</artifactId>

flink-connector-opensearch-base/src/test/java/org/apache/flink/connector/opensearch/table/TestContext.java

@@ -53,11 +53,12 @@ DynamicTableFactory.Context build() {
         return new FactoryUtil.DefaultDynamicTableContext(
                 ObjectIdentifier.of("default", "default", "t1"),
                 new ResolvedCatalogTable(
-                        CatalogTable.of(
-                                Schema.newBuilder().fromResolvedSchema(schema).build(),
-                                "mock context",
-                                Collections.emptyList(),
-                                options),
+                        CatalogTable.newBuilder()
+                                .schema(Schema.newBuilder().fromResolvedSchema(schema).build())
+                                .comment("mock context")
+                                .partitionKeys(Collections.emptyList())
+                                .options(options)
+                                .build(),
                         schema),
                 Collections.emptyMap(),
                 new Configuration(),

flink-connector-opensearch-base/src/test/java/org/apache/flink/streaming/connectors/opensearch/testutils/SourceSinkDataTestKit.java

@@ -26,7 +26,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.flink</groupId>
 		<artifactId>flink-connector-opensearch-parent</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>flink-connector-opensearch-e2e-tests</artifactId>

flink-connector-opensearch-e2e-tests/pom.xml

@@ -26,7 +26,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.flink</groupId>
 		<artifactId>flink-connector-opensearch-parent</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>flink-connector-opensearch</artifactId>