You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2010/08/21 00:53:29 UTC
svn commit: r987666 - in
/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer:
AlwaysFail.java AlwaysPass.java
Author: dennisl
Date: Fri Aug 20 22:53:29 2010
New Revision: 987666
URL: http://svn.apache.org/viewvc?rev=987666&view=rev
Log:
[MENFORCER-104] Specifying a message with an alwaysFail rule doesn't work
o Also handle optional message in alwaysPass rule
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java?rev=987666&r1=987665&r2=987666&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java Fri Aug 20 22:53:29 2010
@@ -37,6 +37,12 @@ public class AlwaysFail
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
- throw new EnforcerRuleException( "Always fails!" );
+ StringBuffer buf = new StringBuffer();
+ if ( message != null )
+ {
+ buf.append( message + "\n" );
+ }
+ buf.append( "Always fails!" );
+ throw new EnforcerRuleException( buf.toString() );
}
}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java?rev=987666&r1=987665&r2=987666&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java Fri Aug 20 22:53:29 2010
@@ -38,7 +38,13 @@ public class AlwaysPass
throws EnforcerRuleException
{
final Log log = helper.getLog();
- log.info( "Always pass!" );
+ StringBuffer buf = new StringBuffer();
+ if ( message != null )
+ {
+ buf.append( message + "\n" );
+ }
+ buf.append( "Always pass!" );
+ log.info( buf.toString() );
}
}