This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch revert-2974-scala-2.12 in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 1d6fa5cec1be95c8519efa08d0758849df4e5518 Author: benjobs <[email protected]> AuthorDate: Fri Aug 25 13:00:38 2023 +0800 Revert "[Improve] Remove Scala version in module name (#2974)" This reverts commit bde8214b4defe5f8c6cf3feee2681734520a4315. --- pom.xml | 2 +- streampark-common/pom.xml | 2 +- .../streampark-console-service/pom.xml | 28 +++++++++++----------- .../src/main/assembly/assembly.xml | 4 ++-- .../streampark-flink-client-api/pom.xml | 12 +++++----- .../streampark-flink-client-core/pom.xml | 8 +++---- .../streampark-flink-connector-base/pom.xml | 10 ++++---- .../streampark-flink-connector-clickhouse/pom.xml | 2 +- .../streampark-flink-connector-doris/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../streampark-flink-connector-hbase/pom.xml | 6 ++--- .../streampark-flink-connector-http/pom.xml | 6 ++--- .../streampark-flink-connector-influx/pom.xml | 2 +- .../streampark-flink-connector-jdbc/pom.xml | 6 ++--- .../streampark-flink-connector-kafka/pom.xml | 2 +- .../streampark-flink-connector-mongo/pom.xml | 2 +- .../streampark-flink-connector-redis/pom.xml | 2 +- streampark-flink/streampark-flink-core/pom.xml | 8 +++---- .../streampark-flink-kubernetes-core/pom.xml | 4 ++-- .../streampark-flink-kubernetes/pom.xml | 6 ++--- streampark-flink/streampark-flink-packer/pom.xml | 6 ++--- streampark-flink/streampark-flink-proxy/pom.xml | 4 ++-- .../streampark-flink-shims-base/pom.xml | 4 ++-- .../streampark-flink-shims-test/pom.xml | 8 +++---- .../streampark-flink-shims_flink-1.12/pom.xml | 4 ++-- .../streampark-flink-shims_flink-1.13/pom.xml | 4 ++-- .../streampark-flink-shims_flink-1.14/pom.xml | 4 ++-- .../streampark-flink-shims_flink-1.15/pom.xml | 4 ++-- .../streampark-flink-shims_flink-1.16/pom.xml | 4 ++-- .../streampark-flink-shims_flink-1.17/pom.xml | 4 ++-- .../streampark-flink-sqlclient/pom.xml | 8 +++---- streampark-flink/streampark-flink-udf/pom.xml | 4 ++-- .../streampark-spark-connector/pom.xml | 2 +- .../streampark-spark-connector-base/pom.xml | 6 ++--- .../streampark-spark-connector-kafka/pom.xml | 6 ++--- streampark-spark/streampark-spark-core/pom.xml | 2 +- 38 files changed, 97 insertions(+), 97 deletions(-) diff --git a/pom.xml b/pom.xml index 74d0e5906..624783ff5 100644 --- a/pom.xml +++ b/pom.xml @@ -217,7 +217,7 @@ <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-common</artifactId> + <artifactId>streampark-common_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> diff --git a/streampark-common/pom.xml b/streampark-common/pom.xml index 73e0310ca..32babf65c 100644 --- a/streampark-common/pom.xml +++ b/streampark-common/pom.xml @@ -24,7 +24,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-common</artifactId> + <artifactId>streampark-common_${scala.binary.version}</artifactId> <name>StreamPark : Common</name> <dependencies> diff --git a/streampark-console/streampark-console-service/pom.xml b/streampark-console/streampark-console-service/pom.xml index 160d24d96..4202d7c96 100644 --- a/streampark-console/streampark-console-service/pom.xml +++ b/streampark-console/streampark-console-service/pom.xml @@ -335,36 +335,36 @@ <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-common</artifactId> + <artifactId>streampark-common_${scala.binary.version}</artifactId> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-client-api</artifactId> + <artifactId>streampark-flink-client-api_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-kubernetes</artifactId> + <artifactId>streampark-flink-kubernetes_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-kubernetes-core</artifactId> + <artifactId>streampark-flink-kubernetes-core_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-sqlclient</artifactId> + <artifactId>streampark-flink-sqlclient_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -447,7 +447,7 @@ <groupId>dev.zio</groupId> <artifactId>zio-logging_${scala.binary.version}</artifactId> </dependency> - + <dependency> <groupId>dev.zio</groupId> <artifactId>zio-streams_${scala.binary.version}</artifactId> @@ -508,49 +508,49 @@ <!-- flink 1.12 support--> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-1.12</artifactId> + <artifactId>streampark-flink-shims_flink-1.12_${scala.binary.version}</artifactId> <version>${project.version}</version> <outputDirectory>${project.build.directory}/shims</outputDirectory> </dependency> <!-- flink 1.13 support--> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-1.13</artifactId> + <artifactId>streampark-flink-shims_flink-1.13_${scala.binary.version}</artifactId> <version>${project.version}</version> <outputDirectory>${project.build.directory}/shims</outputDirectory> </dependency> <!-- flink 1.14 support--> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-1.14</artifactId> + <artifactId>streampark-flink-shims_flink-1.14_${scala.binary.version}</artifactId> <version>${project.version}</version> <outputDirectory>${project.build.directory}/shims</outputDirectory> </dependency> <!-- flink 1.15 support--> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-1.15</artifactId> + <artifactId>streampark-flink-shims_flink-1.15_${scala.binary.version}</artifactId> <version>${project.version}</version> <outputDirectory>${project.build.directory}/shims</outputDirectory> </dependency> <!-- flink 1.16 support--> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-1.16</artifactId> + <artifactId>streampark-flink-shims_flink-1.16_${scala.binary.version}</artifactId> <version>${project.version}</version> <outputDirectory>${project.build.directory}/shims</outputDirectory> </dependency> <!-- flink 1.17 support--> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-1.17</artifactId> + <artifactId>streampark-flink-shims_flink-1.17_${scala.binary.version}</artifactId> <version>${project.version}</version> <outputDirectory>${project.build.directory}/shims</outputDirectory> </dependency> <!-- flink-submit-core --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-client-core</artifactId> + <artifactId>streampark-flink-client-core_${scala.binary.version}</artifactId> <version>${project.version}</version> <outputDirectory>${project.build.directory}/lib</outputDirectory> </dependency> diff --git a/streampark-console/streampark-console-service/src/main/assembly/assembly.xml b/streampark-console/streampark-console-service/src/main/assembly/assembly.xml index 9f8956c74..92c73dac4 100644 --- a/streampark-console/streampark-console-service/src/main/assembly/assembly.xml +++ b/streampark-console/streampark-console-service/src/main/assembly/assembly.xml @@ -29,14 +29,14 @@ <useProjectArtifact>true</useProjectArtifact> <outputDirectory>lib</outputDirectory> <excludes> - <exclude>org.apache.streampark:streampark-flink-sqlclient</exclude> + <exclude>org.apache.streampark:streampark-flink-sqlclient_${scala.binary.version}</exclude> <exclude>javax.servlet:servlet-api</exclude> </excludes> </dependencySet> <dependencySet> <outputDirectory>client</outputDirectory> <includes> - <include>org.apache.streampark:streampark-flink-sqlclient</include> + <include>org.apache.streampark:streampark-flink-sqlclient_${scala.binary.version}</include> </includes> </dependencySet> </dependencySets> diff --git a/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml b/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml index 866b69d3c..e3f4fa74c 100644 --- a/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml +++ b/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml @@ -23,39 +23,39 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-client-api</artifactId> + <artifactId>streampark-flink-client-api_${scala.binary.version}</artifactId> <name>StreamPark : Flink Client Api</name> <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-common</artifactId> + <artifactId>streampark-common_${scala.binary.version}</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-proxy</artifactId> + <artifactId>streampark-flink-proxy_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-packer</artifactId> + <artifactId>streampark-flink-packer_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-kubernetes</artifactId> + <artifactId>streampark-flink-kubernetes_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-client/streampark-flink-client-core/pom.xml b/streampark-flink/streampark-flink-client/streampark-flink-client-core/pom.xml index ae57b268e..adadd682e 100644 --- a/streampark-flink/streampark-flink-client/streampark-flink-client-core/pom.xml +++ b/streampark-flink/streampark-flink-client/streampark-flink-client-core/pom.xml @@ -23,14 +23,14 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-client-core</artifactId> + <artifactId>streampark-flink-client-core_${scala.binary.version}</artifactId> <name>StreamPark : Flink Client Core</name> <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-client-api</artifactId> + <artifactId>streampark-flink-client-api_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -39,14 +39,14 @@ so a full build dependencies is required. --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-kubernetes</artifactId> + <artifactId>streampark-flink-kubernetes_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-base/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-base/pom.xml index 6f6dbc4ad..0679820ea 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-base/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-base/pom.xml @@ -24,7 +24,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-connector-base</artifactId> + <artifactId>streampark-flink-connector-base_${scala.binary.version}</artifactId> <name>StreamPark : Flink Connector Base</name> <dependencies> @@ -38,19 +38,19 @@ <!-- streampark --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-common</artifactId> + <artifactId>streampark-common_${scala.binary.version}</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-core</artifactId> + <artifactId>streampark-flink-core_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -58,7 +58,7 @@ <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-clickhouse/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-clickhouse/pom.xml index 24346090a..d344058e1 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-clickhouse/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-clickhouse/pom.xml @@ -52,7 +52,7 @@ <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/pom.xml index 55a29ac3b..1fedfb502 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/pom.xml @@ -42,7 +42,7 @@ <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch5/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch5/pom.xml index b84bd15bf..23a84158a 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch5/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch5/pom.xml @@ -46,7 +46,7 @@ <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch6/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch6/pom.xml index 0dd082a2c..1663108e0 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch6/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch6/pom.xml @@ -44,7 +44,7 @@ <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch7/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch7/pom.xml index 4239f5aaf..af4474a1c 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch7/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch7/pom.xml @@ -43,7 +43,7 @@ <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-hbase/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-hbase/pom.xml index 8dd1098ad..0d0bc4e7b 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-hbase/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-hbase/pom.xml @@ -23,21 +23,21 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-connector-hbase</artifactId> + <artifactId>streampark-flink-connector-hbase_${scala.binary.version}</artifactId> <name>StreamPark : Flink Connector Hbase</name> <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-connector-base</artifactId> + <artifactId>streampark-flink-connector-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-http/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-http/pom.xml index 3eb23aa38..3e37c22d6 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-http/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-http/pom.xml @@ -23,14 +23,14 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-connector-http</artifactId> + <artifactId>streampark-flink-connector-http_${scala.binary.version}</artifactId> <name>StreamPark : Flink Connector Http</name> <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-connector-base</artifactId> + <artifactId>streampark-flink-connector-base_${scala.binary.version}</artifactId> <version>${version}</version> </dependency> @@ -48,7 +48,7 @@ <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-influx/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-influx/pom.xml index da877f40b..3a12f2678 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-influx/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-influx/pom.xml @@ -43,7 +43,7 @@ <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-jdbc/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-jdbc/pom.xml index 5bf9a99d3..f70e9967f 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-jdbc/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-jdbc/pom.xml @@ -23,21 +23,21 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-connector-jdbc</artifactId> + <artifactId>streampark-flink-connector-jdbc_${scala.binary.version}</artifactId> <name>StreamPark : Flink Connector JDBC</name> <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-connector-base</artifactId> + <artifactId>streampark-flink-connector-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-kafka/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-kafka/pom.xml index 820a46c8b..5f1327116 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-kafka/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-kafka/pom.xml @@ -43,7 +43,7 @@ <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-mongo/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-mongo/pom.xml index 94938eb57..d96e3465e 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-mongo/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-mongo/pom.xml @@ -43,7 +43,7 @@ <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-redis/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-redis/pom.xml index 739098e4f..5086d9ea9 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-redis/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-redis/pom.xml @@ -50,7 +50,7 @@ <!-- provided --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-core/pom.xml b/streampark-flink/streampark-flink-core/pom.xml index 67a858719..ea777a732 100644 --- a/streampark-flink/streampark-flink-core/pom.xml +++ b/streampark-flink/streampark-flink-core/pom.xml @@ -23,26 +23,26 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-core</artifactId> + <artifactId>streampark-flink-core_${scala.binary.version}</artifactId> <name>StreamPark : Flink Core</name> <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-common</artifactId> + <artifactId>streampark-common_${scala.binary.version}</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/pom.xml b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/pom.xml index f44f63b96..2ab1f3271 100644 --- a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/pom.xml +++ b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/pom.xml @@ -25,7 +25,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-kubernetes-core</artifactId> + <artifactId>streampark-flink-kubernetes-core_${scala.binary.version}</artifactId> <name>StreamPark : Flink Kubernetes Integration Core</name> <properties> @@ -41,7 +41,7 @@ <!-- Streampark modules --> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-common</artifactId> + <artifactId>streampark-common_${scala.binary.version}</artifactId> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-kubernetes/pom.xml b/streampark-flink/streampark-flink-kubernetes/pom.xml index 70950c152..b69aae145 100644 --- a/streampark-flink/streampark-flink-kubernetes/pom.xml +++ b/streampark-flink/streampark-flink-kubernetes/pom.xml @@ -24,7 +24,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-kubernetes</artifactId> + <artifactId>streampark-flink-kubernetes_${scala.binary.version}</artifactId> <name>StreamPark : Flink Kubernetes Integration(Deprecated)</name> <properties> @@ -89,13 +89,13 @@ <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-common</artifactId> + <artifactId>streampark-common_${scala.binary.version}</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-packer/pom.xml b/streampark-flink/streampark-flink-packer/pom.xml index 8f2c9a541..a6e2a0716 100644 --- a/streampark-flink/streampark-flink-packer/pom.xml +++ b/streampark-flink/streampark-flink-packer/pom.xml @@ -23,7 +23,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-packer</artifactId> + <artifactId>streampark-flink-packer_${scala.binary.version}</artifactId> <name>StreamPark : Flink Packer</name> <properties> @@ -38,13 +38,13 @@ <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-common</artifactId> + <artifactId>streampark-common_${scala.binary.version}</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-kubernetes</artifactId> + <artifactId>streampark-flink-kubernetes_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> diff --git a/streampark-flink/streampark-flink-proxy/pom.xml b/streampark-flink/streampark-flink-proxy/pom.xml index 807b122f2..0021038e6 100644 --- a/streampark-flink/streampark-flink-proxy/pom.xml +++ b/streampark-flink/streampark-flink-proxy/pom.xml @@ -23,14 +23,14 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-proxy</artifactId> + <artifactId>streampark-flink-proxy_${scala.binary.version}</artifactId> <name>StreamPark : Flink Proxy</name> <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-common</artifactId> + <artifactId>streampark-common_${scala.binary.version}</artifactId> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/pom.xml index 6f55b9d80..a5cb8a88f 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/pom.xml @@ -25,14 +25,14 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <name>StreamPark : Flink Shims Base</name> <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-common</artifactId> + <artifactId>streampark-common_${scala.binary.version}</artifactId> </dependency> <!--flink base--> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims-test/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims-test/pom.xml index 8cc215872..e032d2c05 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims-test/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims-test/pom.xml @@ -26,7 +26,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-shims-test</artifactId> + <artifactId>streampark-flink-shims-test_${scala.binary.version}</artifactId> <name>StreamPark : Flink Shims Test</name> <properties> @@ -44,21 +44,21 @@ <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-1.14</artifactId> + <artifactId>streampark-flink-shims_flink-1.14_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-core</artifactId> + <artifactId>streampark-flink-core_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.12/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.12/pom.xml index 201940ba7..7a8f44b59 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.12/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.12/pom.xml @@ -25,7 +25,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-shims_flink-1.12</artifactId> + <artifactId>streampark-flink-shims_flink-1.12_${scala.binary.version}</artifactId> <name>StreamPark : Flink Shims 1.12</name> <properties> @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.13/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.13/pom.xml index 4a5ec40b6..72e546a35 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.13/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.13/pom.xml @@ -24,7 +24,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-shims_flink-1.13</artifactId> + <artifactId>streampark-flink-shims_flink-1.13_${scala.binary.version}</artifactId> <name>StreamPark : Flink Shims 1.13</name> <properties> @@ -34,7 +34,7 @@ <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.14/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.14/pom.xml index b10402b04..deb3223ea 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.14/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.14/pom.xml @@ -24,7 +24,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-shims_flink-1.14</artifactId> + <artifactId>streampark-flink-shims_flink-1.14_${scala.binary.version}</artifactId> <name>StreamPark : Flink Shims 1.14</name> <properties> @@ -34,7 +34,7 @@ <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.15/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.15/pom.xml index 43f16ab4a..7a1560081 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.15/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.15/pom.xml @@ -26,7 +26,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-shims_flink-1.15</artifactId> + <artifactId>streampark-flink-shims_flink-1.15_${scala.binary.version}</artifactId> <name>StreamPark : Flink Shims 1.15</name> <properties> @@ -36,7 +36,7 @@ <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.16/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.16/pom.xml index 068d42b80..604bd7856 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.16/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.16/pom.xml @@ -25,7 +25,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-shims_flink-1.16</artifactId> + <artifactId>streampark-flink-shims_flink-1.16_${scala.binary.version}</artifactId> <name>StreamPark : Flink Shims 1.16</name> <properties> @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.17/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.17/pom.xml index 37579bc07..d6d3093c7 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.17/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.17/pom.xml @@ -25,7 +25,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-shims_flink-1.17</artifactId> + <artifactId>streampark-flink-shims_flink-1.17_${scala.binary.version}</artifactId> <name>StreamPark : Flink Shims 1.17</name> <properties> @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> diff --git a/streampark-flink/streampark-flink-sqlclient/pom.xml b/streampark-flink/streampark-flink-sqlclient/pom.xml index ad727234b..fcd527835 100644 --- a/streampark-flink/streampark-flink-sqlclient/pom.xml +++ b/streampark-flink/streampark-flink-sqlclient/pom.xml @@ -23,7 +23,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-sqlclient</artifactId> + <artifactId>streampark-flink-sqlclient_${scala.binary.version}</artifactId> <name>StreamPark : Flink SQL Client</name> <dependencies> @@ -35,19 +35,19 @@ <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-core</artifactId> + <artifactId>streampark-flink-core_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims-base</artifactId> + <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}</artifactId> + <artifactId>streampark-flink-shims_flink-${streampark.flink.shims.version}_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/streampark-flink/streampark-flink-udf/pom.xml b/streampark-flink/streampark-flink-udf/pom.xml index ab2f78fd8..a63be8b44 100644 --- a/streampark-flink/streampark-flink-udf/pom.xml +++ b/streampark-flink/streampark-flink-udf/pom.xml @@ -23,13 +23,13 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-flink-udf</artifactId> + <artifactId>streampark-flink-udf_${scala.binary.version}</artifactId> <name>StreamPark : Flink Udf</name> <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-common</artifactId> + <artifactId>streampark-common_${scala.binary.version}</artifactId> <scope>provided</scope> <exclusions> <exclusion> diff --git a/streampark-spark/streampark-spark-connector/pom.xml b/streampark-spark/streampark-spark-connector/pom.xml index 66f7568c2..735007c56 100644 --- a/streampark-spark/streampark-spark-connector/pom.xml +++ b/streampark-spark/streampark-spark-connector/pom.xml @@ -24,7 +24,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-spark-connector</artifactId> + <artifactId>streampark-spark-connector_2.12</artifactId> <name>StreamPark : Spark Connector</name> <packaging>pom</packaging> diff --git a/streampark-spark/streampark-spark-connector/streampark-spark-connector-base/pom.xml b/streampark-spark/streampark-spark-connector/streampark-spark-connector-base/pom.xml index e9e90525a..65da6a9a4 100644 --- a/streampark-spark/streampark-spark-connector/streampark-spark-connector-base/pom.xml +++ b/streampark-spark/streampark-spark-connector/streampark-spark-connector-base/pom.xml @@ -21,18 +21,18 @@ <parent> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-spark-connector</artifactId> + <artifactId>streampark-spark-connector_2.12</artifactId> <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-spark-connector-base</artifactId> + <artifactId>streampark-spark-connector-base_2.12</artifactId> <name>StreamPark : Spark Connector Base</name> <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-spark-core</artifactId> + <artifactId>streampark-spark-core_2.12</artifactId> <version>${project.version}</version> </dependency> diff --git a/streampark-spark/streampark-spark-connector/streampark-spark-connector-kafka/pom.xml b/streampark-spark/streampark-spark-connector/streampark-spark-connector-kafka/pom.xml index f2b926e56..8f7229f34 100644 --- a/streampark-spark/streampark-spark-connector/streampark-spark-connector-kafka/pom.xml +++ b/streampark-spark/streampark-spark-connector/streampark-spark-connector-kafka/pom.xml @@ -20,18 +20,18 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-spark-connector</artifactId> + <artifactId>streampark-spark-connector_2.12</artifactId> <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-spark-connector-kafka</artifactId> + <artifactId>streampark-spark-connector-kafka_2.12</artifactId> <name>StreamPark : Spark Connector Kafka</name> <dependencies> <dependency> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-spark-connector-base</artifactId> + <artifactId>streampark-spark-connector-base_2.12</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/streampark-spark/streampark-spark-core/pom.xml b/streampark-spark/streampark-spark-core/pom.xml index 2f9cf22f8..e6a4dae76 100644 --- a/streampark-spark/streampark-spark-core/pom.xml +++ b/streampark-spark/streampark-spark-core/pom.xml @@ -23,7 +23,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-spark-core</artifactId> + <artifactId>streampark-spark-core_2.12</artifactId> <name>StreamPark : Spark Core</name> <!--项目基本依赖-->
