Skip to content

Commit 71b2675

Browse files
committed
Make project Java 9 proof
1 parent 18881c5 commit 71b2675

File tree

2 files changed

+49
-2
lines changed

2 files changed

+49
-2
lines changed

pom.xml

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,11 @@ under the License.
273273
</excludes>
274274
</configuration>
275275
</plugin>
276+
<plugin>
277+
<groupId>org.apache.maven.plugins</groupId>
278+
<artifactId>maven-plugin-plugin</artifactId>
279+
<version>3.5</version>
280+
</plugin>
276281
</plugins>
277282
</pluginManagement>
278283
<plugins>
@@ -301,7 +306,6 @@ under the License.
301306
<plugin>
302307
<groupId>org.codehaus.mojo</groupId>
303308
<artifactId>animal-sniffer-maven-plugin</artifactId>
304-
<version>1.13</version>
305309
<configuration>
306310
<signature>
307311
<groupId>org.codehaus.mojo.signature</groupId>
@@ -322,6 +326,7 @@ under the License.
322326
<plugin>
323327
<groupId>org.codehaus.plexus</groupId>
324328
<artifactId>plexus-component-metadata</artifactId>
329+
<version>1.7.1</version>
325330
<executions>
326331
<execution>
327332
<goals>
@@ -392,6 +397,42 @@ under the License.
392397
</plugins>
393398
</reporting>
394399
</profile>
400+
401+
<profile>
402+
<id>jdk9</id>
403+
<activation>
404+
<jdk>[9,)</jdk>
405+
</activation>
406+
<build>
407+
<plugins>
408+
<plugin>
409+
<groupId>org.apache.maven.plugins</groupId>
410+
<artifactId>maven-enforcer-plugin</artifactId>
411+
<executions>
412+
<execution>
413+
<id>enforce-bytecode-version</id>
414+
<configuration>
415+
<rules>
416+
<enforceBytecodeVersion>
417+
<excludes>
418+
<exclude>javax.xml.bind:jaxb-api</exclude>
419+
</excludes>
420+
</enforceBytecodeVersion>
421+
</rules>
422+
</configuration>
423+
</execution>
424+
</executions>
425+
</plugin>
426+
</plugins>
427+
</build>
428+
<dependencies>
429+
<dependency>
430+
<groupId>javax.xml.bind</groupId>
431+
<artifactId>jaxb-api</artifactId>
432+
<version>2.3.0</version>
433+
</dependency>
434+
</dependencies>
435+
</profile>
395436
</profiles>
396437

397438
</project>

src/it/MCHECKSTYLE-332_cache-treewalker/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,19 @@
4141
<plugin>
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-checkstyle-plugin</artifactId>
44-
<version>@pom.version@</version>
44+
<version>@project.version@</version>
4545
<dependencies>
4646
<!-- force usage of 6.15, where the cacheFile property is in the TreeWalker module -->
4747
<dependency>
4848
<groupId>com.puppycrawl.tools</groupId>
4949
<artifactId>checkstyle</artifactId>
5050
<version>6.15</version>
51+
<exclusions>
52+
<exclusion>
53+
<groupId>com.sun</groupId>
54+
<artifactId>tools</artifactId>
55+
</exclusion>
56+
</exclusions>
5157
</dependency>
5258
</dependencies>
5359
</plugin>

0 commit comments

Comments
 (0)