From 7d4603a148ec137570cc353c2990b04fb9bdd961 Mon Sep 17 00:00:00 2001
From: "xiao.lu" <xiao.lu888@qq.com>
Date: Thu, 26 Sep 2024 09:28:41 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:shade=E6=97=B6=EF=BC=8C=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E6=8E=92=E9=99=A4=E6=A8=A1=E5=9D=97=E5=8C=96=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E6=96=87=E4=BB=B6=EF=BC=8C=E9=81=BF=E5=85=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=88=B0=E5=85=B6=E4=BB=96=E4=BE=9D=E8=B5=96=E7=9A=84?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/pom.xml | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index d1a32feb191..6012dd15411 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,24 +22,24 @@
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <artifactId>nacos-client</artifactId>
     <packaging>jar</packaging>
-    
+
     <name>nacos-client ${project.version}</name>
     <url>https://nacos.io</url>
     <description>Nacos client pom.xml file</description>
-    
+
     <dependencies>
-        
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <optional>true</optional>
         </dependency>
-    
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>nacos-api</artifactId>
@@ -50,57 +50,57 @@
             <artifactId>nacos-common</artifactId>
             <optional>true</optional>
         </dependency>
-    
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>nacos-auth-plugin</artifactId>
         </dependency>
-    
+
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-encryption-plugin</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-logback-adapter-12</artifactId>
         </dependency>
-    
+
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>logback-adapter</artifactId>
         </dependency>
-    
+
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-log4j2-adapter</artifactId>
         </dependency>
-        
+
         <dependency>
             <artifactId>commons-codec</artifactId>
             <groupId>commons-codec</groupId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpasyncclient</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient</artifactId>
@@ -115,7 +115,7 @@
             <artifactId>micrometer-core</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <pluginManagement>
             <plugins>
@@ -146,6 +146,7 @@
                                             <exclude>META-INF/*.SF</exclude>
                                             <exclude>META-INF/*.DSA</exclude>
                                             <exclude>META-INF/*.RSA</exclude>
+                                            <exclude>**/module-info.class</exclude>
                                         </excludes>
                                     </filter>
                                     <filter>

From 551ecebcdabebb28a39a00842c32eb21b057ea84 Mon Sep 17 00:00:00 2001
From: "xiao.lu" <xiao.lu888@qq.com>
Date: Fri, 27 Sep 2024 20:40:46 +0800
Subject: [PATCH 2/5] =?UTF-8?q?Revert=20"fix:shade=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=8E=92=E9=99=A4=E6=A8=A1=E5=9D=97=E5=8C=96?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=96=87=E4=BB=B6=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=88=B0=E5=85=B6=E4=BB=96=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E7=9A=84=E6=8F=8F=E8=BF=B0=E6=96=87=E4=BB=B6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7d4603a148ec137570cc353c2990b04fb9bdd961.
---
 client/pom.xml | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 6012dd15411..d1a32feb191 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,24 +22,24 @@
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
     <modelVersion>4.0.0</modelVersion>
-
+    
     <artifactId>nacos-client</artifactId>
     <packaging>jar</packaging>
-
+    
     <name>nacos-client ${project.version}</name>
     <url>https://nacos.io</url>
     <description>Nacos client pom.xml file</description>
-
+    
     <dependencies>
-
+        
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <optional>true</optional>
         </dependency>
-
+    
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>nacos-api</artifactId>
@@ -50,57 +50,57 @@
             <artifactId>nacos-common</artifactId>
             <optional>true</optional>
         </dependency>
-
+    
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>nacos-auth-plugin</artifactId>
         </dependency>
-
+    
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-encryption-plugin</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-logback-adapter-12</artifactId>
         </dependency>
-
+    
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>logback-adapter</artifactId>
         </dependency>
-
+    
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-log4j2-adapter</artifactId>
         </dependency>
-
+        
         <dependency>
             <artifactId>commons-codec</artifactId>
             <groupId>commons-codec</groupId>
         </dependency>
-
+        
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpasyncclient</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient</artifactId>
@@ -115,7 +115,7 @@
             <artifactId>micrometer-core</artifactId>
         </dependency>
     </dependencies>
-
+    
     <build>
         <pluginManagement>
             <plugins>
@@ -146,7 +146,6 @@
                                             <exclude>META-INF/*.SF</exclude>
                                             <exclude>META-INF/*.DSA</exclude>
                                             <exclude>META-INF/*.RSA</exclude>
-                                            <exclude>**/module-info.class</exclude>
                                         </excludes>
                                     </filter>
                                     <filter>

From e1fba9cd717ef9bba3786d5a42a28a633f7c16a8 Mon Sep 17 00:00:00 2001
From: "xiao.lu" <xiao.lu888@qq.com>
Date: Fri, 27 Sep 2024 20:46:05 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:shade=E6=97=B6=EF=BC=8C=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E6=8E=92=E9=99=A4=E6=A8=A1=E5=9D=97=E5=8C=96=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E6=96=87=E4=BB=B6=EF=BC=8C=E9=81=BF=E5=85=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=88=B0=E5=85=B6=E4=BB=96=E4=BE=9D=E8=B5=96=E7=9A=84?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/pom.xml | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index d1a32feb191..6012dd15411 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,24 +22,24 @@
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <artifactId>nacos-client</artifactId>
     <packaging>jar</packaging>
-    
+
     <name>nacos-client ${project.version}</name>
     <url>https://nacos.io</url>
     <description>Nacos client pom.xml file</description>
-    
+
     <dependencies>
-        
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <optional>true</optional>
         </dependency>
-    
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>nacos-api</artifactId>
@@ -50,57 +50,57 @@
             <artifactId>nacos-common</artifactId>
             <optional>true</optional>
         </dependency>
-    
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>nacos-auth-plugin</artifactId>
         </dependency>
-    
+
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-encryption-plugin</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-logback-adapter-12</artifactId>
         </dependency>
-    
+
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>logback-adapter</artifactId>
         </dependency>
-    
+
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-log4j2-adapter</artifactId>
         </dependency>
-        
+
         <dependency>
             <artifactId>commons-codec</artifactId>
             <groupId>commons-codec</groupId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpasyncclient</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient</artifactId>
@@ -115,7 +115,7 @@
             <artifactId>micrometer-core</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <pluginManagement>
             <plugins>
@@ -146,6 +146,7 @@
                                             <exclude>META-INF/*.SF</exclude>
                                             <exclude>META-INF/*.DSA</exclude>
                                             <exclude>META-INF/*.RSA</exclude>
+                                            <exclude>**/module-info.class</exclude>
                                         </excludes>
                                     </filter>
                                     <filter>

From f1baede62e5ae166e84172dab5af8139a4f91c37 Mon Sep 17 00:00:00 2001
From: "xiao.lu" <xiao.lu888@qq.com>
Date: Fri, 27 Sep 2024 20:49:44 +0800
Subject: [PATCH 4/5] =?UTF-8?q?Revert=20"fix:shade=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=8E=92=E9=99=A4=E6=A8=A1=E5=9D=97=E5=8C=96?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=96=87=E4=BB=B6=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=88=B0=E5=85=B6=E4=BB=96=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E7=9A=84=E6=8F=8F=E8=BF=B0=E6=96=87=E4=BB=B6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e1fba9cd717ef9bba3786d5a42a28a633f7c16a8.
---
 client/pom.xml | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 6012dd15411..d1a32feb191 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,24 +22,24 @@
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
     <modelVersion>4.0.0</modelVersion>
-
+    
     <artifactId>nacos-client</artifactId>
     <packaging>jar</packaging>
-
+    
     <name>nacos-client ${project.version}</name>
     <url>https://nacos.io</url>
     <description>Nacos client pom.xml file</description>
-
+    
     <dependencies>
-
+        
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <optional>true</optional>
         </dependency>
-
+    
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>nacos-api</artifactId>
@@ -50,57 +50,57 @@
             <artifactId>nacos-common</artifactId>
             <optional>true</optional>
         </dependency>
-
+    
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>nacos-auth-plugin</artifactId>
         </dependency>
-
+    
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-encryption-plugin</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-logback-adapter-12</artifactId>
         </dependency>
-
+    
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>logback-adapter</artifactId>
         </dependency>
-
+    
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-log4j2-adapter</artifactId>
         </dependency>
-
+        
         <dependency>
             <artifactId>commons-codec</artifactId>
             <groupId>commons-codec</groupId>
         </dependency>
-
+        
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpasyncclient</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient</artifactId>
@@ -115,7 +115,7 @@
             <artifactId>micrometer-core</artifactId>
         </dependency>
     </dependencies>
-
+    
     <build>
         <pluginManagement>
             <plugins>
@@ -146,7 +146,6 @@
                                             <exclude>META-INF/*.SF</exclude>
                                             <exclude>META-INF/*.DSA</exclude>
                                             <exclude>META-INF/*.RSA</exclude>
-                                            <exclude>**/module-info.class</exclude>
                                         </excludes>
                                     </filter>
                                     <filter>

From 89b40d14bde1adc7d2bc524ac988514e6b69903f Mon Sep 17 00:00:00 2001
From: "xiao.lu" <xiao.lu888@qq.com>
Date: Fri, 27 Sep 2024 20:52:28 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:shade=E6=97=B6=EF=BC=8C=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E6=8E=92=E9=99=A4=E6=A8=A1=E5=9D=97=E5=8C=96=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E6=96=87=E4=BB=B6=EF=BC=8C=E9=81=BF=E5=85=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=88=B0=E5=85=B6=E4=BB=96=E4=BE=9D=E8=B5=96=E7=9A=84?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/pom.xml b/client/pom.xml
index d1a32feb191..6bdd0db7408 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -146,6 +146,7 @@
                                             <exclude>META-INF/*.SF</exclude>
                                             <exclude>META-INF/*.DSA</exclude>
                                             <exclude>META-INF/*.RSA</exclude>
+                                            <exclude>**/module-info.class</exclude>
                                         </excludes>
                                     </filter>
                                     <filter>