This is an automated email from the ASF dual-hosted git repository. kunni pushed a commit to branch FLINK-38729-2 in repository https://gitbox.apache.org/repos/asf/flink-cdc.git
commit f102d04dca3309e7f2adb52e34a1c032dcf9ae1e Author: lvyanquan <[email protected]> AuthorDate: Wed Mar 11 12:52:17 2026 +0800 Rename module to avoid using minor version. --- flink-cdc-cli/pom.xml | 2 +- flink-cdc-common/pom.xml | 2 +- flink-cdc-composer/pom.xml | 4 ++-- .../flink-cdc-pipeline-connector-values/pom.xml | 2 +- flink-cdc-dist/pom.xml | 4 ++-- {flink-cdc-flink1.20-compat => flink-cdc-flink1-compat}/pom.xml | 2 +- .../flink/api/common/typeutils/TypeSerializerSnapshotAdapter.java | 0 .../flink/cdc/runtime/operators/AbstractStreamOperatorAdapter.java | 0 .../main/java/org/apache/flink/runtime/event/WatermarkEvent.java | 0 {flink-cdc-flink2.2-compat => flink-cdc-flink2-compat}/pom.xml | 2 +- .../flink/api/common/typeutils/TypeSerializerSnapshotAdapter.java | 0 .../src/main/java/org/apache/flink/api/connector/sink2/Sink.java | 0 .../apache/flink/api/connector/sink2/TwoPhaseCommittingSink.java | 0 .../flink/cdc/runtime/operators/AbstractStreamOperatorAdapter.java | 0 .../src/main/java/org/apache/flink/core/execution/RestoreMode.java | 0 .../org/apache/flink/runtime/jobgraph/SavepointConfigOptions.java | 0 .../flink/streaming/api/connector/sink2/WithPostCommitTopology.java | 0 .../flink/streaming/api/connector/sink2/WithPreCommitTopology.java | 0 .../flink/streaming/api/connector/sink2/WithPreWriteTopology.java | 0 .../org/apache/flink/streaming/api/functions/sink/SinkFunction.java | 0 .../streaming/api/functions/source/RichParallelSourceFunction.java | 0 .../apache/flink/streaming/api/functions/source/SourceFunction.java | 0 .../flink/streaming/api/operators/YieldingOperatorFactory.java | 0 .../main/java/org/apache/flink/table/api/ValidationException.java | 0 flink-cdc-runtime/pom.xml | 6 +++--- pom.xml | 4 ++-- 26 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flink-cdc-cli/pom.xml b/flink-cdc-cli/pom.xml index 6230f22a1..fe335fc28 100644 --- a/flink-cdc-cli/pom.xml +++ b/flink-cdc-cli/pom.xml @@ -91,7 +91,7 @@ limitations under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cdc-flink2.2-compat</artifactId> + <artifactId>flink-cdc-flink2-compat</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/flink-cdc-common/pom.xml b/flink-cdc-common/pom.xml index 4101ad51b..80237d26d 100644 --- a/flink-cdc-common/pom.xml +++ b/flink-cdc-common/pom.xml @@ -65,7 +65,7 @@ limitations under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cdc-flink2.2-compat</artifactId> + <artifactId>flink-cdc-flink2-compat</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/flink-cdc-composer/pom.xml b/flink-cdc-composer/pom.xml index bf3eff42a..4161491ba 100644 --- a/flink-cdc-composer/pom.xml +++ b/flink-cdc-composer/pom.xml @@ -117,7 +117,7 @@ limitations under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cdc-flink2.2-compat</artifactId> + <artifactId>flink-cdc-flink2-compat</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -131,7 +131,7 @@ limitations under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cdc-flink1.20-compat</artifactId> + <artifactId>flink-cdc-flink1-compat</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/pom.xml b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/pom.xml index 96052ee64..d28b7fa01 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/pom.xml +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/pom.xml @@ -122,7 +122,7 @@ limitations under the License. </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cdc-flink2.2-compat</artifactId> + <artifactId>flink-cdc-flink2-compat</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/flink-cdc-dist/pom.xml b/flink-cdc-dist/pom.xml index 1a6b5500d..8c918fddc 100644 --- a/flink-cdc-dist/pom.xml +++ b/flink-cdc-dist/pom.xml @@ -60,7 +60,7 @@ limitations under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cdc-flink2.2-compat</artifactId> + <artifactId>flink-cdc-flink2-compat</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -78,7 +78,7 @@ limitations under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cdc-flink1.20-compat</artifactId> + <artifactId>flink-cdc-flink1-compat</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/flink-cdc-flink1.20-compat/pom.xml b/flink-cdc-flink1-compat/pom.xml similarity index 96% rename from flink-cdc-flink1.20-compat/pom.xml rename to flink-cdc-flink1-compat/pom.xml index 45a99cccd..8b21cdc2e 100644 --- a/flink-cdc-flink1.20-compat/pom.xml +++ b/flink-cdc-flink1-compat/pom.xml @@ -25,7 +25,7 @@ limitations under the License. </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>flink-cdc-flink1.20-compat</artifactId> + <artifactId>flink-cdc-flink1-compat</artifactId> <properties> <flink.version>${flink.1.x.version}</flink.version> diff --git a/flink-cdc-flink1.20-compat/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotAdapter.java b/flink-cdc-flink1-compat/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotAdapter.java similarity index 100% rename from flink-cdc-flink1.20-compat/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotAdapter.java rename to flink-cdc-flink1-compat/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotAdapter.java diff --git a/flink-cdc-flink1.20-compat/src/main/java/org/apache/flink/cdc/runtime/operators/AbstractStreamOperatorAdapter.java b/flink-cdc-flink1-compat/src/main/java/org/apache/flink/cdc/runtime/operators/AbstractStreamOperatorAdapter.java similarity index 100% rename from flink-cdc-flink1.20-compat/src/main/java/org/apache/flink/cdc/runtime/operators/AbstractStreamOperatorAdapter.java rename to flink-cdc-flink1-compat/src/main/java/org/apache/flink/cdc/runtime/operators/AbstractStreamOperatorAdapter.java diff --git a/flink-cdc-flink1.20-compat/src/main/java/org/apache/flink/runtime/event/WatermarkEvent.java b/flink-cdc-flink1-compat/src/main/java/org/apache/flink/runtime/event/WatermarkEvent.java similarity index 100% rename from flink-cdc-flink1.20-compat/src/main/java/org/apache/flink/runtime/event/WatermarkEvent.java rename to flink-cdc-flink1-compat/src/main/java/org/apache/flink/runtime/event/WatermarkEvent.java diff --git a/flink-cdc-flink2.2-compat/pom.xml b/flink-cdc-flink2-compat/pom.xml similarity index 96% rename from flink-cdc-flink2.2-compat/pom.xml rename to flink-cdc-flink2-compat/pom.xml index 5e755b2ee..4170b6f90 100644 --- a/flink-cdc-flink2.2-compat/pom.xml +++ b/flink-cdc-flink2-compat/pom.xml @@ -25,7 +25,7 @@ limitations under the License. </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>flink-cdc-flink2.2-compat</artifactId> + <artifactId>flink-cdc-flink2-compat</artifactId> <properties> <flink.version>${flink.2.x.version}</flink.version> diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotAdapter.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotAdapter.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotAdapter.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotAdapter.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/api/connector/sink2/Sink.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/api/connector/sink2/Sink.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/api/connector/sink2/Sink.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/api/connector/sink2/Sink.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/api/connector/sink2/TwoPhaseCommittingSink.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/api/connector/sink2/TwoPhaseCommittingSink.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/api/connector/sink2/TwoPhaseCommittingSink.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/api/connector/sink2/TwoPhaseCommittingSink.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/cdc/runtime/operators/AbstractStreamOperatorAdapter.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/cdc/runtime/operators/AbstractStreamOperatorAdapter.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/cdc/runtime/operators/AbstractStreamOperatorAdapter.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/cdc/runtime/operators/AbstractStreamOperatorAdapter.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/core/execution/RestoreMode.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/core/execution/RestoreMode.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/core/execution/RestoreMode.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/core/execution/RestoreMode.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/runtime/jobgraph/SavepointConfigOptions.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/runtime/jobgraph/SavepointConfigOptions.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/runtime/jobgraph/SavepointConfigOptions.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/runtime/jobgraph/SavepointConfigOptions.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPostCommitTopology.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPostCommitTopology.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPostCommitTopology.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPostCommitTopology.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPreCommitTopology.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPreCommitTopology.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPreCommitTopology.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPreCommitTopology.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPreWriteTopology.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPreWriteTopology.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPreWriteTopology.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPreWriteTopology.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/functions/source/RichParallelSourceFunction.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/functions/source/RichParallelSourceFunction.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/functions/source/RichParallelSourceFunction.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/functions/source/RichParallelSourceFunction.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/functions/source/SourceFunction.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/functions/source/SourceFunction.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/functions/source/SourceFunction.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/functions/source/SourceFunction.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/operators/YieldingOperatorFactory.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/operators/YieldingOperatorFactory.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/streaming/api/operators/YieldingOperatorFactory.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/streaming/api/operators/YieldingOperatorFactory.java diff --git a/flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/table/api/ValidationException.java b/flink-cdc-flink2-compat/src/main/java/org/apache/flink/table/api/ValidationException.java similarity index 100% rename from flink-cdc-flink2.2-compat/src/main/java/org/apache/flink/table/api/ValidationException.java rename to flink-cdc-flink2-compat/src/main/java/org/apache/flink/table/api/ValidationException.java diff --git a/flink-cdc-runtime/pom.xml b/flink-cdc-runtime/pom.xml index 13c1eff0f..fc474013c 100644 --- a/flink-cdc-runtime/pom.xml +++ b/flink-cdc-runtime/pom.xml @@ -124,7 +124,7 @@ limitations under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cdc-flink2.2-compat</artifactId> + <artifactId>flink-cdc-flink2-compat</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -138,7 +138,7 @@ limitations under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cdc-flink1.20-compat</artifactId> + <artifactId>flink-cdc-flink1-compat</artifactId> <version>${project.version}</version> </dependency> </dependencies> @@ -154,7 +154,7 @@ limitations under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cdc-flink1.20-compat</artifactId> + <artifactId>flink-cdc-flink1-compat</artifactId> <version>${project.version}</version> <scope>provided</scope> <exclusions> diff --git a/pom.xml b/pom.xml index a9f49f51b..53220c9ef 100644 --- a/pom.xml +++ b/pom.xml @@ -33,8 +33,8 @@ limitations under the License. <packaging>pom</packaging> <modules> - <module>flink-cdc-flink1.20-compat</module> - <module>flink-cdc-flink2.2-compat</module> + <module>flink-cdc-flink1-compat</module> + <module>flink-cdc-flink2-compat</module> <module>flink-cdc-cli</module> <module>flink-cdc-common</module> <module>flink-cdc-composer</module>
