From c1ed5ca3823d9f3120627d1893cfa5cb90d7142a Mon Sep 17 00:00:00 2001
From: huazhongming <crazyhzm@gmail.com>
Date: Mon, 6 Nov 2023 20:13:12 +0800
Subject: [PATCH 1/2] spotless excludes licenseheader (#13319)

Signed-off-by: crazyhzm <crazyhzm@gmail.com>
---
 pom.xml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/pom.xml b/pom.xml
index 98bf6659d3..22c2e69620 100644
--- a/pom.xml
+++ b/pom.xml
@@ -623,6 +623,40 @@
                         <version>${spotless-maven-plugin.version}</version>
                         <configuration>
                             <java>
+                                <excludes>
+                                    <exclude>src/main/java/org/apache/dubbo/common/threadlocal/InternalThreadLocal.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalMap.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/common/timer/HashedWheelTimer.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/common/timer/Timeout.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/common/timer/Timer.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/common/timer/TimerTask.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/common/utils/CIDRUtils.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/common/utils/Utf8Utils.java</exclude>
+                                    <exclude>src/test/java/org/apache/dubbo/config/spring/EmbeddedZooKeeper.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/test/common/utils/TestSocketUtils.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/rpc/protocol/tri/TriHttp2RemoteFlowController.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/common/threadpool/serial/SerializingExecutor.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/AbstractAotMojo.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/AbstractDependencyFilterMojo.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/CommandLineBuilder.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/DependencyFilter.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/Exclude.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/ExcludeFilter.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/FilterableDependency.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/Include.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/IncludeFilter.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/JavaCompilerPluginConfiguration.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/JavaExecutable.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/JavaProcessExecutor.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/MatchingGroupIdFilter.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/RunArguments.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/RunProcess.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/aot/generate/BasicJsonWriter.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/aot/generate/ExecutableMode.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/aot/generate/MemberCategory.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/metrics/aggregate/DubboMergingDigest.java</exclude>
+                                    <exclude>src/main/java/org/apache/dubbo/metrics/aggregate/DubboAbstractTDigest.java</exclude>
+                                </excludes>
                                 <palantirJavaFormat />
                                 <removeUnusedImports />
                                 <importOrder>

From 04f134a16887b99d2578973fb8bc6f2a70311cbf Mon Sep 17 00:00:00 2001
From: crazyhzm <crazyhzm@gmail.com>
Date: Mon, 6 Nov 2023 20:18:10 +0800
Subject: [PATCH 2/2] Upgrade spotless version

Signed-off-by: crazyhzm <crazyhzm@gmail.com>
---
 dubbo-build-tools/pom.xml                                       | 2 +-
 dubbo-dependencies-bom/pom.xml                                  | 2 +-
 .../dubbo-dependencies-zookeeper-curator5/pom.xml               | 2 +-
 dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml         | 2 +-
 dubbo-dependencies/pom.xml                                      | 2 +-
 dubbo-distribution/pom.xml                                      | 2 +-
 pom.xml                                                         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dubbo-build-tools/pom.xml b/dubbo-build-tools/pom.xml
index 330a06ff63..07185557b6 100644
--- a/dubbo-build-tools/pom.xml
+++ b/dubbo-build-tools/pom.xml
@@ -25,7 +25,7 @@
 
     <properties>
       <maven.deploy.skip>true</maven.deploy.skip>
-        <spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
+        <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
         <spotless.action>check</spotless.action>
         <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     </properties>
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index c0c6dadbc0..302db996a9 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -189,7 +189,7 @@
         <portlet_version>2.0</portlet_version>
         <maven_flatten_version>1.5.0</maven_flatten_version>
         <commons_compress_version>1.23.0</commons_compress_version>
-        <spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
+        <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
         <spotless.action>check</spotless.action>
         <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
         <revision>3.2.8-SNAPSHOT</revision>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index 2fa1c058fb..ef72c10c0b 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@ -36,7 +36,7 @@
         <maven_flatten_version>1.5.0</maven_flatten_version>
         <curator5_version>5.1.0</curator5_version>
         <zookeeper_version>3.8.1</zookeeper_version>
-        <spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
+        <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
         <spotless.action>check</spotless.action>
         <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     </properties>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index 4a8b23fc99..68d1f1908f 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -36,7 +36,7 @@
         <maven_flatten_version>1.5.0</maven_flatten_version>
         <curator_version>4.3.0</curator_version>
         <zookeeper_version>3.4.14</zookeeper_version>
-        <spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
+        <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
         <spotless.action>check</spotless.action>
         <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     </properties>
diff --git a/dubbo-dependencies/pom.xml b/dubbo-dependencies/pom.xml
index 80ac682e25..9aee5b19e7 100644
--- a/dubbo-dependencies/pom.xml
+++ b/dubbo-dependencies/pom.xml
@@ -32,7 +32,7 @@
     </modules>
 
     <properties>
-        <spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
+        <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
         <spotless.action>check</spotless.action>
         <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     </properties>
diff --git a/dubbo-distribution/pom.xml b/dubbo-distribution/pom.xml
index d71d2a70ba..9a7edc14f4 100644
--- a/dubbo-distribution/pom.xml
+++ b/dubbo-distribution/pom.xml
@@ -29,7 +29,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
+        <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
         <spotless.action>check</spotless.action>
         <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     </properties>
diff --git a/pom.xml b/pom.xml
index 22c2e69620..8387166168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
         <jprotoc_version>1.2.2</jprotoc_version>
         <protobuf-java_version>3.22.3</protobuf-java_version>
         <grpc_version>1.54.0</grpc_version>
-        <spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
+        <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
         <spotless.action>check</spotless.action>
         <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
         <revision>3.2.8-SNAPSHOT</revision>