Skip to content

Commit 6f945ce

Browse files
committed
Add Spotless JDK profiles and javadoc option
Add <additionalOptions>-Xdoclint:-missing</additionalOptions> to the Javadoc plugin configuration to suppress missing-doc doclint errors. Remove the top-level Spotless plugin and introduce two profiles that activate based on the JDK: spotless-jdk21 (for JDK 21+, uses ${version.google-java-format}) and spotless-jdk17 (for JDK 17–20, pins google-java-format to 1.28.0). This ensures Spotless/GJF runs with a compatible formatter version per JDK while preserving the existing check execution.
1 parent 06492af commit 6f945ce

1 file changed

Lines changed: 61 additions & 19 deletions

File tree

pom.xml

Lines changed: 61 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
<configuration>
127127
<legacyMode>true</legacyMode>
128128
<failOnError>true</failOnError>
129+
<additionalOptions>-Xdoclint:-missing</additionalOptions>
129130
</configuration>
130131
<executions>
131132
<execution>
@@ -149,29 +150,70 @@
149150
</execution>
150151
</executions>
151152
</plugin>
152-
<plugin>
153-
<groupId>com.diffplug.spotless</groupId>
154-
<artifactId>spotless-maven-plugin</artifactId>
155-
<version>${version.plugin.spotless}</version>
156-
<configuration>
157-
<java>
158-
<googleJavaFormat>
159-
<version>${version.google-java-format}</version>
160-
</googleJavaFormat>
161-
</java>
162-
</configuration>
163-
<executions>
164-
<execution>
165-
<goals>
166-
<goal>check</goal>
167-
</goals>
168-
</execution>
169-
</executions>
170-
</plugin>
171153
</plugins>
172154
</build>
173155

174156
<profiles>
157+
<profile>
158+
<!-- GJF 1.29+ requires JDK 21+ internal APIs; use latest on 21+ -->
159+
<id>spotless-jdk21</id>
160+
<activation>
161+
<jdk>[21,)</jdk>
162+
</activation>
163+
<build>
164+
<plugins>
165+
<plugin>
166+
<groupId>com.diffplug.spotless</groupId>
167+
<artifactId>spotless-maven-plugin</artifactId>
168+
<version>${version.plugin.spotless}</version>
169+
<configuration>
170+
<java>
171+
<googleJavaFormat>
172+
<version>${version.google-java-format}</version>
173+
</googleJavaFormat>
174+
</java>
175+
</configuration>
176+
<executions>
177+
<execution>
178+
<goals>
179+
<goal>check</goal>
180+
</goals>
181+
</execution>
182+
</executions>
183+
</plugin>
184+
</plugins>
185+
</build>
186+
</profile>
187+
<profile>
188+
<!-- GJF 1.28.0 is the last version that runs on JDK 17-20 -->
189+
<id>spotless-jdk17</id>
190+
<activation>
191+
<jdk>[17,21)</jdk>
192+
</activation>
193+
<build>
194+
<plugins>
195+
<plugin>
196+
<groupId>com.diffplug.spotless</groupId>
197+
<artifactId>spotless-maven-plugin</artifactId>
198+
<version>${version.plugin.spotless}</version>
199+
<configuration>
200+
<java>
201+
<googleJavaFormat>
202+
<version>1.28.0</version>
203+
</googleJavaFormat>
204+
</java>
205+
</configuration>
206+
<executions>
207+
<execution>
208+
<goals>
209+
<goal>check</goal>
210+
</goals>
211+
</execution>
212+
</executions>
213+
</plugin>
214+
</plugins>
215+
</build>
216+
</profile>
175217
<profile>
176218
<id>sign</id>
177219
<build>

0 commit comments

Comments
 (0)