You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/05/26 23:01:21 UTC
svn commit: r1342965 - in
/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd:
AbstractPmdViolationCheckMojo.java CpdViolationCheckMojo.java
Author: olamy
Date: Sat May 26 21:01:21 2012
New Revision: 1342965
URL: http://svn.apache.org/viewvc?rev=1342965&view=rev
Log:
[MPMD-118] Goal cpd-check uses ${pmd.failOnViolation} for failOnViolation Flag and can't be set independet from PMD check.
Modified:
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/plugin/pmd/CpdViolationCheckMojo.java
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java?rev=1342965&r1=1342964&r2=1342965&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java Sat May 26 21:01:21 2012
@@ -55,7 +55,7 @@ public abstract class AbstractPmdViolati
* @parameter expression="${pmd.failOnViolation}" default-value="true"
* @required
*/
- private boolean failOnViolation;
+ protected boolean failOnViolation;
/**
* The project language, for determining whether to run the report.
@@ -122,7 +122,7 @@ public abstract class AbstractPmdViolati
String message = getMessage( failureCount, warningCount, key, outputFile );
- if ( failureCount > 0 && failOnViolation )
+ if ( failureCount > 0 && isFailOnViolation() )
{
throw new MojoFailureException( message );
}
@@ -264,4 +264,9 @@ public abstract class AbstractPmdViolati
*/
protected abstract List<D> getErrorDetails( File analisysFile )
throws XmlPullParserException, IOException;
+
+ public boolean isFailOnViolation()
+ {
+ return failOnViolation;
+ }
}
\ No newline at end of file
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java?rev=1342965&r1=1342964&r2=1342965&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java Sat May 26 21:01:21 2012
@@ -55,6 +55,15 @@ public class CpdViolationCheckMojo
private boolean skip;
/**
+ * Whether to fail the build if the validation check fails.
+ *
+ * @parameter expression="${cpd.failOnViolation}" default-value="true"
+ * @required
+ */
+ protected boolean failOnViolation;
+
+
+ /**
* {@inheritDoc}
*/
public void execute()
@@ -113,4 +122,10 @@ public class CpdViolationCheckMojo
{
return new ViolationDetails<Duplication>();
}
+
+ @Override
+ public boolean isFailOnViolation()
+ {
+ return failOnViolation;
+ }
}
\ No newline at end of file