Author: closettop_nightlybuild Date: 2012-12-27 13:27:01-0800 New Revision: 19905
Modified: trunk/pom.xml trunk/tools/maven/parentpom.xml Log: Fixed pmd configuration for maven3. Our Jenkins installation uses maven3 and generates a lot of pmd warnings related to the fact that we use java1.5 constructs in the code. The pmd configuration is now specified twice to solve this problem. Contributed-by: Linus Tolke. Modified: trunk/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/pom.xml?view=diff&pathrev=19905&r1=19904&r2=19905 ============================================================================== --- trunk/pom.xml (original) +++ trunk/pom.xml 2012-12-27 13:27:01-0800 @@ -11,7 +11,7 @@ <parent> <groupId>org.argouml</groupId> <artifactId>parentpom</artifactId> - <version>0.35.2</version> + <version>0.35.3</version> <relativePath>tools/maven/parentpom.xml</relativePath> </parent> Modified: trunk/tools/maven/parentpom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/maven/parentpom.xml?view=diff&pathrev=19905&r1=19904&r2=19905 ============================================================================== --- trunk/tools/maven/parentpom.xml (original) +++ trunk/tools/maven/parentpom.xml 2012-12-27 13:27:01-0800 @@ -12,6 +12,7 @@ <groupId>org.sonatype.oss</groupId> <artifactId>oss-parent</artifactId> <version>7</version> + <relativePath/> </parent> @@ -21,7 +22,7 @@ included in the automatic updates of the version number. Until that is resolved references to this pom need to updated manually when this changes and no snapshot versions are possible. --> - <version>0.35.2</version> + <version>0.35.3</version> <packaging>pom</packaging> <name>parentpom</name> <description> @@ -100,6 +101,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> + <version>2.2.1</version> <executions> <execution> <goals> @@ -206,6 +208,27 @@ <version>2.1</version> </plugin> + <plugin> + <!-- The reason for having multiple copies of + the pmd configuration is that the solution + to the Maven bug MSITE-443 + http://jira.codehaus.org/browse/MSITE-443 + doesn't work in Maven 3.0.4. + Linus Tolke 2012-12-27. + --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.7.1</version> + <configuration> + <linkXref>true</linkXref> + <sourceEncoding>utf-8</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>${compileSource}</targetJdk> + <excludeRoots> + <excludeRoot>src_generated</excludeRoot> + </excludeRoots> + </configuration> + </plugin> </plugins> @@ -244,9 +267,16 @@ </plugin> <plugin> + <!-- The reason for having multiple copies of + the pmd configuration is that the solution + to the Maven bug MSITE-443 + http://jira.codehaus.org/browse/MSITE-443 + doesn't work in Maven 3.0.4. + Linus Tolke 2012-12-27. + --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>2.5</version> + <version>2.7.1</version> <configuration> <linkXref>true</linkXref> <sourceEncoding>utf-8</sourceEncoding> ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=3039758 To unsubscribe from this discussion, e-mail: [[email protected]].
