Skip to content

Commit feb31fa

Browse files
committed
Upgrading spotless and switching to Palantir
1 parent 84f2fc0 commit feb31fa

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

geowebcache/checkstyle.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,15 @@
2020
<module name="RegexpHeader">
2121
<!-- This checks the beginning of the header as we have multiple header styles with a common start -->
2222
<property name="header" value="^/\*\*$\n^
23-
\* This program is free software: you can redistribute it and/or modify it under the terms of the$\n^
24-
\* GNU Lesser General Public License as published by the Free Software Foundation, either version 3$$\n^
25-
\* of the License, or \(at your option\) any later version.$\n^
23+
\* This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General$\n^
24+
\* Public License as published by the Free Software Foundation, either version 3 of the License, or \(at your option\) any$\n^
25+
\* later version.$\n^
2626
\*$\n^
27-
\* &lt;p&gt;This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;$\n^
28-
\* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the$\n^
29-
\* GNU General Public License for more details.$\n^
27+
\* &lt;p&gt;This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied$\n^
28+
\* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.$\n^
3029
\*$\n^
31-
\* &lt;p&gt;You should have received a copy of the GNU Lesser General Public License along with this$\n^
32-
\* program. If not, see &lt;http://www.gnu.org/licenses/&gt;.$\n^
30+
\* &lt;p&gt;You should have received a copy of the GNU Lesser General Public License along with this program. If not, see$\n^
31+
\* &lt;http://www.gnu.org/licenses/&gt;.$\n^
3332
\*$\n^
3433
\*.*\d{4}.*$"/>
3534
<property name="fileExtensions" value="java"/>

geowebcache/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@
672672
<plugin>
673673
<groupId>com.diffplug.spotless</groupId>
674674
<artifactId>spotless-maven-plugin</artifactId>
675-
<version>2.20.0</version>
675+
<version>2.43.0</version>
676676
<executions>
677677
<execution>
678678
<phase>validate</phase>
@@ -683,10 +683,10 @@
683683
</executions>
684684
<configuration>
685685
<java>
686-
<googleJavaFormat>
687-
<version>1.7</version>
688-
<style>AOSP</style>
689-
</googleJavaFormat>
686+
<palantirJavaFormat>
687+
<version>2.50.0</version>
688+
<formatJavadoc>true</formatJavadoc>
689+
</palantirJavaFormat>
690690
</java>
691691
<upToDateChecking>
692692
<enabled>true</enabled>

0 commit comments

Comments
 (0)