This is an automated email from the ASF dual-hosted git repository.
ferenc-csaky pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-aws.git
The following commit(s) were added to refs/heads/main by this push:
new 957f7eb [FLINK-40065] Update `flink-connector-parent` to 2.0.0 and
Flink to 2.1.2
957f7eb is described below
commit 957f7eb780b64fc5a8ef52e4f5a4ee4f796a5496
Author: Purushottam Sinha <[email protected]>
AuthorDate: Thu Jul 9 15:54:28 2026 +0530
[FLINK-40065] Update `flink-connector-parent` to 2.0.0 and Flink to 2.1.2
---
.github/workflows/common.yml | 14 ++++---
.github/workflows/nightly.yml | 4 +-
.github/workflows/push_pr.yml | 4 +-
.../kinesis/source/KinesisStreamsSource.java | 4 +-
.../kinesis/source/util/KinesisClientProvider.java | 48 ++++++++++++++++------
.../source/util/KinesisStreamProxyProvider.java | 3 +-
.../dynamodb/source/DynamoDbStreamsSource.java | 3 +-
.../source/enumerator/tracker/SplitTracker.java | 11 ++---
.../connector/dynamodb/source/util/ShardUtils.java | 1 +
.../formats/avro/glue/schema/registry/User.java | 1 +
pom.xml | 4 +-
tools/maven/checkstyle.xml | 8 +---
12 files changed, 59 insertions(+), 46 deletions(-)
diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index 42469f2..68efd1a 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -81,6 +81,10 @@ jobs:
with:
maven-version: 3.8.6
+ - name: Set java11 compile target if required
+ if: ${{ matrix.jdk == 11 }}
+ run: echo "MVN_COMMON_OPTIONS=${MVN_COMMON_OPTIONS} -P java11-target"
>> $GITHUB_ENV
+
- name: Create cache dirs
run: mkdir -p ${{ env.FLINK_CACHE_DIR }}
@@ -102,9 +106,9 @@ jobs:
run: |
set -o pipefail
- mvn clean install -Dflink.convergence.phase=install
-Pcheck-convergence -U -B ${{ env.MVN_CONNECTION_OPTIONS }} \
+ mvn clean install ${MVN_COMMON_OPTIONS}
-Dflink.convergence.phase=install -Pcheck-convergence ${{
env.MVN_CONNECTION_OPTIONS }} \
-DaltDeploymentRepository=validation_repository::default::file:${{
env.MVN_VALIDATION_DIR }} \
- -Dflink.version=${{ inputs.flink_version }} | tee ${{
env.MVN_BUILD_OUTPUT_FILE }}
+ | tee ${{ env.MVN_BUILD_OUTPUT_FILE }}
- name: Run e2e tests
run: |
@@ -112,9 +116,8 @@ jobs:
cd flink-connector-aws-e2e-tests
- mvn clean verify ${{ env.MVN_CONNECTION_OPTIONS }} \
+ mvn clean verify ${MVN_COMMON_OPTIONS} ${{
env.MVN_CONNECTION_OPTIONS }} \
-DaltDeploymentRepository=validation_repository::default::file:${{
env.MVN_VALIDATION_DIR }} \
- -Dflink.version=${{ inputs.flink_version }} \
-Prun-end-to-end-tests -DdistDir=${{ env.FLINK_CACHE_DIR
}}/flink-${{ inputs.flink_version }} \
| tee ${{ env.MVN_BUILD_OUTPUT_FILE }}
@@ -127,9 +130,8 @@ jobs:
cd flink-connector-aws-e2e-tests
- mvn clean verify ${{ env.MVN_CONNECTION_OPTIONS }} \
+ mvn clean verify ${MVN_COMMON_OPTIONS} ${{
env.MVN_CONNECTION_OPTIONS }} \
-DaltDeploymentRepository=validation_repository::default::file:${{
env.MVN_VALIDATION_DIR }} \
- -Dflink.version=${{ inputs.flink_version }} \
-Prun-aws-end-to-end-tests -DdistDir=${{ env.FLINK_CACHE_DIR
}}/flink-${{ inputs.flink_version }} \
| tee ${{ env.MVN_BUILD_OUTPUT_FILE }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ea49368..ea405eb 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -25,7 +25,7 @@ jobs:
if: github.repository_owner == 'apache'
strategy:
matrix:
- flink: [2.0-SNAPSHOT]
+ flink: [2.2-SNAPSHOT]
java: ['11, 17, 21']
uses: ./.github/workflows/common.yml
with:
@@ -38,7 +38,7 @@ jobs:
python_test:
strategy:
matrix:
- flink: [2.0-SNAPSHOT]
+ flink: [2.2-SNAPSHOT]
uses:
apache/flink-connector-shared-utils/.github/workflows/python_ci.yml@ci_utils
with:
flink_version: ${{ matrix.flink }}
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 8e20e86..13d193d 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -25,7 +25,7 @@ jobs:
compile_and_test:
strategy:
matrix:
- flink: [2.0.0]
+ flink: [2.1.2, 2.2.1]
java: ['11, 17, 21']
uses: ./.github/workflows/common.yml
with:
@@ -38,7 +38,7 @@ jobs:
python_test:
strategy:
matrix:
- flink: [2.0.0]
+ flink: [2.1.2, 2.2.1]
uses:
apache/flink-connector-shared-utils/.github/workflows/python_ci.yml@ci_utils
with:
flink_version: ${{ matrix.flink }}
diff --git
a/flink-connector-aws/flink-connector-aws-kinesis-streams/src/main/java/org/apache/flink/connector/kinesis/source/KinesisStreamsSource.java
b/flink-connector-aws/flink-connector-aws-kinesis-streams/src/main/java/org/apache/flink/connector/kinesis/source/KinesisStreamsSource.java
index 69c8065..a578f58 100644
---
a/flink-connector-aws/flink-connector-aws-kinesis-streams/src/main/java/org/apache/flink/connector/kinesis/source/KinesisStreamsSource.java
+++
b/flink-connector-aws/flink-connector-aws-kinesis-streams/src/main/java/org/apache/flink/connector/kinesis/source/KinesisStreamsSource.java
@@ -211,8 +211,8 @@ public class KinesisStreamsSource<T>
Configuration sourceConfig, Map<String, KinesisShardMetrics>
shardMetricGroupMap) {
KinesisSourceConfigOptions.ReaderType readerType =
sourceConfig.get(READER_TYPE);
switch (readerType) {
- // We create a new stream proxy for each split reader since
they have their own
- // independent lifecycle.
+ // We create a new stream proxy for each split reader since they
have their own
+ // independent lifecycle.
case POLLING:
return () ->
new PollingKinesisShardSplitReader(
diff --git
a/flink-connector-aws/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connector/kinesis/source/util/KinesisClientProvider.java
b/flink-connector-aws/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connector/kinesis/source/util/KinesisClientProvider.java
index c691fa1..c6909e6 100644
---
a/flink-connector-aws/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connector/kinesis/source/util/KinesisClientProvider.java
+++
b/flink-connector-aws/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connector/kinesis/source/util/KinesisClientProvider.java
@@ -95,9 +95,13 @@ public class KinesisClientProvider {
@Override
public GetShardIteratorResponse getShardIterator(
GetShardIteratorRequest getShardIteratorRequest)
- throws ResourceNotFoundException, InvalidArgumentException,
- ProvisionedThroughputExceededException,
AccessDeniedException,
- AwsServiceException, SdkClientException,
KinesisException {
+ throws ResourceNotFoundException,
+ InvalidArgumentException,
+ ProvisionedThroughputExceededException,
+ AccessDeniedException,
+ AwsServiceException,
+ SdkClientException,
+ KinesisException {
getShardIteratorValidation.accept(getShardIteratorRequest);
return
GetShardIteratorResponse.builder().shardIterator(shardIterators.poll()).build();
}
@@ -108,9 +112,15 @@ public class KinesisClientProvider {
@Override
public ListShardsResponse listShards(ListShardsRequest
listShardsRequest)
- throws ResourceNotFoundException, InvalidArgumentException,
LimitExceededException,
- ExpiredNextTokenException, ResourceInUseException,
AccessDeniedException,
- AwsServiceException, SdkClientException,
KinesisException {
+ throws ResourceNotFoundException,
+ InvalidArgumentException,
+ LimitExceededException,
+ ExpiredNextTokenException,
+ ResourceInUseException,
+ AccessDeniedException,
+ AwsServiceException,
+ SdkClientException,
+ KinesisException {
ListShardItem item = listShardQueue.pop();
item.validation.accept(listShardsRequest);
@@ -130,11 +140,19 @@ public class KinesisClientProvider {
@Override
public GetRecordsResponse getRecords(GetRecordsRequest
getRecordsRequest)
- throws ResourceNotFoundException, InvalidArgumentException,
- ProvisionedThroughputExceededException,
ExpiredIteratorException,
- KmsDisabledException, KmsInvalidStateException,
KmsAccessDeniedException,
- KmsNotFoundException, KmsOptInRequiredException,
KmsThrottlingException,
- AccessDeniedException, AwsServiceException,
SdkClientException,
+ throws ResourceNotFoundException,
+ InvalidArgumentException,
+ ProvisionedThroughputExceededException,
+ ExpiredIteratorException,
+ KmsDisabledException,
+ KmsInvalidStateException,
+ KmsAccessDeniedException,
+ KmsNotFoundException,
+ KmsOptInRequiredException,
+ KmsThrottlingException,
+ AccessDeniedException,
+ AwsServiceException,
+ SdkClientException,
KinesisException {
getRecordsValidation.accept(getRecordsRequest);
return getRecordsResponse;
@@ -153,8 +171,12 @@ public class KinesisClientProvider {
@Override
public DescribeStreamSummaryResponse describeStreamSummary(
DescribeStreamSummaryRequest describeStreamSummaryRequest)
- throws ResourceNotFoundException, LimitExceededException,
InvalidArgumentException,
- AccessDeniedException, AwsServiceException,
SdkClientException,
+ throws ResourceNotFoundException,
+ LimitExceededException,
+ InvalidArgumentException,
+ AccessDeniedException,
+ AwsServiceException,
+ SdkClientException,
KinesisException {
describeStreamSummaryRequestValidation.accept(describeStreamSummaryRequest);
return describeStreamSummaryResponse;
diff --git
a/flink-connector-aws/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connector/kinesis/source/util/KinesisStreamProxyProvider.java
b/flink-connector-aws/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connector/kinesis/source/util/KinesisStreamProxyProvider.java
index 863b855..e8f80a7 100644
---
a/flink-connector-aws/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connector/kinesis/source/util/KinesisStreamProxyProvider.java
+++
b/flink-connector-aws/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connector/kinesis/source/util/KinesisStreamProxyProvider.java
@@ -275,8 +275,7 @@ public class KinesisStreamProxyProvider {
private String getConsumerArnFromName(String consumerName) {
Arn streamArn = Arn.fromString(STREAM_ARN);
- return streamArn
- .toBuilder()
+ return streamArn.toBuilder()
.resource(
streamArn.resourceAsString()
+ "/consumer/"
diff --git
a/flink-connector-aws/flink-connector-dynamodb/src/main/java/org/apache/flink/connector/dynamodb/source/DynamoDbStreamsSource.java
b/flink-connector-aws/flink-connector-dynamodb/src/main/java/org/apache/flink/connector/dynamodb/source/DynamoDbStreamsSource.java
index 051d127..1581c9d 100644
---
a/flink-connector-aws/flink-connector-dynamodb/src/main/java/org/apache/flink/connector/dynamodb/source/DynamoDbStreamsSource.java
+++
b/flink-connector-aws/flink-connector-dynamodb/src/main/java/org/apache/flink/connector/dynamodb/source/DynamoDbStreamsSource.java
@@ -194,8 +194,7 @@ public class DynamoDbStreamsSource<T>
BackoffStrategy backoffStrategy =
BackoffStrategy.exponentialDelay(minDelayBetweenRetries,
maxDelayBetweenRetries);
AdaptiveRetryStrategy adaptiveRetryStrategy =
- SdkDefaultRetryStrategy.adaptiveRetryStrategy()
- .toBuilder()
+ SdkDefaultRetryStrategy.adaptiveRetryStrategy().toBuilder()
.maxAttempts(maxApiCallAttempts)
.backoffStrategy(backoffStrategy)
.throttlingBackoffStrategy(backoffStrategy)
diff --git
a/flink-connector-aws/flink-connector-dynamodb/src/main/java/org/apache/flink/connector/dynamodb/source/enumerator/tracker/SplitTracker.java
b/flink-connector-aws/flink-connector-dynamodb/src/main/java/org/apache/flink/connector/dynamodb/source/enumerator/tracker/SplitTracker.java
index 042a216..38fdf16 100644
---
a/flink-connector-aws/flink-connector-dynamodb/src/main/java/org/apache/flink/connector/dynamodb/source/enumerator/tracker/SplitTracker.java
+++
b/flink-connector-aws/flink-connector-dynamodb/src/main/java/org/apache/flink/connector/dynamodb/source/enumerator/tracker/SplitTracker.java
@@ -225,8 +225,7 @@ public class SplitTracker {
* iterate all the values in knownSplits so saving compute
*/
public List<DynamoDbStreamsShardSplit>
getUnassignedChildSplits(Set<String> parentSplitIds) {
- return parentSplitIds
- .parallelStream()
+ return parentSplitIds.parallelStream()
.filter(
splitId -> {
if (!parentChildSplitMap.containsKey(splitId)) {
@@ -267,17 +266,13 @@ public class SplitTracker {
* not there, that means that that should already be cleaned up.
*/
public List<DynamoDbStreamsShardSplit> splitsAvailableForAssignment() {
- return knownSplits
- .values()
- .parallelStream()
+ return knownSplits.values().parallelStream()
.filter(this::checkIfSplitCanBeAssigned)
.collect(Collectors.toList());
}
public List<DynamoDBStreamsShardSplitWithAssignmentStatus>
snapshotState(long checkpointId) {
- return knownSplits
- .values()
- .parallelStream()
+ return knownSplits.values().parallelStream()
.map(
split -> {
SplitAssignmentStatus assignmentStatus =
diff --git
a/flink-connector-aws/flink-connector-dynamodb/src/main/java/org/apache/flink/connector/dynamodb/source/util/ShardUtils.java
b/flink-connector-aws/flink-connector-dynamodb/src/main/java/org/apache/flink/connector/dynamodb/source/util/ShardUtils.java
index 8abb8a4..88a56b6 100644
---
a/flink-connector-aws/flink-connector-dynamodb/src/main/java/org/apache/flink/connector/dynamodb/source/util/ShardUtils.java
+++
b/flink-connector-aws/flink-connector-dynamodb/src/main/java/org/apache/flink/connector/dynamodb/source/util/ShardUtils.java
@@ -45,6 +45,7 @@ public class ShardUtils {
Duration.ofHours(25);
private static final String SHARD_ID_SEPARATOR = "-";
+
/**
* This method extracts the shard creation timestamp from the shardId.
*
diff --git
a/flink-formats-aws/flink-avro-glue-schema-registry/src/test/java/org/apache/flink/formats/avro/glue/schema/registry/User.java
b/flink-formats-aws/flink-avro-glue-schema-registry/src/test/java/org/apache/flink/formats/avro/glue/schema/registry/User.java
index c16321d..189651e 100644
---
a/flink-formats-aws/flink-avro-glue-schema-registry/src/test/java/org/apache/flink/formats/avro/glue/schema/registry/User.java
+++
b/flink-formats-aws/flink-avro-glue-schema-registry/src/test/java/org/apache/flink/formats/avro/glue/schema/registry/User.java
@@ -96,6 +96,7 @@ public class User extends
org.apache.avro.specific.SpecificRecordBase
public org.apache.avro.Schema getSchema() {
return SCHEMA$;
}
+
// Used by DatumWriter. Applications should not call.
public Object get(int field$) {
switch (field$) {
diff --git a/pom.xml b/pom.xml
index 9019f4c..10d09df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-parent</artifactId>
- <version>1.0.0</version>
+ <version>2.0.0</version>
</parent>
<groupId>org.apache.flink</groupId>
@@ -55,7 +55,7 @@ under the License.
<properties>
<aws.sdkv2.version>2.40.3</aws.sdkv2.version>
<netty.version>4.1.86.Final</netty.version>
- <flink.version>2.0.0</flink.version>
+ <flink.version>2.1.2</flink.version>
<jackson-bom.version>2.14.3</jackson-bom.version>
<glue.schema.registry.version>1.1.18</glue.schema.registry.version>
<guava.version>32.1.3-jre</guava.version>
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index 29ff116..8352236 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -260,16 +260,10 @@ This file is based on the checkstyle file of Apache Beam.
<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
- <property name="scope" value="protected"/>
+ <property name="accessModifiers" value="protected"/>
<property name="severity" value="error"/>
- <property name="allowMissingJavadoc" value="true"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
- <property name="allowMissingThrowsTags" value="true"/>
- <property name="allowThrowsTagsForSubclasses"
value="true"/>
- <property name="allowUndeclaredRTE" value="true"/>
- <!-- This check sometimes failed for with "Unable to
get class information for @throws tag" for custom exceptions -->
- <property name="suppressLoadErrors" value="true"/>
</module>
<!-- Check that paragraph tags are used correctly in Javadoc.
-->
