Author: rfscholte Date: Mon Jun 24 20:55:46 2013 New Revision: 1496218 URL: http://svn.apache.org/r1496218 Log: Revert visibility of fields, so external projects can still use them, even though they should use the getters/setters
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java 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/BannedDependencies.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/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/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 Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java?rev=1496218&r1=1496217&r2=1496218&view=diff ============================================================================== --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java Mon Jun 24 20:55:46 2013 @@ -36,24 +36,24 @@ public abstract class AbstractPropertyEn /** * Match the property value to a given regular expression. Defaults to <code>null</code> (any value is ok). */ - private String regex; + public String regex = null; /** * Specify a warning message if the regular expression is not matched. */ - private String regexMessage; + public String regexMessage = null; public AbstractPropertyEnforcerRule() { super(); } - public void setRegex( String regex ) + public final void setRegex( String regex ) { this.regex = regex; } - public void setRegexMessage( String regexMessage ) + public final void setRegexMessage( String regexMessage ) { this.regexMessage = regexMessage; } Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java?rev=1496218&r1=1496217&r2=1496218&view=diff ============================================================================== --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java Mon Jun 24 20:55:46 2013 @@ -29,8 +29,8 @@ public abstract class AbstractStandardEn { /** Specify a friendly message if the rule fails. */ - private String message; - + public String message = null; + public final void setMessage( String message ) { this.message = message; 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=1496218&r1=1496217&r2=1496218&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 Mon Jun 24 20:55:46 2013 @@ -50,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> */ - private String version; + public String version = null; /** * Compares the specified version to see if it is allowed by the defined version range. 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=1496218&r1=1496217&r2=1496218&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 Mon Jun 24 20:55:46 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. */ - private List<String> excludes = null; + public 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" */ - private List<String> includes = null; + public List<String> includes = null; /** 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=1496218&r1=1496217&r2=1496218&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 Mon Jun 24 20:55:46 2013 @@ -41,8 +41,8 @@ public class EvaluateBeanshell private static final Interpreter bsh = new Interpreter(); /** The condition to be evaluated. */ - private String condition; - + public String condition; + public final void setCondition( String condition ) { this.condition = condition; 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=1496218&r1=1496217&r2=1496218&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 Mon Jun 24 20:55:46 2013 @@ -39,10 +39,10 @@ public class RequireActiveProfile { /** Comma separated list of profiles to check. */ - private String profiles = null; + public String profiles = null; /** If all profiles must be active. If false, only one must be active */ - private boolean all = true; + public 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=1496218&r1=1496217&r2=1496218&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 Mon Jun 24 20:55:46 2013 @@ -34,8 +34,8 @@ public class RequireEnvironmentVariable /** * Specify the required variable. */ - private String variableName; - + public String variableName = null; + public final void setVariableName( String variableName ) { this.variableName = variableName; 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=1496218&r1=1496217&r2=1496218&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 Mon Jun 24 20:55:46 2013 @@ -48,32 +48,32 @@ public class RequireNoRepositories /** * Whether to ban non-plugin repositories. By default they are banned. */ - private boolean banRepositories = true; + public boolean banRepositories = true; /** * Whether to ban plugin repositories. By default they are banned. */ - private boolean banPluginRepositories = true; + public boolean banPluginRepositories = true; /** * Specify explicitly allowed non-plugin repositories. This is a list of ids. */ - private List<String> allowedRepositories = Collections.emptyList(); + public List<String> allowedRepositories = Collections.emptyList(); /** * Specify explicitly allowed plugin repositories. This is a list of ids. */ - private List<String> allowedPluginRepositories = Collections.emptyList(); + public List<String> allowedPluginRepositories = Collections.emptyList(); /** * Whether to allow repositories which only resolve snapshots. By default they are banned. */ - private boolean allowSnapshotRepositories = false; + public boolean allowSnapshotRepositories = false; /** * Whether to allow plugin repositories which only resolve snapshots. By default they are banned. */ - private boolean allowSnapshotPluginRepositories = false; + public boolean allowSnapshotPluginRepositories = false; public final void setBanRepositories( boolean banRepositories ) { 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=1496218&r1=1496217&r2=1496218&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 Mon Jun 24 20:55:46 2013 @@ -59,22 +59,22 @@ public class RequireOS * <li>os/400</li> * </ul> */ - private String family = null; + public String family = null; /** The OS name desired. */ - private String name = null; + public String name = null; /** The OS version desired. */ - private String version = null; + public String version = null; /** The OS architecture desired. */ - private String arch = null; + public String arch = null; /** Specify an optional message to the user if the rule fails. */ - private String message = ""; + public String message = ""; /** Display detected OS information. */ - private boolean display = false; + public boolean display = false; /** * Instantiates a new RequireOS. 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=1496218&r1=1496217&r2=1496218&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 Mon Jun 24 20:55:46 2013 @@ -85,43 +85,43 @@ public class RequirePluginVersions { /** Don't allow the LATEST identifier. */ - private boolean banLatest = true; + public boolean banLatest = true; /** Don't allow the RELEASE identifier. */ - private boolean banRelease = true; + public boolean banRelease = true; /** Don't allow snapshot plugins. */ - private boolean banSnapshots = true; + public boolean banSnapshots = true; /** Don't allow timestamp snapshot plugins. */ - private boolean banTimestamps = true; + public 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". */ - private String phases = "clean,deploy,site"; + public 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>. */ - private List<String> additionalPlugins; + public 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 */ - private List unCheckedPlugins; + public 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 */ - private String unCheckedPluginList; + public String unCheckedPluginList; /** The plugin manager. */ private PluginManager pluginManager; @@ -133,25 +133,25 @@ public class RequirePluginVersions private Collection<Lifecycle> lifecycles; /** The factory. */ - private ArtifactFactory factory; + ArtifactFactory factory; /** The resolver. */ - private ArtifactResolver resolver; + ArtifactResolver resolver; /** The local. */ - private ArtifactRepository local; + ArtifactRepository local; /** The remote repositories. */ - private List<ArtifactRepository> remoteRepositories; + List<ArtifactRepository> remoteRepositories; /** The log. */ - private Log log; + Log log; /** The session. */ - private MavenSession session; + MavenSession session; /** The utils. */ - private EnforcerRuleUtils utils; + EnforcerRuleUtils utils; /* * (non-Javadoc) 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=1496218&r1=1496217&r2=1496218&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 Mon Jun 24 20:55:46 2013 @@ -33,8 +33,7 @@ public class RequireProperty { /** Specify the required property. */ - private String property; - + public String property = null; public final void setProperty( String property ) { this.property = property; 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=1496218&r1=1496217&r2=1496218&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 Mon Jun 24 20:55:46 2013 @@ -48,29 +48,27 @@ public class RequireReleaseDeps * * @parameter */ - private boolean onlyWhenRelease = false; + public boolean onlyWhenRelease = false; /** * Allows this rule to fail when the parent is defined as a snapshot. * * @parameter */ - private boolean failWhenParentIsSnapshot = true; + public 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. */ - private List<String> excludes = null; + public 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. */ - private List<String> includes = null; + public List<String> includes = null; - - /** * Override parent to allow optional ignore of this rule. * 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=1496218&r1=1496217&r2=1496218&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 Mon Jun 24 20:55:46 2013 @@ -39,7 +39,7 @@ public class RequireReleaseVersion * * @parameter */ - private boolean failWhenParentIsSnapshot = true; + public boolean failWhenParentIsSnapshot = true; /* * (non-Javadoc)