You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2014/01/09 00:17:50 UTC
svn commit: r1556667 -
/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java
Author: khmarbaise
Date: Wed Jan 8 23:17:49 2014
New Revision: 1556667
URL: http://svn.apache.org/r1556667
Log:
[MENFORCER-143]
- Using code snippet to activate correct handling
of all option.
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java?rev=1556667&r1=1556666&r2=1556667&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java Wed Jan 8 23:17:49 2014
@@ -100,18 +100,10 @@ public class RequireActiveProfile
boolean fail = false;
if ( !missingProfiles.isEmpty() )
{
- fail = true;
- // if (all && missingProfiles.size() != profs.length)
- // {
- // fail = true;
- // }
- // else
- // {
- // if (!all && missingProfiles.size() >= (profs.length -1))
- // {
- // fail = true;
- // }
- // }
+ if (all || missingProfiles.size() == profs.length )
+ {
+ fail = true;
+ }
}
if ( fail )