diff --git a/.licenserc.yaml b/.licenserc.yaml index 079dca23621..ff215f73d17 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -52,6 +52,6 @@ header: - 'seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/protocol/task/AbstractSeaTunnelMessageTask.java' - 'seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/utils/PassiveCompletableFuture.java' - 'seatunnel-connectors-v2/connector-cdc/connector-cdc-postgres/src/main/java/io/debezium/connector/postgresql/connection/PostgresReplicationConnection.java' - - 'seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-shade/src/main/java/com/hazelcast/**' + - 'seatunnel-shade/seatunnel-hazelcast/src/main/java/com/hazelcast/**' comment: on-failure diff --git a/seatunnel-engine/pom.xml b/seatunnel-engine/pom.xml index 7a6b16bd0bf..b883bb2d794 100644 --- a/seatunnel-engine/pom.xml +++ b/seatunnel-engine/pom.xml @@ -46,7 +46,7 @@ org.apache.seatunnel - seatunnel-hazelcast-shade + seatunnel-hazelcast ${project.version} optional diff --git a/seatunnel-engine/seatunnel-engine-client/pom.xml b/seatunnel-engine/seatunnel-engine-client/pom.xml index dcad2e4f184..0fd3c4e4b91 100644 --- a/seatunnel-engine/seatunnel-engine-client/pom.xml +++ b/seatunnel-engine/seatunnel-engine-client/pom.xml @@ -28,7 +28,7 @@ org.apache.seatunnel - seatunnel-hazelcast-shade + seatunnel-hazelcast ${project.version} optional diff --git a/seatunnel-engine/seatunnel-engine-common/pom.xml b/seatunnel-engine/seatunnel-engine-common/pom.xml index 0cc7575a9bb..606bded173a 100644 --- a/seatunnel-engine/seatunnel-engine-common/pom.xml +++ b/seatunnel-engine/seatunnel-engine-common/pom.xml @@ -30,7 +30,7 @@ org.apache.seatunnel - seatunnel-hazelcast-shade + seatunnel-hazelcast ${project.version} optional diff --git a/seatunnel-engine/seatunnel-engine-core/pom.xml b/seatunnel-engine/seatunnel-engine-core/pom.xml index 0dcfe0770d4..a3e540880f2 100644 --- a/seatunnel-engine/seatunnel-engine-core/pom.xml +++ b/seatunnel-engine/seatunnel-engine-core/pom.xml @@ -30,7 +30,7 @@ org.apache.seatunnel - seatunnel-hazelcast-shade + seatunnel-hazelcast ${project.version} optional diff --git a/seatunnel-engine/seatunnel-engine-server/pom.xml b/seatunnel-engine/seatunnel-engine-server/pom.xml index d9e1c860c53..b5d2bffff2b 100644 --- a/seatunnel-engine/seatunnel-engine-server/pom.xml +++ b/seatunnel-engine/seatunnel-engine-server/pom.xml @@ -54,7 +54,7 @@ org.apache.seatunnel - seatunnel-hazelcast-shade + seatunnel-hazelcast ${project.version} optional diff --git a/seatunnel-shade/seatunnel-hazelcast/pom.xml b/seatunnel-shade/seatunnel-hazelcast/pom.xml index c7705c70dba..44de0ea094e 100644 --- a/seatunnel-shade/seatunnel-hazelcast/pom.xml +++ b/seatunnel-shade/seatunnel-hazelcast/pom.xml @@ -23,11 +23,88 @@ seatunnel-hazelcast - pom + jar SeaTunnel : Shade : Hazelcast - - seatunnel-hazelcast-base - seatunnel-hazelcast-shade - + + + 5.1 + + + + + com.hazelcast + hazelcast + ${hazelcast.version} + + + + + ${project.artifactId}-${project.version} + + + + org.apache.maven.plugins + maven-shade-plugin + + true + ${enableSourceJarCreation} + true + false + false + + + com.typesafe:config + + ** + + + META-INF/MANIFEST.MF + META-INF/NOTICE + com/hazelcast/internal/cluster/impl/MembershipManager.class + com/hazelcast/internal/cluster/impl/MemberMap.class + com/hazelcast/internal/cluster/impl/ClusterServiceImpl.class + com/hazelcast/cluster/impl/MemberImpl.class + + + + + + + + + + + + shade + + package + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + compile + + attach-artifact + + package + + + + ${basedir}/target/${project.artifactId}-${project.version}.jar + jar + optional + + + + + + + + diff --git a/seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-base/pom.xml b/seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-base/pom.xml deleted file mode 100644 index 3b7ccd509e7..00000000000 --- a/seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-base/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - 4.0.0 - - org.apache.seatunnel - seatunnel-hazelcast - ${revision} - - - seatunnel-hazelcast-base - SeaTunnel : Shade : Hazelcast : Base - - - - 5.1 - - - - - com.hazelcast - hazelcast - ${hazelcast.version} - - - - - - ${project.artifactId}-${project.version} - - - - org.apache.maven.plugins - maven-shade-plugin - - true - ${enableSourceJarCreation} - true - false - false - - - com.typesafe:config - - ** - - - META-INF/MANIFEST.MF - META-INF/NOTICE - com/hazelcast/internal/cluster/impl/MembershipManager.class - com/hazelcast/internal/cluster/impl/MemberMap.class - com/hazelcast/internal/cluster/impl/ClusterServiceImpl.class - com/hazelcast/cluster/impl/MemberImpl.class - - - - - - - - - - - - shade - - package - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - compile - - attach-artifact - - package - - - - ${basedir}/target/${project.artifactId}-${project.version}.jar - jar - optional - - - - - - - - - - - diff --git a/seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-shade/pom.xml b/seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-shade/pom.xml deleted file mode 100644 index 777713da604..00000000000 --- a/seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-shade/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - 4.0.0 - - org.apache.seatunnel - seatunnel-hazelcast - ${revision} - - - seatunnel-hazelcast-shade - SeaTunnel : Shade : Hazelcast : Shade - - - org.apache.seatunnel - seatunnel-hazelcast-base - ${project.version} - - - - - ${project.artifactId}-${project.version} - - - - org.codehaus.mojo - build-helper-maven-plugin - - - compile - - attach-artifact - - package - - - - ${basedir}/target/${project.artifactId}-${project.version}.jar - jar - optional - - - - - - - - - - diff --git a/seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-shade/src/main/java/com/hazelcast/cluster/impl/MemberImpl.java b/seatunnel-shade/seatunnel-hazelcast/src/main/java/com/hazelcast/cluster/impl/MemberImpl.java similarity index 100% rename from seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-shade/src/main/java/com/hazelcast/cluster/impl/MemberImpl.java rename to seatunnel-shade/seatunnel-hazelcast/src/main/java/com/hazelcast/cluster/impl/MemberImpl.java diff --git a/seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-shade/src/main/java/com/hazelcast/internal/cluster/impl/ClusterServiceImpl.java b/seatunnel-shade/seatunnel-hazelcast/src/main/java/com/hazelcast/internal/cluster/impl/ClusterServiceImpl.java similarity index 100% rename from seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-shade/src/main/java/com/hazelcast/internal/cluster/impl/ClusterServiceImpl.java rename to seatunnel-shade/seatunnel-hazelcast/src/main/java/com/hazelcast/internal/cluster/impl/ClusterServiceImpl.java diff --git a/seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-shade/src/main/java/com/hazelcast/internal/cluster/impl/MemberMap.java b/seatunnel-shade/seatunnel-hazelcast/src/main/java/com/hazelcast/internal/cluster/impl/MemberMap.java similarity index 100% rename from seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-shade/src/main/java/com/hazelcast/internal/cluster/impl/MemberMap.java rename to seatunnel-shade/seatunnel-hazelcast/src/main/java/com/hazelcast/internal/cluster/impl/MemberMap.java diff --git a/seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-shade/src/main/java/com/hazelcast/internal/cluster/impl/MembershipManager.java b/seatunnel-shade/seatunnel-hazelcast/src/main/java/com/hazelcast/internal/cluster/impl/MembershipManager.java similarity index 100% rename from seatunnel-shade/seatunnel-hazelcast/seatunnel-hazelcast-shade/src/main/java/com/hazelcast/internal/cluster/impl/MembershipManager.java rename to seatunnel-shade/seatunnel-hazelcast/src/main/java/com/hazelcast/internal/cluster/impl/MembershipManager.java diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index 914773a5fd1..d2881a4a41e 100755 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -31,8 +31,8 @@ scala-reflect-2.13.11.jar seatunnel-scala-compiler-2.3.13-SNAPSHOT-optional.jar seatunnel-jackson-2.3.13-SNAPSHOT-optional.jar seatunnel-guava-2.3.13-SNAPSHOT-optional.jar -seatunnel-hazelcast-shade-2.3.13-SNAPSHOT-optional.jar seatunnel-commons-lang3-2.3.13-SNAPSHOT-optional.jar +seatunnel-hazelcast-2.3.13-SNAPSHOT-optional.jar slf4j-api-1.7.36.jar jsqlparser-4.9.jar animal-sniffer-annotations-1.17.jar