hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Update compiler plugin, use "release" option, adjust java.version properties

Browse Source 
No need for the toolchain plugin anymore
This commit is contained in:
Andreas Dangel 2017-09-23 19:24:17 +02:00
parent df87db8d7a
commit ade0d7d029
5 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmd-apex/pom.xml
View File

@ -13,7 +13,7 @@
<properties>
<config.basedir>${basedir}/../pmd-core</config.basedir>
<java.version>1.8</java.version>
<java.version>8</java.version>
</properties>
<build>

2
pmd-doc/pom.xml
View File

@ -12,7 +12,7 @@
</parent>
<properties>
<java.version>1.8</java.version>
<java.version>8</java.version>
<config.basedir>${basedir}/../pmd-core</config.basedir>
</properties>

2
pmd-java8/pom.xml
View File

@ -12,7 +12,7 @@
<properties>
<config.basedir>${basedir}/../pmd-core</config.basedir>
<java.version>1.8</java.version>
<java.version>8</java.version>
</properties>
<build>

2
pmd-ui/pom.xml
View File

@ -12,7 +12,7 @@
<properties>
<config.basedir>${basedir}/../pmd-core</config.basedir>
<java.version>1.8</java.version>
<java.version>8</java.version>
</properties>
<dependencies>

38
pom.xml
View File

@ -259,7 +259,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
<surefire.version>2.18.1</surefire.version>
<checkstyle.version>2.17</checkstyle.version>
<pmd.plugin.version>3.8</pmd.plugin.version>
<java.version>1.7</java.version>
<java.version>7</java.version>
<ant.version>1.9.6</ant.version>
<javadoc.plugin.version>3.0.0-M1</javadoc.plugin.version>
<antlr.version>4.5.2-1</antlr.version>
@ -346,10 +346,9 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>3.7.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<release>${java.version}</release>
</configuration>
</plugin>
<plugin>
@ -386,25 +385,6 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
<runOrder>alphabetical</runOrder>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<goals>
<goal>toolchain</goal>
</goals>
</execution>
</executions>
<configuration>
<toolchains>
<jdk>
<version>${java.version}</version>
</jdk>
</toolchains>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@ -512,7 +492,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
</executions>
<configuration>
<minimumTokens>100</minimumTokens>
<targetJdk>${java.version}</targetJdk>
<targetJdk>1.${java.version}</targetJdk>
<rulesets>
<ruleset>${pmd.dogfood.ruleset}</ruleset>
</rulesets>
@ -555,10 +535,6 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
</sourceDirectories>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@ -629,7 +605,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
<configuration>
<linkXref>true</linkXref>
<minimumTokens>100</minimumTokens>
<targetJdk>${java.version}</targetJdk>
<targetJdk>1.${java.version}</targetJdk>
<rulesets>
<ruleset>${pmd.dogfood.ruleset}</ruleset>
</rulesets>
@ -917,7 +893,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
<profile>
<id>jdk9-disabled</id>
<activation>
<jdk>!1.9</jdk>
<jdk>!9</jdk>
</activation>
<modules>
<!--
@ -932,7 +908,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
<profile>
<id>doclint</id>
<properties>
<java.version>1.8</java.version>
<java.version>8</java.version>
</properties>
<build>
<pluginManagement>