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 22:10:59 UTC
svn commit: r1493576 - in /maven/enforcer/trunk/enforcer-rules/src:
main/java/org/apache/maven/plugins/enforcer/
main/java/org/apache/maven/plugins/enforcer/utils/
test/java/org/apache/maven/plugins/enforcer/
Author: rfscholte
Date: Sun Jun 16 20:10:59 2013
New Revision: 1493576
URL: http://svn.apache.org/r1493576
Log:
Fix checkstyle errors
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePrerequisite.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProperty.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/ArtifactMatcher.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java Sun Jun 16 20:10:59 2013
@@ -48,33 +48,63 @@ public class RequireNoRepositories
/**
* Whether to ban non-plugin repositories. By default they are banned.
*/
- public boolean banRepositories = true;
+ private boolean banRepositories = true;
/**
* Whether to ban plugin repositories. By default they are banned.
*/
- public boolean banPluginRepositories = true;
+ private boolean banPluginRepositories = true;
/**
* Specify explicitly allowed non-plugin repositories. This is a list of ids.
*/
- public List<String> allowedRepositories = Collections.emptyList();
+ private List<String> allowedRepositories = Collections.emptyList();
/**
* Specify explicitly allowed plugin repositories. This is a list of ids.
*/
- public List<String> allowedPluginRepositories = Collections.emptyList();
+ private List<String> allowedPluginRepositories = Collections.emptyList();
/**
* Whether to allow repositories which only resolve snapshots. By default they are banned.
*/
- public boolean allowSnapshotRepositories = false;
+ private boolean allowSnapshotRepositories = false;
/**
* Whether to allow plugin repositories which only resolve snapshots. By default they are banned.
*/
- public boolean allowSnapshotPluginRepositories = false;
+ private boolean allowSnapshotPluginRepositories = false;
+ public final void setBanRepositories( boolean banRepositories )
+ {
+ this.banRepositories = banRepositories;
+ }
+
+ public final void setBanPluginRepositories( boolean banPluginRepositories )
+ {
+ this.banPluginRepositories = banPluginRepositories;
+ }
+
+ public final void setAllowedRepositories( List<String> allowedRepositories )
+ {
+ this.allowedRepositories = allowedRepositories;
+ }
+
+ public final void setAllowedPluginRepositories( List<String> allowedPluginRepositories )
+ {
+ this.allowedPluginRepositories = allowedPluginRepositories;
+ }
+
+ public final void setAllowSnapshotRepositories( boolean allowSnapshotRepositories )
+ {
+ this.allowSnapshotRepositories = allowSnapshotRepositories;
+ }
+
+ public final void setAllowSnapshotPluginRepositories( boolean allowSnapshotPluginRepositories )
+ {
+ this.allowSnapshotPluginRepositories = allowSnapshotPluginRepositories;
+ }
+
/*
* (non-Javadoc)
* @see
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java Sun Jun 16 20:10:59 2013
@@ -59,22 +59,22 @@ public class RequireOS
* <li>os/400</li>
* </ul>
*/
- public String family = null;
+ private String family = null;
/** The OS name desired. */
- public String name = null;
+ private String name = null;
/** The OS version desired. */
- public String version = null;
+ private String version = null;
/** The OS architecture desired. */
- public String arch = null;
+ private String arch = null;
/** Specify an optional message to the user if the rule fails. */
- public String message = "";
+ private String message = "";
/** Display detected OS information. */
- public boolean display = false;
+ private boolean display = false;
/**
* Instantiates a new RequireOS.
@@ -107,10 +107,11 @@ public class RequireOS
if ( StringUtils.isEmpty( message ) )
{
message =
- ( "OS Arch: " + Os.OS_ARCH + " Family: " + Os.OS_FAMILY + " Name: " + Os.OS_NAME +
- " Version: " + Os.OS_VERSION + " is not allowed by" +
- ( arch != null ? " Arch=" + arch : "" ) + ( family != null ? " Family=" + family : "" ) +
- ( name != null ? " Name=" + name : "" ) + ( version != null ? " Version=" + version : "" ) );
+ ( "OS Arch: " + Os.OS_ARCH + " Family: " + Os.OS_FAMILY + " Name: " + Os.OS_NAME + " Version: "
+ + Os.OS_VERSION + " is not allowed by" + ( arch != null ? " Arch=" + arch : "" )
+ + ( family != null ? " Family=" + family : "" ) + ( name != null ? " Name=" + name : "" ) + ( version != null ? " Version="
+ + version
+ : "" ) );
}
throw new EnforcerRuleException( message );
}
@@ -138,8 +139,8 @@ public class RequireOS
public void displayOSInfo( Log log, boolean info )
{
String string =
- "OS Info: Arch: " + Os.OS_ARCH + " Family: " + Os.OS_FAMILY + " Name: " + Os.OS_NAME + " Version: " +
- Os.OS_VERSION;
+ "OS Info: Arch: " + Os.OS_ARCH + " Family: " + Os.OS_FAMILY + " Name: " + Os.OS_NAME + " Version: "
+ + Os.OS_VERSION;
if ( !info )
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java Sun Jun 16 20:10:59 2013
@@ -85,43 +85,43 @@ public class RequirePluginVersions
{
/** Don't allow the LATEST identifier. */
- public boolean banLatest = true;
+ private boolean banLatest = true;
/** Don't allow the RELEASE identifier. */
- public boolean banRelease = true;
+ private boolean banRelease = true;
/** Don't allow snapshot plugins. */
- public boolean banSnapshots = true;
+ private boolean banSnapshots = true;
/** Don't allow timestamp snapshot plugins. */
- public boolean banTimestamps = true;
+ private boolean banTimestamps = true;
/**
* The comma separated list of phases that should be used to find lifecycle plugin bindings. The default value is
* "clean,deploy,site".
*/
- public String phases = "clean,deploy,site";
+ private String phases = "clean,deploy,site";
/**
* Additional plugins to enforce have versions. These are plugins that may not be in the poms but are used anyway,
* like help, eclipse etc. <br>
* The plugins should be specified in the form: <code>group:artifactId</code>.
*/
- public List<String> additionalPlugins;
+ private List<String> additionalPlugins;
/**
* Plugins to skip for version enforcement. The plugins should be specified in the form:
* <code>group:artifactId</code>. NOTE: This is deprecated, use unCheckedPluginList instead.
* @deprecated
*/
- public List unCheckedPlugins;
+ private List unCheckedPlugins;
/**
* Same as unCheckedPlugins but as a comma list to better support properties. Sample form:
* <code>group:artifactId,group2:artifactId2</code>
* @since 1.0-beta-1
*/
- public String unCheckedPluginList;
+ private String unCheckedPluginList;
/** The plugin manager. */
private PluginManager pluginManager;
@@ -133,25 +133,25 @@ public class RequirePluginVersions
private Collection<Lifecycle> lifecycles;
/** The factory. */
- ArtifactFactory factory;
+ private ArtifactFactory factory;
/** The resolver. */
- ArtifactResolver resolver;
+ private ArtifactResolver resolver;
/** The local. */
- ArtifactRepository local;
+ private ArtifactRepository local;
/** The remote repositories. */
- List<ArtifactRepository> remoteRepositories;
+ private List<ArtifactRepository> remoteRepositories;
/** The log. */
- Log log;
+ private Log log;
/** The session. */
- MavenSession session;
+ private MavenSession session;
/** The utils. */
- EnforcerRuleUtils utils;
+ private EnforcerRuleUtils utils;
/*
* (non-Javadoc)
@@ -341,8 +341,8 @@ public class RequirePluginVersions
*
* @param uncheckedPlugins
* @param plugins
- * @return
* @throws MojoExecutionException
+ * @return
*/
public Collection<Plugin> removeUncheckedPlugins( Collection<String> uncheckedPlugins, Collection<Plugin> plugins )
throws MojoExecutionException
@@ -397,7 +397,7 @@ public class RequirePluginVersions
{
if ( additional != null )
{
- for( String pluginString : additional )
+ for ( String pluginString : additional )
{
Plugin plugin = parsePluginString( pluginString, "AdditionalPlugins" );
@@ -419,8 +419,9 @@ public class RequirePluginVersions
* Helper method to parse and inject a Plugin.
*
* @param pluginString
- * @return
+ * @param field
* @throws MojoExecutionException
+ * @return the plugin
*/
protected Plugin parsePluginString( String pluginString, String field )
throws MojoExecutionException
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePrerequisite.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePrerequisite.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePrerequisite.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePrerequisite.java Sun Jun 16 20:10:59 2013
@@ -1,6 +1,5 @@
package org.apache.maven.plugins.enforcer;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -40,11 +39,21 @@ public class RequirePrerequisite extends
*/
private String mavenVersion;
+ /**
+ * Set the mavenVersion
+ *
+ * Can either be version or a range, e.g. {@code 2.2.1} or {@code [2.2.1,)}
+ *
+ * @param mavenVersion the version or {@code null}
+ */
public void setMavenVersion( String mavenVersion )
{
this.mavenVersion = mavenVersion;
}
+ /**
+ * {@inheritDoc}
+ */
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProperty.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProperty.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProperty.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProperty.java Sun Jun 16 20:10:59 2013
@@ -33,7 +33,12 @@ public class RequireProperty
{
/** Specify the required property. */
- public String property = null;
+ private String property;
+
+ public final void setProperty( String property )
+ {
+ this.property = property;
+ }
@Override
public Object resolveValue( EnforcerRuleHelper helper )
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java Sun Jun 16 20:10:59 2013
@@ -48,29 +48,34 @@ public class RequireReleaseDeps
*
* @parameter
*/
- public boolean onlyWhenRelease = false;
+ private boolean onlyWhenRelease = false;
/**
* Allows this rule to fail when the parent is defined as a snapshot.
*
* @parameter
*/
- public boolean failWhenParentIsSnapshot = true;
+ private boolean failWhenParentIsSnapshot = true;
/**
* Dependencies to ignore when checking for release versions. For example, inter-module dependencies
* can be excluded from the check and therefore allowed to contain snapshot versions.
*/
- public List<String> excludes = null;
+ private List<String> excludes = null;
/**
* Dependencies to include when checking for release versions. If any of the included dependencies
* have snapshot versions, the rule will fail.
*/
- public List<String> includes = null;
+ private List<String> includes = null;
+
+
/**
* Override parent to allow optional ignore of this rule.
+ *
+ * @param helper the enforcerRuleHelper
+ * @throws EnforcerRuleException when an exception occurs
*/
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
@@ -182,22 +187,22 @@ public class RequireReleaseDeps
return result;
}
- public boolean isOnlyWhenRelease()
+ public final boolean isOnlyWhenRelease()
{
return onlyWhenRelease;
}
- public void setOnlyWhenRelease( boolean onlyWhenRelease )
+ public final void setOnlyWhenRelease( boolean onlyWhenRelease )
{
this.onlyWhenRelease = onlyWhenRelease;
}
- public boolean isFailWhenParentIsSnapshot()
+ public final boolean isFailWhenParentIsSnapshot()
{
return failWhenParentIsSnapshot;
}
- public void setFailWhenParentIsSnapshot( boolean failWhenParentIsSnapshot )
+ public final void setFailWhenParentIsSnapshot( boolean failWhenParentIsSnapshot )
{
this.failWhenParentIsSnapshot = failWhenParentIsSnapshot;
}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java Sun Jun 16 20:10:59 2013
@@ -39,7 +39,7 @@ public class RequireReleaseVersion
*
* @parameter
*/
- public boolean failWhenParentIsSnapshot = true;
+ private boolean failWhenParentIsSnapshot = true;
/*
* (non-Javadoc)
@@ -60,7 +60,7 @@ public class RequireReleaseVersion
{
buf.append( message ).append( '\n' );
}
- buf.append( "This project cannot be a snapshot:").append( project.getArtifact().getId() );
+ buf.append( "This project cannot be a snapshot:" ).append( project.getArtifact().getId() );
throw new EnforcerRuleException( buf.toString() );
}
if ( failWhenParentIsSnapshot )
@@ -92,12 +92,12 @@ public class RequireReleaseVersion
}
}
- public boolean isFailWhenParentIsSnapshot()
+ public final boolean isFailWhenParentIsSnapshot()
{
return failWhenParentIsSnapshot;
}
- public void setFailWhenParentIsSnapshot( boolean failWhenParentIsSnapshot )
+ public final void setFailWhenParentIsSnapshot( boolean failWhenParentIsSnapshot )
{
this.failWhenParentIsSnapshot = failWhenParentIsSnapshot;
}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java Sun Jun 16 20:10:59 2013
@@ -99,7 +99,7 @@ public class RequireSameVersions
Map<String, List<String>> versionMembers = new LinkedHashMap<String, List<String>>();
List<Pattern> regExs = new ArrayList<Pattern>();
- for( String pattern : patterns )
+ for ( String pattern : patterns )
{
String regex = pattern.replace( ".", "\\." ).replace( "*", ".*" ).replace( ":", "\\:" ).replace( '?', '.' );
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java Sun Jun 16 20:10:59 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.LinkedHashMap;
@@ -64,7 +65,9 @@ public class RequireUpperBoundDeps
private boolean uniqueVersions;
/**
- * @param uniqueVersions
+ * Set to {@code true} if timestamped snapshots should be used.
+ *
+ * @param uniqueVersions
* @since 1.3
*/
public void setUniqueVersions( boolean uniqueVersions )
@@ -184,7 +187,7 @@ public class RequireUpperBoundDeps
{
StringBuilder line = new StringBuilder( getFullArtifactName( currentNode, false ) );
- if( currentNode.getPremanagedVersion() != null )
+ if ( currentNode.getPremanagedVersion() != null )
{
line.append( " (managed) <-- " );
line.append( getFullArtifactName( currentNode, true ) );
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/ArtifactMatcher.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/ArtifactMatcher.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/ArtifactMatcher.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/ArtifactMatcher.java Sun Jun 16 20:10:59 2013
@@ -27,13 +27,12 @@ import org.apache.maven.artifact.version
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.plugins.enforcer.AbstractVersionEnforcer;
-import org.apache.maven.plugins.enforcer.BanTransitiveDependencies;
/**
* This class is used for matching Artifacts against a list of patterns.
*
* @author Jakub Senko
- * @see BanTransitiveDependencies
+ * @see org.apache.maven.plugins.enforcer.BanTransitiveDependencies
*/
public final class ArtifactMatcher
{
@@ -120,7 +119,7 @@ public final class ArtifactMatcher
}
case 2:
- if ( !matches( parts[1],artifact.getArtifactId() ) )
+ if ( !matches( parts[1], artifact.getArtifactId() ) )
{
return false;
}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java Sun Jun 16 20:10:59 2013
@@ -105,10 +105,10 @@ public class EnforcerRuleUtils
public EnforcerRuleUtils( EnforcerRuleHelper helper )
{
- this.helper = helper;
- // get the various expressions out of the
+ this.helper = helper;
+ // get the various expressions out of the
// helper.
- try
+ try
{
factory = (ArtifactFactory) helper.getComponent( ArtifactFactory.class );
resolver = (ArtifactResolver) helper.getComponent( ArtifactResolver.class );
@@ -296,7 +296,7 @@ public class EnforcerRuleUtils
}
else
{
- //MENFORCER-30, handle cases where the value is a property like ${project.parent.groupId}
+ // MENFORCER-30, handle cases where the value is a property like ${project.parent.groupId}
modelGroup = (String) helper.evaluate( modelGroup );
}
@@ -306,7 +306,7 @@ public class EnforcerRuleUtils
}
else
{
- //MENFORCER-30, handle cases where the value is a property like ${project.parent.version}
+ // MENFORCER-30, handle cases where the value is a property like ${project.parent.version}
modelVersion = (String) helper.evaluate( modelVersion );
}
}
@@ -357,7 +357,7 @@ public class EnforcerRuleUtils
public List<Plugin> resolvePlugins( List<Plugin> plugins )
{
- for( Plugin plugin : plugins )
+ for ( Plugin plugin : plugins )
{
resolve( plugin );
}
@@ -366,7 +366,7 @@ public class EnforcerRuleUtils
public List<ReportPlugin> resolveReportPlugins( List<ReportPlugin> reportPlugins )
{
- for( ReportPlugin plugin : reportPlugins )
+ for ( ReportPlugin plugin : reportPlugins )
{
resolve( plugin );
}
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java Sun Jun 16 20:10:59 2013
@@ -83,7 +83,7 @@ public class TestRequireNoRepositories
public void testAllBannedWithAllowedRepositories()
throws EnforcerRuleException
{
- rule.allowedRepositories = Collections.singletonList( "repo" );
+ rule.setAllowedRepositories( Collections.singletonList( "repo" ) );
project.setArtifactId( "with-repositories-child" );
project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/with-repositories/child" ) );
@@ -94,7 +94,7 @@ public class TestRequireNoRepositories
public void testAllBannedWithAllowedPluginRepositories()
throws EnforcerRuleException
{
- rule.allowedPluginRepositories = Collections.singletonList( "repo" );
+ rule.setAllowedPluginRepositories( Collections.singletonList( "repo" ) );
project.setArtifactId( "with-plugin-repositories-child" );
project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/with-plugin-repositories/child" ) );
@@ -105,7 +105,7 @@ public class TestRequireNoRepositories
public void testReposNotBannedNoRepositories()
throws EnforcerRuleException
{
- rule.banRepositories = false;
+ rule.setBanRepositories( false );
project.setArtifactId( "no-repositories-child" );
project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/no-repositories/child" ) );
@@ -116,7 +116,7 @@ public class TestRequireNoRepositories
public void testReposNotBannedWithRepositories()
throws EnforcerRuleException
{
- rule.banRepositories = false;
+ rule.setBanRepositories( false );
project.setArtifactId( "with-repositories-child" );
project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/with-repositories/child" ) );
@@ -127,7 +127,7 @@ public class TestRequireNoRepositories
public void testReposNotBannedWithPluginRepositories()
throws EnforcerRuleException
{
- rule.banRepositories = false;
+ rule.setBanRepositories( false );
project.setArtifactId( "with-plugin-repositories-child" );
project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/with-plugin-repositories/child" ) );
@@ -146,7 +146,7 @@ public class TestRequireNoRepositories
public void testPluginReposNotBannedNoRepositories()
throws EnforcerRuleException
{
- rule.banPluginRepositories = false;
+ rule.setBanPluginRepositories( false );
project.setArtifactId( "no-repositories-child" );
project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/no-repositories/child" ) );
@@ -157,7 +157,7 @@ public class TestRequireNoRepositories
public void testPluginReposNotBannedWithRepositories()
throws EnforcerRuleException
{
- rule.banPluginRepositories = false;
+ rule.setBanPluginRepositories( false );
project.setArtifactId( "with-repositories-child" );
project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/with-repositories/child" ) );
@@ -176,7 +176,7 @@ public class TestRequireNoRepositories
public void testPluginReposNotBannedWithPluginRepositories()
throws EnforcerRuleException
{
- rule.banPluginRepositories = false;
+ rule.setBanPluginRepositories( false );
project.setArtifactId( "with-plugin-repositories-child" );
project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/with-plugin-repositories/child" ) );
@@ -187,7 +187,7 @@ public class TestRequireNoRepositories
public void testReposNotAllowedWithSnapshotRepositories()
throws EnforcerRuleException
{
- rule.allowSnapshotRepositories = true;
+ rule.setAllowSnapshotRepositories( true );
project.setArtifactId( "snapshot-plugin-repositories-child" );
project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/snapshot-plugin-repositories/child" ) );
@@ -206,7 +206,7 @@ public class TestRequireNoRepositories
public void testReposAllowedWithSnapshotRepositories()
throws EnforcerRuleException
{
- rule.allowSnapshotRepositories = true;
+ rule.setAllowSnapshotRepositories( true );
project.setArtifactId( "snapshot-repositories-child" );
project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/snapshot-repositories/child" ) );
@@ -217,7 +217,7 @@ public class TestRequireNoRepositories
public void testPluginReposNotAllowedWithSnapshotRepositories()
throws EnforcerRuleException
{
- rule.allowSnapshotPluginRepositories = true;
+ rule.setAllowSnapshotPluginRepositories( true );
project.setArtifactId( "snapshot-repositories-child" );
project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/snapshot-repositories/child" ) );
@@ -236,7 +236,7 @@ public class TestRequireNoRepositories
public void testPluginReposAllowedWithSnapshotPluginRepositories()
throws EnforcerRuleException
{
- rule.allowSnapshotPluginRepositories = true;
+ rule.setAllowSnapshotPluginRepositories( true );
project.setArtifactId( "snapshot-plugin-repositories-child" );
project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/snapshot-plugin-repositories/child" ) );
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java Sun Jun 16 20:10:59 2013
@@ -48,7 +48,7 @@ public class TestRequireProperty
RequireProperty rule = new RequireProperty();
// this property should not be set
- rule.property = "testPropJunk";
+ rule.setProperty( "testPropJunk" );
try
{
@@ -62,7 +62,7 @@ public class TestRequireProperty
// this property should be set by the surefire
// plugin
- rule.property = "testProp";
+ rule.setProperty( "testProp" );
try
{
rule.execute( helper );
@@ -86,7 +86,7 @@ public class TestRequireProperty
EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( project );
RequireProperty rule = new RequireProperty();
- rule.property = "testProp";
+ rule.setProperty( "testProp" );
// This expression should not match the property
// value
rule.setRegex( "[^abc]" );
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java?rev=1493576&r1=1493575&r2=1493576&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java Sun Jun 16 20:10:59 2013
@@ -66,7 +66,7 @@ public class TestRequireReleaseDeps
TestEnforcerRuleUtils.execute( rule, helper, true );
- rule.onlyWhenRelease = true;
+ rule.setOnlyWhenRelease( true );
TestEnforcerRuleUtils.execute( rule, helper, false );