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

crazyhzm pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new 1a24e72653 Support spotless (#13311)
1a24e72653 is described below

commit 1a24e726534cb5efe3b42ca3d920bb6ce3ca6df7
Author: huazhongming <[email protected]>
AuthorDate: Mon Nov 6 19:21:13 2023 +0800

    Support spotless (#13311)
    
    Signed-off-by: crazyhzm <[email protected]>
---
 dubbo-build-tools/pom.xml                          | 60 ++++++++++++++++++++-
 dubbo-dependencies-bom/pom.xml                     | 55 +++++++++++++++++++
 .../dubbo-dependencies-zookeeper-curator5/pom.xml  | 55 +++++++++++++++++++
 .../dubbo-dependencies-zookeeper/pom.xml           | 55 +++++++++++++++++++
 dubbo-dependencies/pom.xml                         | 61 ++++++++++++++++++++++
 dubbo-distribution/pom.xml                         | 58 ++++++++++++++++++++
 pom.xml                                            | 56 ++++++++++++++++++++
 7 files changed, 399 insertions(+), 1 deletion(-)

diff --git a/dubbo-build-tools/pom.xml b/dubbo-build-tools/pom.xml
index 28bae806b1..330a06ff63 100644
--- a/dubbo-build-tools/pom.xml
+++ b/dubbo-build-tools/pom.xml
@@ -25,6 +25,64 @@
 
     <properties>
       <maven.deploy.skip>true</maven.deploy.skip>
+        <spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
+        <spotless.action>check</spotless.action>
+        <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     </properties>
 
-</project>
\ No newline at end of file
+    <profiles>
+        <profile>
+            <id>java11+</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <build>
+                <!--- newer versions of plugins requires JDK 11 -->
+                <plugins>
+                    <plugin>
+                        <groupId>com.diffplug.spotless</groupId>
+                        <artifactId>spotless-maven-plugin</artifactId>
+                        <version>${spotless-maven-plugin.version}</version>
+                        <configuration>
+                            <java>
+                                <palantirJavaFormat />
+                                <removeUnusedImports />
+                                <importOrder>
+                                    <file>dubbo-importorder.txt</file>
+                                </importOrder>
+                                <licenseHeader>
+                                    <file>checkstyle-header.txt</file>
+                                </licenseHeader>
+                            </java>
+                            <pom>
+                                <sortPom>
+                                    
<expandEmptyElements>false</expandEmptyElements>
+                                    
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+                                </sortPom>
+                            </pom>
+                            <upToDateChecking>
+                                <enabled>true</enabled>
+                            </upToDateChecking>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.alibaba</groupId>
+                                <artifactId>dubbo-shared-resources</artifactId>
+                                
<version>${dubbo-shared-resources.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>${spotless.action}</goal>
+                                </goals>
+                                <phase>process-sources</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 1d4eb22bbc..c0c6dadbc0 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -189,6 +189,9 @@
         <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.action>check</spotless.action>
+        <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
         <revision>3.2.8-SNAPSHOT</revision>
     </properties>
 
@@ -951,6 +954,58 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>java11+</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <build>
+                <!--- newer versions of plugins requires JDK 11 -->
+                <plugins>
+                    <plugin>
+                        <groupId>com.diffplug.spotless</groupId>
+                        <artifactId>spotless-maven-plugin</artifactId>
+                        <version>${spotless-maven-plugin.version}</version>
+                        <configuration>
+                            <java>
+                                <palantirJavaFormat />
+                                <removeUnusedImports />
+                                <importOrder>
+                                    <file>dubbo-importorder.txt</file>
+                                </importOrder>
+                                <licenseHeader>
+                                    <file>checkstyle-header.txt</file>
+                                </licenseHeader>
+                            </java>
+                            <pom>
+                                <sortPom>
+                                    
<expandEmptyElements>false</expandEmptyElements>
+                                    
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+                                </sortPom>
+                            </pom>
+                            <upToDateChecking>
+                                <enabled>true</enabled>
+                            </upToDateChecking>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.alibaba</groupId>
+                                <artifactId>dubbo-shared-resources</artifactId>
+                                
<version>${dubbo-shared-resources.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>${spotless.action}</goal>
+                                </goals>
+                                <phase>process-sources</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml 
b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index 59cf066012..2fa1c058fb 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@ -36,6 +36,9 @@
         <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.action>check</spotless.action>
+        <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     </properties>
 
     <dependencyManagement>
@@ -164,5 +167,57 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>java11+</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <build>
+                <!--- newer versions of plugins requires JDK 11 -->
+                <plugins>
+                    <plugin>
+                        <groupId>com.diffplug.spotless</groupId>
+                        <artifactId>spotless-maven-plugin</artifactId>
+                        <version>${spotless-maven-plugin.version}</version>
+                        <configuration>
+                            <java>
+                                <palantirJavaFormat />
+                                <removeUnusedImports />
+                                <importOrder>
+                                    <file>dubbo-importorder.txt</file>
+                                </importOrder>
+                                <licenseHeader>
+                                    <file>checkstyle-header.txt</file>
+                                </licenseHeader>
+                            </java>
+                            <pom>
+                                <sortPom>
+                                    
<expandEmptyElements>false</expandEmptyElements>
+                                    
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+                                </sortPom>
+                            </pom>
+                            <upToDateChecking>
+                                <enabled>true</enabled>
+                            </upToDateChecking>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.alibaba</groupId>
+                                <artifactId>dubbo-shared-resources</artifactId>
+                                
<version>${dubbo-shared-resources.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>${spotless.action}</goal>
+                                </goals>
+                                <phase>process-sources</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml 
b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index 9bec810105..4a8b23fc99 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -36,6 +36,9 @@
         <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.action>check</spotless.action>
+        <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     </properties>
 
     <dependencies>
@@ -101,5 +104,57 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>java11+</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <build>
+                <!--- newer versions of plugins requires JDK 11 -->
+                <plugins>
+                    <plugin>
+                        <groupId>com.diffplug.spotless</groupId>
+                        <artifactId>spotless-maven-plugin</artifactId>
+                        <version>${spotless-maven-plugin.version}</version>
+                        <configuration>
+                            <java>
+                                <palantirJavaFormat />
+                                <removeUnusedImports />
+                                <importOrder>
+                                    <file>dubbo-importorder.txt</file>
+                                </importOrder>
+                                <licenseHeader>
+                                    <file>checkstyle-header.txt</file>
+                                </licenseHeader>
+                            </java>
+                            <pom>
+                                <sortPom>
+                                    
<expandEmptyElements>false</expandEmptyElements>
+                                    
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+                                </sortPom>
+                            </pom>
+                            <upToDateChecking>
+                                <enabled>true</enabled>
+                            </upToDateChecking>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.alibaba</groupId>
+                                <artifactId>dubbo-shared-resources</artifactId>
+                                
<version>${dubbo-shared-resources.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>${spotless.action}</goal>
+                                </goals>
+                                <phase>process-sources</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/dubbo-dependencies/pom.xml b/dubbo-dependencies/pom.xml
index d8b8b978a4..80ac682e25 100644
--- a/dubbo-dependencies/pom.xml
+++ b/dubbo-dependencies/pom.xml
@@ -31,6 +31,12 @@
         <module>dubbo-dependencies-zookeeper-curator5</module>
     </modules>
 
+    <properties>
+        <spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
+        <spotless.action>check</spotless.action>
+        <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -61,4 +67,59 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>java11+</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <build>
+                <!--- newer versions of plugins requires JDK 11 -->
+                <plugins>
+                    <plugin>
+                        <groupId>com.diffplug.spotless</groupId>
+                        <artifactId>spotless-maven-plugin</artifactId>
+                        <version>${spotless-maven-plugin.version}</version>
+                        <configuration>
+                            <java>
+                                <palantirJavaFormat />
+                                <removeUnusedImports />
+                                <importOrder>
+                                    <file>dubbo-importorder.txt</file>
+                                </importOrder>
+                                <licenseHeader>
+                                    <file>checkstyle-header.txt</file>
+                                </licenseHeader>
+                            </java>
+                            <pom>
+                                <sortPom>
+                                    
<expandEmptyElements>false</expandEmptyElements>
+                                    
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+                                </sortPom>
+                            </pom>
+                            <upToDateChecking>
+                                <enabled>true</enabled>
+                            </upToDateChecking>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.alibaba</groupId>
+                                <artifactId>dubbo-shared-resources</artifactId>
+                                
<version>${dubbo-shared-resources.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>${spotless.action}</goal>
+                                </goals>
+                                <phase>process-sources</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/dubbo-distribution/pom.xml b/dubbo-distribution/pom.xml
index a28d3f426d..d71d2a70ba 100644
--- a/dubbo-distribution/pom.xml
+++ b/dubbo-distribution/pom.xml
@@ -28,6 +28,12 @@
     <artifactId>dubbo-distribution</artifactId>
     <packaging>pom</packaging>
 
+    <properties>
+        <spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
+        <spotless.action>check</spotless.action>
+        <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
+    </properties>
+
     <profiles>
         <profile>
             <id>release</id>
@@ -54,5 +60,57 @@
                 <module>dubbo-core-spi</module>
             </modules>
         </profile>
+        <profile>
+            <id>java11+</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <build>
+                <!--- newer versions of plugins requires JDK 11 -->
+                <plugins>
+                    <plugin>
+                        <groupId>com.diffplug.spotless</groupId>
+                        <artifactId>spotless-maven-plugin</artifactId>
+                        <version>${spotless-maven-plugin.version}</version>
+                        <configuration>
+                            <java>
+                                <palantirJavaFormat />
+                                <removeUnusedImports />
+                                <importOrder>
+                                    <file>dubbo-importorder.txt</file>
+                                </importOrder>
+                                <licenseHeader>
+                                    <file>checkstyle-header.txt</file>
+                                </licenseHeader>
+                            </java>
+                            <pom>
+                                <sortPom>
+                                    
<expandEmptyElements>false</expandEmptyElements>
+                                    
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+                                </sortPom>
+                            </pom>
+                            <upToDateChecking>
+                                <enabled>true</enabled>
+                            </upToDateChecking>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.alibaba</groupId>
+                                <artifactId>dubbo-shared-resources</artifactId>
+                                
<version>${dubbo-shared-resources.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>${spotless.action}</goal>
+                                </goals>
+                                <phase>process-sources</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 5bca8f2c90..98bf6659d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,9 @@
         <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.action>check</spotless.action>
+        <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
         <revision>3.2.8-SNAPSHOT</revision>
     </properties>
 
@@ -605,6 +608,59 @@
                 <maven_jacoco_version>0.8.9</maven_jacoco_version>
             </properties>
         </profile>
+
+        <profile>
+            <id>java11+</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <build>
+                <!--- newer versions of plugins requires JDK 11 -->
+                <plugins>
+                    <plugin>
+                        <groupId>com.diffplug.spotless</groupId>
+                        <artifactId>spotless-maven-plugin</artifactId>
+                        <version>${spotless-maven-plugin.version}</version>
+                        <configuration>
+                            <java>
+                                <palantirJavaFormat />
+                                <removeUnusedImports />
+                                <importOrder>
+                                    <file>dubbo-importorder.txt</file>
+                                </importOrder>
+                                <licenseHeader>
+                                    <file>checkstyle-header.txt</file>
+                                </licenseHeader>
+                            </java>
+                            <pom>
+                                <sortPom>
+                                    
<expandEmptyElements>false</expandEmptyElements>
+                                    
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+                                </sortPom>
+                            </pom>
+                            <upToDateChecking>
+                                <enabled>true</enabled>
+                            </upToDateChecking>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.alibaba</groupId>
+                                <artifactId>dubbo-shared-resources</artifactId>
+                                
<version>${dubbo-shared-resources.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>${spotless.action}</goal>
+                                </goals>
+                                <phase>process-sources</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <build>

Reply via email to