diff --git a/geowebcache/checkstyle.xml b/geowebcache/checkstyle.xml
index 446a5a8d0..1207b7bae 100644
--- a/geowebcache/checkstyle.xml
+++ b/geowebcache/checkstyle.xml
@@ -20,16 +20,15 @@
   <module name="RegexpHeader">
     <!-- This checks the beginning of the header as we have multiple header styles with a common start -->
     <property name="header" value="^/\*\*$\n^
-\* This program is free software: you can redistribute it and/or modify it under the terms of the$\n^
-\* GNU Lesser General Public License as published by the Free Software Foundation, either version 3$$\n^
-\* of the License, or \(at your option\) any later version.$\n^
+\* This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General$\n^
+\* Public License as published by the Free Software Foundation, either version 3 of the License, or \(at your option\) any$\n^
+\* later version.$\n^
 \*$\n^
-\* &lt;p&gt;This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;$\n^
-\* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the$\n^
-\* GNU General Public License for more details.$\n^
+\* &lt;p&gt;This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied$\n^
+\* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.$\n^
 \*$\n^
-\* &lt;p&gt;You should have received a copy of the GNU Lesser General Public License along with this$\n^
-\* program. If not, see &lt;http://www.gnu.org/licenses/&gt;.$\n^
+\* &lt;p&gt;You should have received a copy of the GNU Lesser General Public License along with this program. If not, see$\n^
+\* &lt;http://www.gnu.org/licenses/&gt;.$\n^
 \*$\n^
 \*.*\d{4}.*$"/>
     <property name="fileExtensions" value="java"/>
diff --git a/geowebcache/pom.xml b/geowebcache/pom.xml
index 8fac3564a..ab4f5784b 100644
--- a/geowebcache/pom.xml
+++ b/geowebcache/pom.xml
@@ -720,7 +720,7 @@
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.20.0</version>
+        <version>2.43.0</version>
         <executions>
           <execution>
             <phase>validate</phase>
@@ -731,10 +731,10 @@
         </executions>
         <configuration>
           <java>
-            <googleJavaFormat>
-              <version>1.7</version>
-              <style>AOSP</style>
-            </googleJavaFormat>
+            <palantirJavaFormat>
+              <version>2.50.0</version>
+              <formatJavadoc>true</formatJavadoc>
+            </palantirJavaFormat>
           </java>
           <upToDateChecking>
             <enabled>true</enabled>