Skip to content

Commit c15093e

Browse files
liangyepianzhouxiangying
liangyepianzhou
and
xiangying
authored
[Build] Update Spotless configuration (apache#5)
* [Build] Update Spotless configuration * delete comment * delete endWithNewLine * Delete indentAttribute and add sort_order.xml * license * google-java-format.version --------- Co-authored-by: xiangying <[email protected]>
1 parent a033eb1 commit c15093e

File tree

13 files changed

+717
-46
lines changed

13 files changed

+717
-46
lines changed

‎pom.xml‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
limitations under the License.
1515
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1918
<modelVersion>4.0.0</modelVersion>
2019
<parent>
2120
<groupId>org.apache</groupId>
@@ -45,6 +44,7 @@
4544
<license-maven-plugin.version>4.5</license-maven-plugin.version>
4645
<org.testing.version>7.10.2</org.testing.version>
4746
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
47+
<google-java-format.version>1.10.0</google-java-format.version>
4848
</properties>
4949

5050
<modules>
@@ -130,10 +130,34 @@
130130
<configuration>
131131
<java>
132132
<googleJavaFormat>
133-
<version>1.7</version>
133+
<version>${google-java-format.version}</version>
134134
<style>GOOGLE</style>
135135
</googleJavaFormat>
136136
</java>
137+
<pom>
138+
<includes>
139+
<include>pom.xml</include>
140+
</includes>
141+
<sortPom>
142+
<encoding>UTF-8</encoding>
143+
<lineSeparator>${line.separator}</lineSeparator>
144+
<expandEmptyElements>true</expandEmptyElements>
145+
<spaceBeforeCloseEmptyElement>false</spaceBeforeCloseEmptyElement>
146+
<keepBlankLines>true</keepBlankLines>
147+
<nrOfIndentSpace>4</nrOfIndentSpace>
148+
<indentBlankLines>false</indentBlankLines>
149+
<indentSchemaLocation>false</indentSchemaLocation>
150+
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
151+
<sortOrderFile>./sort_order.xml</sortOrderFile>
152+
<sortDependencies>groupId,artifactId</sortDependencies>
153+
<sortDependencyManagement>true</sortDependencyManagement>
154+
<sortDependencyExclusions>groupId,artifactId</sortDependencyExclusions>
155+
<sortPlugins>groupId,artifactId</sortPlugins>
156+
<sortProperties>false</sortProperties>
157+
<sortModules>false</sortModules>
158+
<sortExecutions>false</sortExecutions>
159+
</sortPom>
160+
</pom>
137161
</configuration>
138162
<executions>
139163
<execution>
@@ -160,7 +184,8 @@
160184
<suppressionsLocation>./src/main/resources/suppressions.xml</suppressionsLocation>
161185
<includeTestSourceDirectory>true</includeTestSourceDirectory>
162186
<encoding>UTF-8</encoding>
163-
<excludes>**/*.proto</excludes> <!-- Example exclusion -->
187+
<excludes>**/*.proto</excludes>
188+
<!-- Example exclusion -->
164189
</configuration>
165190
<executions>
166191
<execution>

‎pulsar-auth-contrib/pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
limitations under the License.
1515
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0"
18-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2018
<modelVersion>4.0.0</modelVersion>
2119
<parent>
2220
<groupId>org.apache</groupId>
@@ -27,4 +25,4 @@
2725

2826
<artifactId>pulsar-auth-contrib</artifactId>
2927

30-
</project>
28+
</project>

‎pulsar-bookkeeper-contrib/pom.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
limitations under the License.
1515
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0"
18-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2018
<modelVersion>4.0.0</modelVersion>
2119
<parent>
2220
<groupId>org.apache</groupId>
@@ -27,5 +25,4 @@
2725

2826
<artifactId>pulsar-bookkeeper-contrib</artifactId>
2927

30-
31-
</project>
28+
</project>

‎pulsar-client-common-contrib/pom.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
limitations under the License.
1515
1616
-->
17-
18-
<project xmlns="http://maven.apache.org/POM/4.0.0"
19-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2118
<modelVersion>4.0.0</modelVersion>
2219

2320
<parent>
@@ -36,4 +33,4 @@
3633
</dependency>
3734
</dependencies>
3835

39-
</project>
36+
</project>

‎pulsar-client-common-contrib/src/main/java/org/apache/pulsar/client/api/impl/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
* See the License for the specific language governing permissions and
1212
* limitations under the License.
1313
*/
14-
package org.apache.pulsar.client.api.impl;
14+
package org.apache.pulsar.client.api.impl;

‎pulsar-client-common-contrib/src/main/java/org/apache/pulsar/client/api/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
* See the License for the specific language governing permissions and
1212
* limitations under the License.
1313
*/
14-
package org.apache.pulsar.client.api;
14+
package org.apache.pulsar.client.api;

‎pulsar-connector-contrib/pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
limitations under the License.
1515
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0"
18-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2018
<modelVersion>4.0.0</modelVersion>
2119
<parent>
2220
<groupId>org.apache</groupId>
@@ -26,4 +24,4 @@
2624
<inceptionYear>2024</inceptionYear>
2725

2826
<artifactId>pulsar-connector-contrib</artifactId>
29-
</project>
27+
</project>

‎pulsar-function-contrib/pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
limitations under the License.
1515
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0"
18-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2018
<modelVersion>4.0.0</modelVersion>
2119
<parent>
2220
<groupId>org.apache</groupId>
@@ -27,4 +25,4 @@
2725

2826
<artifactId>pulsar-function-contrib</artifactId>
2927

30-
</project>
28+
</project>

‎pulsar-interceptor-contrib/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
limitations under the License.
1515
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0"
18-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2018
<modelVersion>4.0.0</modelVersion>
2119
<parent>
2220
<groupId>org.apache</groupId>
@@ -27,6 +25,4 @@
2725

2826
<artifactId>pulsar-interceptor-contrib</artifactId>
2927

30-
31-
32-
</project>
28+
</project>

‎pulsar-loadbalance-contrib/pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
limitations under the License.
1515
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0"
18-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2018
<modelVersion>4.0.0</modelVersion>
2119
<parent>
2220
<groupId>org.apache</groupId>
@@ -27,4 +25,4 @@
2725

2826
<artifactId>pulsar-loadbalance-contrib</artifactId>
2927

30-
</project>
28+
</project>

0 commit comments

Comments
 (0)