svn commit: r1813646 - in /maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd: AbstractPmdReport.java AbstractPmdViolationCheckMojo.java CpdReportGenerator.java ExcludeFro
Author: adangel
Date: Sat Oct 28 16:24:53 2017
New Revision: 1813646
URL: http://svn.apache.org/viewvc?rev=1813646&view=rev
Log:
[MPMD-235] Javadoc errors when building with java8
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdViolationCheckMojo.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/ExcludeFromFile.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/ViolationDetails.java
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java?rev=1813646&r1=1813645&r2=1813646&view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java
Sat Oct 28 16:24:53 2017
@@ -283,7 +283,8 @@ public abstract class AbstractPmdReport
* Convenience method to get the list of files where the PMD tool will be
executed
*
* @return a List of the files where the PMD tool will be executed
- * @throws java.io.IOException
+ * @throws IOException If an I/O error occurs during construction of the
+ * canonical pathnames of the files
*/
protected Map getFilesToProcess()
throws IOException
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdViolationCheckMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdViolationCheckMojo.java?rev=1813646&r1=1813645&r2=1813646&view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdViolationCheckMojo.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdViolationCheckMojo.java
Sat Oct 28 16:24:53 2017
@@ -34,7 +34,8 @@ import org.codehaus.plexus.util.xml.pull
/**
* Base class for mojos that check if there were any PMD violations.
*
- * @param type of the check, e.g. {@link Violation} or {@link Duplication}.
+ * @param type of the check, e.g. {@link
org.apache.maven.plugins.pmd.model.Violation}
+ * or {@link org.apache.maven.plugins.pmd.model.Duplication}.
* @author mailto:br...@apache.org";>Brett Porter
* @version $Id$
*/
@@ -272,18 +273,22 @@ public abstract class AbstractPmdViolati
/**
* Formats the failure details and prints them as an INFO message
*
- * @param item
+ * @param item either a {@link
org.apache.maven.plugins.pmd.model.Violation} from PMD
+ * or a {@link org.apache.maven.plugins.pmd.model.Duplication} from CPD
+ * @param severity the found issue is prefixed with the given severity,
usually "Warning" or "Failure".
*/
protected abstract void printError( D item, String severity );
/**
* Gets the attributes and text for the violation tag and puts them in a
HashMap
*
- * @param analisysFile
- * @throws XmlPullParserException
- * @throws IOException
+ * @param analysisFile the xml output from PMD or CPD
+ * @return all PMD {@link org.apache.maven.plugins.pmd.model.Violation}s
+ * or CPD {@link org.apache.maven.plugins.pmd.model.Duplication}s.
+ * @throws XmlPullParserException if the analysis file contains invalid XML
+ * @throws IOException if the analysis file could be read
*/
-protected abstract List getErrorDetails( File analisysFile )
+protected abstract List getErrorDetails( File analysisFile )
throws XmlPullParserException, IOException;
public boolean isFailOnViolation()
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java?rev=1813646&r1=1813645&r2=1813646&view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java
Sat Oct 28 16:24:53 2017
@@ -149,9 +149,8 @@ public class CpdReportGenerator
/**
* Method
svn commit: r22712 - /release/maven/maven-3/3.5.0/
Author: hboutemy Date: Sat Oct 28 09:07:57 2017 New Revision: 22712 Log: 3.5.0 superceeded by 3.5.2 Removed: release/maven/maven-3/3.5.0/
svn commit: r1813596 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: adangel Date: Sat Oct 28 08:55:54 2017 New Revision: 1813596 URL: http://svn.apache.org/viewvc?rev=1813596&view=rev Log: [MPMD-240] Migrate plugin to Maven 3.0 Version has now 3 segements and is 3.9.0-SNAPSHOT Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1813596&r1=1813595&r2=1813596&view=diff == --- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Oct 28 08:55:54 2017 @@ -30,7 +30,7 @@ under the License. maven-pmd-plugin - 3.9-SNAPSHOT + 3.9.0-SNAPSHOT maven-plugin Apache Maven PMD Plugin
svn commit: r1813594 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: adangel
Date: Sat Oct 28 08:22:19 2017
New Revision: 1813594
URL: http://svn.apache.org/viewvc?rev=1813594&view=rev
Log:
[MPMD-240] Migrate plugin to Maven 3.0
maven-compat now only needed for tests
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1813594&r1=1813593&r2=1813594&view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Oct 28 08:22:19 2017
@@ -109,11 +109,6 @@ under the License.
${mavenVersion}
- org.apache.maven
- maven-compat
- ${mavenVersion}
-
-
org.apache.maven.plugin-tools
maven-plugin-annotations
provided
@@ -189,6 +184,12 @@ under the License.
+ org.apache.maven
+ maven-compat
+ ${mavenVersion}
+ test
+
+
org.apache.maven.plugin-testing
maven-plugin-testing-harness
2.1
svn commit: r1813592 [1/2] - in /maven/plugins/trunk/maven-pmd-plugin/src: it/MPMD-163/ it/MPMD-165/ it/MPMD-172/ it/MPMD-181-benchmark/ it/MPMD-181-no-benchmark/ it/MPMD-187/ it/MPMD-205-pmd-js-check
Author: adangel Date: Sat Oct 28 08:22:07 2017 New Revision: 1813592 URL: http://svn.apache.org/viewvc?rev=1813592&view=rev Log: [MPMD-240] Migrate plugin to Maven 3.0 Housekeeping: * renaming package to o.a.m.plugin*s*.pmd * Rename the groupIds of the integration tests from o.a.m.plugin... to o.a.m.plugins... Added: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdViolationCheckMojo.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/CpdReport.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/CpdViolationCheckMojo.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/ExcludeDuplicationsFromFile.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeDuplicationsFromFile.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/ExcludeFromFile.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeFromFile.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/ExcludeViolationsFromFile.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeViolationsFromFile.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/PmdCollectingRenderer.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdCollectingRenderer.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/PmdFileInfo.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdFileInfo.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/PmdReportGenerator.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportGenerator.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/PmdViolationCheckMojo.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugins/pmd/ViolationDetails.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ViolationDetails.java maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugins/ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugins/pmd/ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugins/pmd/AbstractPmdReportTest.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugins/pmd/CpdReportTest.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugins/pmd/CpdViolationCheckMojoTest.java - copied, changed from r1813591, maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojoTest.java maven/plugins/trunk/maven
svn commit: r1813593 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: adangel
Date: Sat Oct 28 08:22:14 2017
New Revision: 1813593
URL: http://svn.apache.org/viewvc?rev=1813593&view=rev
Log:
[MPMD-240] Migrate plugin to Maven 3.0
Upgrade maven-reporting-impl and doxia
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1813593&r1=1813592&r2=1813593&view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Oct 28 08:22:14 2017
@@ -81,7 +81,7 @@ under the License.
3.0
-1.4
+1.7
1.7
${javaVersion}
@@ -119,6 +119,28 @@ under the License.
provided
+
+
+ net.sourceforge.pmd
+ pmd-core
+ ${pmdVersion}
+
+
+ net.sourceforge.pmd
+ pmd-java
+ ${pmdVersion}
+
+
+ net.sourceforge.pmd
+ pmd-javascript
+ ${pmdVersion}
+
+
+ net.sourceforge.pmd
+ pmd-jsp
+ ${pmdVersion}
+
+
org.apache.maven.doxia
@@ -135,15 +157,10 @@ under the License.
doxia-site-renderer
${doxiaVersion}
-
-
- dom4j
- dom4j
-
-
@@ -155,7 +172,7 @@ under the License.
org.apache.maven.reporting
maven-reporting-impl
- 2.3
+ 3.0.0
@@ -170,28 +187,6 @@ under the License.
3.0.24
-
-
- net.sourceforge.pmd
- pmd-core
- ${pmdVersion}
-
-
- net.sourceforge.pmd
- pmd-java
- ${pmdVersion}
-
-
- net.sourceforge.pmd
- pmd-javascript
- ${pmdVersion}
-
-
- net.sourceforge.pmd
- pmd-jsp
- ${pmdVersion}
-
-
org.apache.maven.plugin-testing
svn commit: r1813592 [2/2] - in /maven/plugins/trunk/maven-pmd-plugin/src: it/MPMD-163/ it/MPMD-165/ it/MPMD-172/ it/MPMD-181-benchmark/ it/MPMD-181-no-benchmark/ it/MPMD-187/ it/MPMD-205-pmd-js-check
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jsp-configuration-plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jsp-configuration-plugin-config.xml?rev=1813592&r1=1813591&r2=1813592&view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jsp-configuration-plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jsp-configuration-plugin-config.xml
Sat Oct 28 08:22:07 2017
@@ -33,7 +33,7 @@ under the License.
org.apache.maven.plugins
maven-pmd-plugin
-
+
${basedir}/target/test/unit/default-configuration/target/site
${basedir}/target/test/unit/default-configuration/target
xml
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-failandwarnonpriority-plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-failandwarnonpriority-plugin-config.xml?rev=1813592&r1=1813591&r2=1813592&view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-failandwarnonpriority-plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-failandwarnonpriority-plugin-config.xml
Sat Oct 28 08:22:07 2017
@@ -33,7 +33,7 @@ under the License.
org.apache.maven.plugins
maven-pmd-plugin
-
+
${basedir}/target/test/unit/default-configuration/target
true
3
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-failonpriority-plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-failonpriority-plugin-config.xml?rev=1813592&r1=1813591&r2=1813592&view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-failonpriority-plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-failonpriority-plugin-config.xml
Sat Oct 28 08:22:07 2017
@@ -33,7 +33,7 @@ under the License.
org.apache.maven.plugins
maven-pmd-plugin
-
+
${basedir}/target/test/unit/default-configuration/target
true
1
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-notfailonviolation-plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-notfailonviolation-plugin-config.xml?rev=1813592&r1=1813591&r2=1813592&view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-notfailonviolation-plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-notfailonviolation-plugin-config.xml
Sat Oct 28 08:22:07 2017
@@ -33,7 +33,7 @@ under the License.
org.apache.maven.plugins
maven-pmd-plugin
-
+
${basedir}/target/test/unit/default-configuration/target
false
false
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-pmd-exclusions-configuration-plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-pmd-exclusions-configuration-plugin-config.xml?rev=1813592&r1=1813591&r2=1813592&view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-pmd-exclusions-configuration-plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-check-pmd-exclusions-configuration-plugin-config.xml
Sat Oct 28 08:22:07 2017
@@ -33,7 +33,7 @@ under the License.
org.apache.maven.plugins
maven-pmd-plugin
-
+
${basedir}/target/test/unit/default-configuration/target
true
4
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/pmd-repo
svn commit: r1813591 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: adangel
Date: Sat Oct 28 08:21:15 2017
New Revision: 1813591
URL: http://svn.apache.org/viewvc?rev=1813591&view=rev
Log:
[MPMD-240] Migrate plugin to Maven 3.0
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1813591&r1=1813590&r2=1813591&view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Oct 28 08:21:15 2017
@@ -80,7 +80,7 @@ under the License.
-2.2.1
+3.0
1.4
1.7
@@ -110,7 +110,7 @@ under the License.
org.apache.maven
- maven-project
+ maven-compat
${mavenVersion}
@@ -196,26 +196,19 @@ under the License.
org.apache.maven.plugin-testing
maven-plugin-testing-harness
- 1.3
+ 2.1
test
com.github.tomakehurst
wiremock
- 1.52
+ 2.9.0
test
-
-
-
- org.slf4j
- slf4j-api
-
-
-
+
org.apache.httpcomponents
httpclient
- 4.3.5
+ 4.5.3
