[FLINK-29549]- Flink Glue Catalog integration #191

.github/workflows/common.yml

@@ -30,7 +30,7 @@ on:
       jdk_version:
         description: "Jdk version to test against."
         required: false
-        default: 8, 11
+        default: 11, 17
         type: string
       cache_flink_binary:
         description: "Whether to cache the Flink binary. Should be false for SNAPSHOT URLs, true otherwise."
@@ -76,10 +76,10 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Set Maven 3.8.5
+      - name: Set Maven 3.8.6
         uses: stCarolas/setup-maven@v4.5
         with:
-          maven-version: 3.8.5
+          maven-version: 3.8.6
 
       - name: Create cache dirs
         run: mkdir -p ${{ env.FLINK_CACHE_DIR }}

.github/workflows/nightly.yml

@@ -25,8 +25,8 @@ jobs:
     if: github.repository_owner == 'apache'
     strategy:
       matrix:
-        flink: [1.19-SNAPSHOT, 1.20-SNAPSHOT]
-        java: [ '8, 11, 17']
+        flink: [2.0-SNAPSHOT]
+        java: ['11, 17, 21']
     uses: ./.github/workflows/common.yml
     with:
       flink_version: ${{ matrix.flink }}
@@ -38,8 +38,7 @@ jobs:
   python_test:
     strategy:
       matrix:
-        flink: [1.19-SNAPSHOT, 1.20-SNAPSHOT]
+        flink: [2.0-SNAPSHOT]
     uses: apache/flink-connector-shared-utils/.github/workflows/python_ci.yml@ci_utils
     with:
       flink_version: ${{ matrix.flink }}
-

.github/workflows/push_pr.yml

@@ -23,11 +23,11 @@ concurrency:
   cancel-in-progress: true
 jobs:
   compile_and_test:
-    uses: ./.github/workflows/common.yml
     strategy:
       matrix:
-        flink: [1.19.1, 1.20.0]
-        java: [ '8, 11, 17']
+        flink: [2.0.0]
+        java: ['11, 17, 21']
+    uses: ./.github/workflows/common.yml
     with:
       flink_version: ${{ matrix.flink }}
       jdk_version: ${{ matrix.java }}
@@ -38,7 +38,7 @@ jobs:
   python_test:
     strategy:
       matrix:
-        flink: [1.19.0, 1.20.0]
+        flink: [2.0.0]
     uses: apache/flink-connector-shared-utils/.github/workflows/python_ci.yml@ci_utils
     with:
       flink_version: ${{ matrix.flink }}

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "tools/releasing/shared"]
 	path = tools/releasing/shared
 	url = https://github.com/apache/flink-connector-shared-utils
+	branch = release_utils

NOTICE

@@ -1,5 +1,5 @@
 Apache Flink AWS connectors
-Copyright 2022-2024 The Apache Software Foundation
+Copyright 2022-2026 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -11,4 +11,4 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL,
 DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
 WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-USE OR PERFORMANCE OF THIS SOFTWARE.
+USE OR PERFORMANCE OF THIS SOFTWARE.

docs/content/docs/connectors/datastream/kinesis.md

@@ -99,6 +99,7 @@ val kinesisEvents = env.fromSource(kdsSource, WatermarkStrategy.forMonotonousTim
             .uid("custom-uid")
 ```
 {{< /tab >}}
+{{< /tabs >}}
 
 The above is a simple example of using the `KinesisStreamsSource`.
 - The Kinesis stream being read from is specified using the Kinesis Stream ARN.

docs/data/dynamodb.yml

@@ -16,7 +16,8 @@
 # limitations under the License.
 ################################################################################
 
-version: 5.1-SNAPSHOT
+version: 6.0.0
+flink_compatibility: [ "2.0" ]
 variants:
   - maven: flink-connector-dynamodb
     sql_url: https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-dynamodb/$full_version/flink-sql-connector-dynamodb-$full_version.jar

docs/data/firehose.yml

@@ -16,7 +16,8 @@
 # limitations under the License.
 ################################################################################
 
-version: 5.1-SNAPSHOT
+version: 6.0.0
+flink_compatibility: [ "2.0" ]
 variants:
   - maven: flink-connector-aws-kinesis-firehose
     sql_url: https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-aws-kinesis-firehose/$full_version/flink-sql-connector-aws-kinesis-firehose-$full_version.jar

docs/data/kinesis.yml

@@ -16,7 +16,8 @@
 # limitations under the License.
 ################################################################################
 
-version: 5.1-SNAPSHOT
+version: 6.0.0
+flink_compatibility: [ "2.0" ]
 variants:
-  - maven: flink-connector-kinesis
-    sql_url: https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-kinesis/$full_version/flink-sql-connector-kinesis-$full_version.jar
+  - maven: flink-connector-aws-kinesis-streams
+    sql_url: https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-aws-kinesis-streams/$full_version/flink-sql-connector-aws-kinesis-streams-$full_version.jar

flink-connector-aws-base/pom.xml

@@ -26,7 +26,7 @@ under the License.
     <parent>
         <groupId>org.apache.flink</groupId>
         <artifactId>flink-connector-aws</artifactId>
-        <version>5.1-SNAPSHOT</version>
+        <version>6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>flink-connector-aws-base</artifactId>

flink-connector-aws-base/src/test/java/org/apache/flink/connector/aws/util/AWSClientUtilTest.java

@@ -194,8 +194,10 @@ void testCreateAwsSyncClientWithOverrideConfiguration() {
 
         ClientOverrideConfiguration resultOverrideConfiguration =
                 s3Client.serviceClientConfiguration().overrideConfiguration();
-        assertThat(resultOverrideConfiguration.retryStrategy())
-                .isEqualTo(Optional.of(overrideRetryStrategy));
+        assertThat(resultOverrideConfiguration.retryStrategy()).isPresent();
+        RetryStrategy resultStrategy = resultOverrideConfiguration.retryStrategy().get();
+        assertThat(resultStrategy.maxAttempts()).isEqualTo(10);
+
         assertThat(resultOverrideConfiguration.retryPolicy()).isEqualTo(Optional.empty());
         assertThat(resultOverrideConfiguration.retryMode()).isEqualTo(Optional.empty());
         assertThat(resultOverrideConfiguration.retryStrategyConfigurator())

flink-connector-aws-e2e-tests/flink-connector-aws-kinesis-firehose-e2e-tests/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <artifactId>flink-connector-aws-e2e-tests-parent</artifactId>
         <groupId>org.apache.flink</groupId>
-        <version>5.1-SNAPSHOT</version>
+        <version>6.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

flink-connector-aws-e2e-tests/flink-connector-aws-kinesis-streams-e2e-tests/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <artifactId>flink-connector-aws-e2e-tests-parent</artifactId>
         <groupId>org.apache.flink</groupId>
-        <version>5.1-SNAPSHOT</version>
+        <version>6.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

flink-connector-aws-e2e-tests/flink-connector-aws-sqs-e2e-tests/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <artifactId>flink-connector-aws-e2e-tests-parent</artifactId>
         <groupId>org.apache.flink</groupId>
-        <version>5.1-SNAPSHOT</version>
+        <version>6.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>