This is an automated email from the ASF dual-hosted git repository.

davidzollo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/seatunnel-shade.git


The following commit(s) were added to refs/heads/main by this push:
     new 89ce9a6  [Fix][Shade] Prepare Hadoop Uber 3.1.4-3.0.1 with Jackson 
2.15.4 (#25)
89ce9a6 is described below

commit 89ce9a69539b477f2911d6dde5024f7d2167f202
Author: zhiweiniu <[email protected]>
AuthorDate: Mon Nov 9 18:42:30 2026 +0800

    [Fix][Shade] Prepare Hadoop Uber 3.1.4-3.0.1 with Jackson 2.15.4 (#25)
---
 pom.xml                                            |  6 +--
 seatunnel-shade-arrow/pom.xml                      |  2 +-
 seatunnel-shade-calcite/pom.xml                    |  2 +-
 seatunnel-shade-commons-lang3/pom.xml              |  2 +-
 seatunnel-shade-guava/pom.xml                      |  2 +-
 seatunnel-shade-hadoop-aws/pom.xml                 |  2 +-
 seatunnel-shade-hadoop3-uber/pom.xml               |  2 +-
 seatunnel-shade-hazelcast/pom.xml                  | 51 +++++++++++++++---
 .../internal/cluster/impl/MembershipManager.java   |  1 +
 .../src/main/resources/META-INF/THIRD-PARTY.txt    | 62 ++++++++++++++++++++++
 seatunnel-shade-hikari/pom.xml                     |  2 +-
 seatunnel-shade-jackson-yaml/pom.xml               |  2 +-
 seatunnel-shade-jackson/pom.xml                    |  2 +-
 seatunnel-shade-janino/pom.xml                     |  2 +-
 seatunnel-shade-jetty/pom.xml                      |  2 +-
 seatunnel-shade-scala-compiler/pom.xml             |  2 +-
 seatunnel-shade-thrift-service/pom.xml             |  2 +-
 17 files changed, 122 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index c39135f..bb0f999 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.seatunnel</groupId>
     <artifactId>seatunnel-shade</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <packaging>pom</packaging>
     <name>SeaTunnel : Shade :</name>
 
@@ -88,12 +88,12 @@
         
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
         
<maven-scm-provider-jgit.version>1.9.5</maven-scm-provider-jgit.version>
         
<seatunnel.shade.package>org.apache.seatunnel.shade</seatunnel.shade.package>
-        <seatunnel.shade.version>3.0.0</seatunnel.shade.version>
+        <seatunnel.shade.version>3.0.1</seatunnel.shade.version>
         <jackson.version>2.15.4</jackson.version>
         <arrow.version>15.0.1</arrow.version>
         <enableSourceJarCreation>true</enableSourceJarCreation>
         <!--  SeaTunnel Engine use     -->
-        <hazelcast.version>5.1</hazelcast.version>
+        <hazelcast.version>5.1.7</hazelcast.version>
         <hadoop-aws.version>3.1.4</hadoop-aws.version>
         <hadoop3.version>3.1.4</hadoop3.version>
         <guava.version>27.0-jre</guava.version>
diff --git a/seatunnel-shade-arrow/pom.xml b/seatunnel-shade-arrow/pom.xml
index 500937f..35d8727 100644
--- a/seatunnel-shade-arrow/pom.xml
+++ b/seatunnel-shade-arrow/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-arrow</artifactId>
diff --git a/seatunnel-shade-calcite/pom.xml b/seatunnel-shade-calcite/pom.xml
index 4b46c3d..b378329 100644
--- a/seatunnel-shade-calcite/pom.xml
+++ b/seatunnel-shade-calcite/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-calcite</artifactId>
diff --git a/seatunnel-shade-commons-lang3/pom.xml 
b/seatunnel-shade-commons-lang3/pom.xml
index 4007471..708b4cd 100644
--- a/seatunnel-shade-commons-lang3/pom.xml
+++ b/seatunnel-shade-commons-lang3/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-commons-lang3</artifactId>
diff --git a/seatunnel-shade-guava/pom.xml b/seatunnel-shade-guava/pom.xml
index 94408a1..27c00bf 100644
--- a/seatunnel-shade-guava/pom.xml
+++ b/seatunnel-shade-guava/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-guava</artifactId>
diff --git a/seatunnel-shade-hadoop-aws/pom.xml 
b/seatunnel-shade-hadoop-aws/pom.xml
index cd56fa7..7397f60 100644
--- a/seatunnel-shade-hadoop-aws/pom.xml
+++ b/seatunnel-shade-hadoop-aws/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-hadoop-aws</artifactId>
diff --git a/seatunnel-shade-hadoop3-uber/pom.xml 
b/seatunnel-shade-hadoop3-uber/pom.xml
index 70c34da..3f965c1 100644
--- a/seatunnel-shade-hadoop3-uber/pom.xml
+++ b/seatunnel-shade-hadoop3-uber/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-hadoop3-uber</artifactId>
diff --git a/seatunnel-shade-hazelcast/pom.xml 
b/seatunnel-shade-hazelcast/pom.xml
index 27420f1..00d26dc 100644
--- a/seatunnel-shade-hazelcast/pom.xml
+++ b/seatunnel-shade-hazelcast/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-hazelcast</artifactId>
@@ -49,6 +49,39 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-hazelcast-json-metadata</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <skip>false</skip>
+                            <includeGroupIds>com.hazelcast</includeGroupIds>
+                            <includeArtifactIds>hazelcast</includeArtifactIds>
+                            
<includes>META-INF/maven/org.json/json/pom.properties</includes>
+                            
<outputDirectory>${project.build.directory}/hazelcast-${hazelcast.version}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -60,13 +93,11 @@
                     
<createDependencyReducedPom>false</createDependencyReducedPom>
                     <filters>
                         <filter>
-                            <artifact>com.typesafe:config</artifact>
-                            <includes>
-                                <include>**</include>
-                            </includes>
+                            <artifact>com.hazelcast:hazelcast</artifact>
                             <excludes>
                                 <exclude>META-INF/MANIFEST.MF</exclude>
-                                <exclude>META-INF/NOTICE</exclude>
+                                <exclude>META-INF/THIRD-PARTY.txt</exclude>
+                                <exclude>THIRD-PARTY.txt</exclude>
                                 
<exclude>com/hazelcast/internal/cluster/impl/MembershipManager.class</exclude>
                                 
<exclude>com/hazelcast/internal/cluster/impl/MemberMap.class</exclude>
                                 
<exclude>com/hazelcast/internal/cluster/impl/ClusterServiceImpl.class</exclude>
@@ -74,9 +105,13 @@
                             </excludes>
                         </filter>
                     </filters>
-                    <transformers>
-                        <transformer 
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"
 />
+                    <transformers combine.self="override">
                         <transformer 
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"
 />
+                        <!-- Preserve the embedded JSON-java version despite 
the shared Maven metadata filter. -->
+                        <transformer 
implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                            
<resource>META-INF/maven/org.json/json/pom.properties</resource>
+                            
<file>${project.build.directory}/hazelcast-${hazelcast.version}/META-INF/maven/org.json/json/pom.properties</file>
+                        </transformer>
                     </transformers>
                 </configuration>
                 <executions>
diff --git 
a/seatunnel-shade-hazelcast/src/main/java/com/hazelcast/internal/cluster/impl/MembershipManager.java
 
b/seatunnel-shade-hazelcast/src/main/java/com/hazelcast/internal/cluster/impl/MembershipManager.java
index 8a8957e..f5090c8 100644
--- 
a/seatunnel-shade-hazelcast/src/main/java/com/hazelcast/internal/cluster/impl/MembershipManager.java
+++ 
b/seatunnel-shade-hazelcast/src/main/java/com/hazelcast/internal/cluster/impl/MembershipManager.java
@@ -399,6 +399,7 @@ public class MembershipManager {
         }
 
         for (MemberImpl member : removedMembers) {
+            clusterService.getClusterJoinManager().addLeftMember(member);
             closeConnections(member.getAddress(), "Member left event received 
from master");
             handleMemberRemove(memberMapRef.get(), member);
         }
diff --git 
a/seatunnel-shade-hazelcast/src/main/resources/META-INF/THIRD-PARTY.txt 
b/seatunnel-shade-hazelcast/src/main/resources/META-INF/THIRD-PARTY.txt
new file mode 100644
index 0000000..6354953
--- /dev/null
+++ b/seatunnel-shade-hazelcast/src/main/resources/META-INF/THIRD-PARTY.txt
@@ -0,0 +1,62 @@
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Hazelcast 5.1.7 third-party dependencies
+
+This inventory follows META-INF/THIRD-PARTY.txt in
+com.hazelcast:hazelcast:5.1.7. It lists the licenses that apply to
+the bundled dependencies. The JSON-java attribution uses its Maven
+coordinate and the license of the bundled release.
+
+List of third-party dependencies grouped by their license type:
+
+Apache License, Version 2.0 (see META-INF/LICENSE)
+  Jackson-annotations:2.15.2
+  Jackson-core:2.15.2
+  jackson-jr-annotation-support:2.15.2
+  jackson-jr-objects:2.15.2
+  everit-json-schema:1.14.2
+  Objenesis:3.2
+  SnakeYAML Engine:2.3
+MIT License (see the ClassGraph license below)
+  ClassGraph:4.8.139
+Public Domain
+  JSON-java (org.json:json:20230227)
+  https://github.com/stleary/JSON-java/blob/20230227/LICENSE
+  Public Domain.
+
+ClassGraph license
+
+The MIT License (MIT)
+
+Copyright (c) 2019 Luke Hutchison
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/seatunnel-shade-hikari/pom.xml b/seatunnel-shade-hikari/pom.xml
index abdeb89..3fb7a80 100644
--- a/seatunnel-shade-hikari/pom.xml
+++ b/seatunnel-shade-hikari/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-hikari</artifactId>
diff --git a/seatunnel-shade-jackson-yaml/pom.xml 
b/seatunnel-shade-jackson-yaml/pom.xml
index 57b735c..88c4e04 100644
--- a/seatunnel-shade-jackson-yaml/pom.xml
+++ b/seatunnel-shade-jackson-yaml/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-jackson-yaml</artifactId>
diff --git a/seatunnel-shade-jackson/pom.xml b/seatunnel-shade-jackson/pom.xml
index 9bbf670..b0cbd80 100644
--- a/seatunnel-shade-jackson/pom.xml
+++ b/seatunnel-shade-jackson/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-jackson</artifactId>
diff --git a/seatunnel-shade-janino/pom.xml b/seatunnel-shade-janino/pom.xml
index 9bb5de6..47f2907 100644
--- a/seatunnel-shade-janino/pom.xml
+++ b/seatunnel-shade-janino/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-janino</artifactId>
diff --git a/seatunnel-shade-jetty/pom.xml b/seatunnel-shade-jetty/pom.xml
index 9509d89..886fbe3 100644
--- a/seatunnel-shade-jetty/pom.xml
+++ b/seatunnel-shade-jetty/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-jetty</artifactId>
diff --git a/seatunnel-shade-scala-compiler/pom.xml 
b/seatunnel-shade-scala-compiler/pom.xml
index b09986d..a9d9aa2 100644
--- a/seatunnel-shade-scala-compiler/pom.xml
+++ b/seatunnel-shade-scala-compiler/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <properties>
diff --git a/seatunnel-shade-thrift-service/pom.xml 
b/seatunnel-shade-thrift-service/pom.xml
index 95cbd55..04d8954 100644
--- a/seatunnel-shade-thrift-service/pom.xml
+++ b/seatunnel-shade-thrift-service/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-shade</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>seatunnel-shade-thrift-service</artifactId>

Reply via email to