Improve Spotless integration

Author: vy

pom.xml

@@ -206,54 +206,63 @@
         </executions>
       </plugin>
 
-  <!-- Configuration here must match the one in `.editorconfig`! -->
-  <plugin>
-    <groupId>com.diffplug.spotless</groupId>
-    <artifactId>spotless-maven-plugin</artifactId>
-    <executions>
-      <execution>
-        <id>default-spotless</id>
-        <phase>verify</phase>
-        <goals>
-          <goal>check</goal>
-        </goals>
-      </execution>
-    </executions>
-    <configuration>
-      <ratchetFrom>HEAD~31</ratchetFrom>
-      <java>
-        <importOrder>
-          <order>java,javax,org.apache.logging,,\#java,\#javax,\#org.apache.logging,\#</order>
-        </importOrder>
-      </java>
-    </configuration>
-  </plugin>
+      <!-- Configuration here must match the one in `.editorconfig`! -->
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-spotless</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <java>
+            <licenseHeader>
+              <file>${maven.multiModuleProjectDirectory}/spotless-license-header.txt</file>
+            </licenseHeader>
+            <trimTrailingWhitespace/>
+            <endWithNewline/>
+            <removeUnusedImports/>
+            <indent>
+              <spaces>true</spaces>
+              <spacesPerTab>4</spacesPerTab>
+            </indent>
+            <importOrder>
+              <order>java,javax,org.apache.logging,,\#java,\#javax,\#org.apache.logging,\#</order>
+            </importOrder>
+          </java>
+        </configuration>
+      </plugin>
 
-  <plugin>
-    <groupId>com.github.spotbugs</groupId>
-    <artifactId>spotbugs-maven-plugin</artifactId>
-    <executions>
-      <execution>
-        <id>default-spotbugs</id>
-        <phase>verify</phase>
-        <goals>
-          <goal>check</goal>
-        </goals>
-      </execution>
-    </executions>
-    <configuration>
-      <plugins>
-        <plugin>
-          <groupId>com.h3xstream.findsecbugs</groupId>
-          <artifactId>findsecbugs-plugin</artifactId>
-          <version>${findsecbugs-plugin.version}</version>
-        </plugin>
-      </plugins>
-    </configuration>
-  </plugin>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-spotbugs</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <plugins>
+            <plugin>
+              <groupId>com.h3xstream.findsecbugs</groupId>
+              <artifactId>findsecbugs-plugin</artifactId>
+              <version>${findsecbugs-plugin.version}</version>
+            </plugin>
+          </plugins>
+        </configuration>
+      </plugin>
 
-</plugins>
+    </plugins>
 
-</build>
+  </build>
 
 </project>

spotless-license-header.txt

@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */