You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/06/16 21:23:51 UTC
svn commit: r1493575 - in /maven/enforcer/trunk/enforcer-rules/src:
main/java/org/apache/maven/plugins/enforcer/
test/java/org/apache/maven/plugins/enforcer/
Author: rfscholte
Date: Sun Jun 16 19:23:51 2013
New Revision: 1493575
URL: http://svn.apache.org/r1493575
Log:
Fix checkstyle errors
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireEnvironmentVariable.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java Sun Jun 16 19:23:51 2013
@@ -27,7 +27,6 @@ import org.apache.maven.artifact.version
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.enforcer.rule.api.EnforcerRule;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
-import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.util.StringUtils;
@@ -51,7 +50,7 @@ public abstract class AbstractVersionEnf
* <li><code>(,2.0.5],[2.1.1,)</code> Versions up to 2.0.5 (included) and 2.1.1 or higher</li>
* </ul>
*/
- public String version = null;
+ private String version;
/**
* Compares the specified version to see if it is allowed by the defined version range.
@@ -60,7 +59,6 @@ public abstract class AbstractVersionEnf
* @param variableName name of variable to use in messages (Example: "Maven" or "Java" etc).
* @param requiredVersionRange range of allowed versions.
* @param actualVersion the version to be checked.
- * @throws MojoExecutionException if the version is not allowed.
* @throws EnforcerRuleException the enforcer rule exception
*/
public void enforceVersion( Log log, String variableName, String requiredVersionRange, ArtifactVersion actualVersion )
@@ -105,8 +103,8 @@ public abstract class AbstractVersionEnf
}
catch ( InvalidVersionSpecificationException e )
{
- throw new EnforcerRuleException( "The requested " + variableName + " version " +
- requiredVersionRange + " is invalid.", e );
+ throw new EnforcerRuleException( "The requested " + variableName + " version "
+ + requiredVersionRange + " is invalid.", e );
}
}
}
@@ -195,7 +193,7 @@ public abstract class AbstractVersionEnf
*
* @return the required version
*/
- public String getVersion()
+ public final String getVersion()
{
return this.version;
}
@@ -205,7 +203,7 @@ public abstract class AbstractVersionEnf
*
* @param theVersion the required version to set
*/
- public void setVersion( String theVersion )
+ public final void setVersion( String theVersion )
{
this.version = theVersion;
}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java Sun Jun 16 19:23:51 2013
@@ -127,7 +127,7 @@ public class BanDuplicatePomDependencyVe
StringBuilder summary = new StringBuilder();
messageBuilder( duplicateDependencies, "dependencies.dependency", summary );
- if( model.getDependencyManagement() != null )
+ if ( model.getDependencyManagement() != null )
{
@SuppressWarnings( "unchecked" )
List<Dependency> managementDependencies = model.getDependencies();
@@ -140,27 +140,34 @@ public class BanDuplicatePomDependencyVe
@SuppressWarnings( "unchecked" )
List<Profile> profiles = model.getProfiles();
- for( Profile profile : profiles )
+ for ( Profile profile : profiles )
{
@SuppressWarnings( "unchecked" )
List<Dependency> profileDependencies = profile.getDependencies();
+
Map<String, Integer> duplicateProfileDependencies = validateDependencies( profileDependencies );
+
duplicates += duplicateProfileDependencies.size();
- messageBuilder( duplicateProfileDependencies, "profiles.profile[" + profile.getId() + "].dependencies.dependency", summary );
+ messageBuilder( duplicateProfileDependencies, "profiles.profile[" + profile.getId()
+ + "].dependencies.dependency", summary );
- if( model.getDependencyManagement() != null )
+ if ( model.getDependencyManagement() != null )
{
@SuppressWarnings( "unchecked" )
List<Dependency> profileManagementDependencies = profile.getDependencies();
- Map<String, Integer> duplicateProfileManagementDependencies = validateDependencies( profileManagementDependencies );
+
+ Map<String, Integer> duplicateProfileManagementDependencies =
+ validateDependencies( profileManagementDependencies );
+
duplicates += duplicateProfileManagementDependencies.size();
- messageBuilder( duplicateProfileManagementDependencies, "profiles.profile[" + profile.getId() + "].dependencyManagement.dependencies.dependency", summary );
+ messageBuilder( duplicateProfileManagementDependencies, "profiles.profile[" + profile.getId()
+ + "].dependencyManagement.dependencies.dependency", summary );
}
}
- if( summary.length() > 0 )
+ if ( summary.length() > 0 )
{
StringBuilder message = new StringBuilder();
message.append( "Found " ).append( duplicates ).append( " duplicate dependency " );
@@ -194,7 +201,7 @@ public class BanDuplicatePomDependencyVe
if ( deps.contains( key ) )
{
int times = 1;
- if( duplicateDeps.containsKey( key ) )
+ if ( duplicateDeps.containsKey( key ) )
{
times = duplicateDeps.get( key );
}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java Sun Jun 16 19:23:51 2013
@@ -46,7 +46,7 @@ public class BannedDependencies
* Any of the sections can be a wildcard by using '*' (ie group:*:1.0) <br>
* The rule will fail if any dependency matches any exclude, unless it also matches an include rule.
*/
- public List<String> excludes = null;
+ private List<String> excludes = null;
/**
* Specify the allowed dependencies. This can be a list of artifacts in the format <code>groupId[:artifactId][:version]</code>.
@@ -55,7 +55,7 @@ public class BannedDependencies
* smaller set of includes. <br>
* For example, to ban all xerces except xerces-api -> exclude "xerces", include "xerces:xerces-api"
*/
- public List<String> includes = null;
+ private List<String> includes = null;
/**
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java Sun Jun 16 19:23:51 2013
@@ -18,6 +18,7 @@ package org.apache.maven.plugins.enforce
* specific language governing permissions and limitations
* under the License.
*/
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -221,8 +222,10 @@ public class DependencyConvergence
* allow double checking of the results. Most of the time this can be done by generating unique ids, but sometimes
* the results of objects returned by the helper need to be queried. You may for example, store certain objects in
* your rule and then query them later.
+ *
+ * @param rule
*/
- public boolean isResultValid( EnforcerRule arg0 )
+ public boolean isResultValid( EnforcerRule rule )
{
return false;
}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java Sun Jun 16 19:23:51 2013
@@ -41,7 +41,17 @@ public class EvaluateBeanshell
private static final Interpreter bsh = new Interpreter();
/** The condition to be evaluated. */
- public String condition;
+ private String condition;
+
+ public final void setCondition( String condition )
+ {
+ this.condition = condition;
+ }
+
+ public final String getCondition()
+ {
+ return condition;
+ }
/*
* (non-Javadoc)
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=1493575&r1=1493574&r2=1493575&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 Sun Jun 16 19:23:51 2013
@@ -39,10 +39,10 @@ public class RequireActiveProfile
{
/** Comma separated list of profiles to check. */
- public String profiles = null;
+ private String profiles = null;
/** If all profiles must be active. If false, only one must be active */
- public boolean all = true;
+ private boolean all = true;
/*
* (non-Javadoc)
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireEnvironmentVariable.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireEnvironmentVariable.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireEnvironmentVariable.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireEnvironmentVariable.java Sun Jun 16 19:23:51 2013
@@ -1,75 +1,80 @@
-package org.apache.maven.plugins.enforcer;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.enforcer.rule.api.EnforcerRule;
-import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
-
-/**
- * This rule checks that certain environment variable is set.
- *
- * @author <a href='mailto:marvin[at]marvinformatics[dot]com'>Marvin Froeder</a>
- */
-public class RequireEnvironmentVariable
- extends AbstractPropertyEnforcerRule
-{
-
- /**
- * Specify the required variable.
- */
- public String variableName = null;
-
- @Override
- public String resolveValue( EnforcerRuleHelper helper )
- {
- String envValue = System.getenv( variableName );
- return envValue;
- }
-
- public boolean isCacheable()
- {
- // environment variables won't change while maven is on the run
- return true;
- }
-
- public boolean isResultValid( EnforcerRule cachedRule )
- {
- // this rule shall always have the same result, since environment
- // variables are set before maven is launched
- return true;
- }
-
- public String getCacheId()
- {
- return variableName;
- }
-
- @Override
- public String getPropertyName()
- {
- return variableName;
- }
-
- @Override
- public String getName()
- {
- return "Environment variable";
- }
-}
+package org.apache.maven.plugins.enforcer;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.enforcer.rule.api.EnforcerRule;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+
+/**
+ * This rule checks that certain environment variable is set.
+ *
+ * @author <a href='mailto:marvin[at]marvinformatics[dot]com'>Marvin Froeder</a>
+ */
+public class RequireEnvironmentVariable
+ extends AbstractPropertyEnforcerRule
+{
+
+ /**
+ * Specify the required variable.
+ */
+ private String variableName;
+
+ public final void setVariableName( String variableName )
+ {
+ this.variableName = variableName;
+ }
+
+ @Override
+ public String resolveValue( EnforcerRuleHelper helper )
+ {
+ String envValue = System.getenv( variableName );
+ return envValue;
+ }
+
+ public boolean isCacheable()
+ {
+ // environment variables won't change while maven is on the run
+ return true;
+ }
+
+ public boolean isResultValid( EnforcerRule cachedRule )
+ {
+ // this rule shall always have the same result, since environment
+ // variables are set before maven is launched
+ return true;
+ }
+
+ public String getCacheId()
+ {
+ return variableName;
+ }
+
+ @Override
+ public String getPropertyName()
+ {
+ return variableName;
+ }
+
+ @Override
+ public String getName()
+ {
+ return "Environment variable";
+ }
+}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java Sun Jun 16 19:23:51 2013
@@ -35,7 +35,7 @@ public class RequireFilesDontExist
*/
boolean checkFile( File file )
{
- //if we get here and the handle is null, treat it as a success
+ // if we get here and the handle is null, treat it as a success
return file == null ? true : !file.exists();
}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java Sun Jun 16 19:23:51 2013
@@ -35,7 +35,7 @@ public class RequireFilesExist
*/
boolean checkFile( File file )
{
- //if we get here and the handle is null, treat it as a success
+ // if we get here and the handle is null, treat it as a success
return file == null ? true : file.exists();
}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java Sun Jun 16 19:23:51 2013
@@ -108,7 +108,7 @@ public class RequireFilesSize
*/
boolean checkFile( File file )
{
- if (file == null)
+ if ( file == null )
{
//if we get here and it's null, treat it as a success.
return true;
@@ -131,11 +131,11 @@ public class RequireFilesSize
else
{
- this.log.debug( file +
- " size (" +
- length +
- ") is OK (" +
- ( minsize == maxsize || minsize == 0 ? ( "max. " + maxsize )
+ this.log.debug( file
+ + " size ("
+ + length
+ + ") is OK ("
+ + ( minsize == maxsize || minsize == 0 ? ( "max. " + maxsize )
: ( "between " + minsize + " and " + maxsize ) ) + " byte)." );
return true;
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java Sun Jun 16 19:23:51 2013
@@ -49,20 +49,20 @@ public class RequireJavaVersion
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
- String java_version = SystemUtils.JAVA_VERSION_TRIMMED;
+ String javaVersion = SystemUtils.JAVA_VERSION_TRIMMED;
Log log = helper.getLog();
- log.debug( "Detected Java String: " + java_version );
- java_version = normalizeJDKVersion( java_version );
- log.debug( "Normalized Java String: " + java_version );
+ log.debug( "Detected Java String: " + javaVersion );
+ javaVersion = normalizeJDKVersion( javaVersion );
+ log.debug( "Normalized Java String: " + javaVersion );
- ArtifactVersion detectedJdkVersion = new DefaultArtifactVersion( java_version );
+ ArtifactVersion detectedJdkVersion = new DefaultArtifactVersion( javaVersion );
- log.debug( "Parsed Version: Major: " + detectedJdkVersion.getMajorVersion() + " Minor: " +
- detectedJdkVersion.getMinorVersion() + " Incremental: " + detectedJdkVersion.getIncrementalVersion() +
- " Build: " + detectedJdkVersion.getBuildNumber() + " Qualifier: " + detectedJdkVersion.getQualifier() );
+ log.debug( "Parsed Version: Major: " + detectedJdkVersion.getMajorVersion() + " Minor: "
+ + detectedJdkVersion.getMinorVersion() + " Incremental: " + detectedJdkVersion.getIncrementalVersion()
+ + " Build: " + detectedJdkVersion.getBuildNumber() + " Qualifier: " + detectedJdkVersion.getQualifier() );
- enforceVersion( helper.getLog(), "JDK", version, detectedJdkVersion );
+ enforceVersion( helper.getLog(), "JDK", getVersion(), detectedJdkVersion );
}
/**
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java Sun Jun 16 19:23:51 2013
@@ -48,7 +48,7 @@ public class RequireMavenVersion
RuntimeInformation rti = (RuntimeInformation) helper.getComponent( RuntimeInformation.class );
ArtifactVersion detectedMavenVersion = rti.getApplicationVersion();
helper.getLog().debug( "Detected Maven Version: " + detectedMavenVersion );
- enforceVersion( helper.getLog(), "Maven", this.version, detectedMavenVersion );
+ enforceVersion( helper.getLog(), "Maven", getVersion(), detectedMavenVersion );
}
catch ( ComponentLookupException e )
{
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java Sun Jun 16 19:23:51 2013
@@ -52,7 +52,7 @@ public class TestEvaluateBeanshell
{
EvaluateBeanshell rule = new EvaluateBeanshell();
// this property should not be set
- rule.condition = "${env} == \"This is a test.\"";
+ rule.setCondition( "${env} == \"This is a test.\"" );
rule.setMessage( "We have a variable : ${env}" );
EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( project );
@@ -65,7 +65,7 @@ public class TestEvaluateBeanshell
EvaluateBeanshell rule = new EvaluateBeanshell();
// this property should be set by the surefire
// plugin
- rule.condition = "${env} == null";
+ rule.setCondition( "${env} == null" );
rule.setMessage( "We have a variable : ${env}" );
try
@@ -86,7 +86,7 @@ public class TestEvaluateBeanshell
EvaluateBeanshell rule = new EvaluateBeanshell();
// this property should be set by the surefire
// plugin
- rule.condition = "${env} == null";
+ rule.setCondition( "${env} == null" );
try
{
EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( project );
@@ -104,11 +104,11 @@ public class TestEvaluateBeanshell
throws EnforcerRuleException, ExpressionEvaluationException
{
EvaluateBeanshell rule = new EvaluateBeanshell();
- rule.condition = "${env} == null";
+ rule.setCondition( "${env} == null" );
rule.setMessage( "We have a variable : ${env}" );
ExpressionEvaluator eval = mock( ExpressionEvaluator.class );
- when( eval.evaluate( rule.condition ) ).thenThrow( new ExpressionEvaluationException( "expected error" ) );
+ when( eval.evaluate( rule.getCondition() ) ).thenThrow( new ExpressionEvaluationException( "expected error" ) );
try
{
EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( project, eval );
@@ -126,7 +126,7 @@ public class TestEvaluateBeanshell
throws EnforcerRuleException, ExpressionEvaluationException
{
EvaluateBeanshell rule = new EvaluateBeanshell();
- rule.condition = "this is not valid beanshell";
+ rule.setCondition( "this is not valid beanshell" );
rule.setMessage( "We have a variable : ${env}" );
try
{
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java?rev=1493575&r1=1493574&r2=1493575&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java Sun Jun 16 19:23:51 2013
@@ -46,7 +46,7 @@ public class TestRequireEnvironmentVaria
RequireEnvironmentVariable rule = new RequireEnvironmentVariable();
// this env variable should not be set
- rule.variableName = "JUNK";
+ rule.setVariableName( "JUNK" );
try
{
@@ -59,7 +59,7 @@ public class TestRequireEnvironmentVaria
}
// PATH shall be common to windows and linux
- rule.variableName = "PATH";
+ rule.setVariableName( "PATH" );
try
{
rule.execute( helper );
@@ -81,7 +81,7 @@ public class TestRequireEnvironmentVaria
EnforcerRuleHelper helper = EnforcerTestUtils.getHelper();
RequireEnvironmentVariable rule = new RequireEnvironmentVariable();
- rule.variableName = "PATH";
+ rule.setVariableName( "PATH" );
// This expression should not match the property
// value
rule.setRegex( "[^abc]" );