Author: rfscholte
Date: Mon Apr 23 21:58:55 2012
New Revision: 1329473
URL: http://svn.apache.org/viewvc?rev=1329473&view=rev
Log:
Change visibility of fields
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/CleanReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java?rev=1329473&r1=1329472&r2=1329473&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
Mon Apr 23 21:58:55 2012
@@ -97,14 +97,14 @@ public abstract class AbstractReleaseMoj
* @required
* @readonly
*/
- protected File basedir;
+ private File basedir;
/**
* @parameter expression="${settings}"
* @required
* @readonly
*/
- protected Settings settings;
+ private Settings settings;
/**
* @parameter expression="${project}"
@@ -145,7 +145,7 @@ public abstract class AbstractReleaseMoj
* @required
* @readonly
*/
- protected List<MavenProject> reactorProjects;
+ private List<MavenProject> reactorProjects;
/**
* Add a new or overwrite the default implementation per provider.
@@ -171,7 +171,7 @@ public abstract class AbstractReleaseMoj
* @parameter default-value="${java.home}"
* @since 2.0-beta-8
*/
- protected File javaHome;
+ private File javaHome;
/**
* The command-line local repository directory in use for this build (if
specified).
@@ -179,7 +179,7 @@ public abstract class AbstractReleaseMoj
* @parameter default-value="${maven.repo.local}"
* @since 2.0-beta-8
*/
- protected File localRepoDirectory;
+ private File localRepoDirectory;
/**
* Role hint of the {@link
org.apache.maven.shared.release.exec.MavenExecutor} implementation to use.
@@ -187,7 +187,7 @@ public abstract class AbstractReleaseMoj
* @parameter expression="${mavenExecutorId}" default-value="invoker"
* @since 2.0-beta-8
*/
- protected String mavenExecutorId;
+ private String mavenExecutorId;
/**
* Use a local checkout instead of doing a checkout from the upstream
repository.
@@ -352,6 +352,11 @@ public abstract class AbstractReleaseMoj
{
return settings;
}
+
+ protected final File getBasedir()
+ {
+ return basedir;
+ }
/**
* Sets the base directory of the build.
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java?rev=1329473&r1=1329472&r2=1329473&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
Mon Apr 23 21:58:55 2012
@@ -229,7 +229,7 @@ public class BranchReleaseMojo
try
{
- releaseManager.branch( config, getReleaseEnvironment(),
reactorProjects, dryRun );
+ releaseManager.branch( config, getReleaseEnvironment(),
getReactorProjects(), dryRun );
}
catch ( ReleaseExecutionException e )
{
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/CleanReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/CleanReleaseMojo.java?rev=1329473&r1=1329472&r2=1329473&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/CleanReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/CleanReleaseMojo.java
Mon Apr 23 21:58:55 2012
@@ -47,8 +47,8 @@ public class CleanReleaseMojo
super.execute();
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- releaseDescriptor.setWorkingDirectory( basedir.getAbsolutePath() );
- releaseManager.clean( releaseDescriptor, null, reactorProjects );
+ releaseDescriptor.setWorkingDirectory( getBasedir().getAbsolutePath()
);
+ releaseManager.clean( releaseDescriptor, null, getReactorProjects() );
}
}
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java?rev=1329473&r1=1329472&r2=1329473&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
Mon Apr 23 21:58:55 2012
@@ -143,7 +143,7 @@ public class PerformReleaseMojo
ReleasePerformRequest performRequest = new
ReleasePerformRequest();
performRequest.setReleaseDescriptor( releaseDescriptor );
performRequest.setReleaseEnvironment( getReleaseEnvironment() );
- performRequest.setReactorProjects( reactorProjects );
+ performRequest.setReactorProjects( getReactorProjects() );
performRequest.setDryRun( dryRun );
releaseManager.perform( performRequest );
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=1329473&r1=1329472&r2=1329473&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Mon Apr 23 21:58:55 2012
@@ -297,7 +297,7 @@ public class PrepareReleaseMojo
try
{
- releaseManager.prepare( config, getReleaseEnvironment(),
reactorProjects, resume, dryRun );
+ releaseManager.prepare( config, getReleaseEnvironment(),
getReactorProjects(), resume, dryRun );
}
catch ( ReleaseExecutionException e )
{
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java?rev=1329473&r1=1329472&r2=1329473&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java
Mon Apr 23 21:58:55 2012
@@ -53,7 +53,7 @@ public class RollbackReleaseMojo
try
{
- releaseManager.rollback( config, getReleaseEnvironment(),
reactorProjects );
+ releaseManager.rollback( config, getReleaseEnvironment(),
getReactorProjects() );
}
catch ( ReleaseExecutionException e )
{
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java?rev=1329473&r1=1329472&r2=1329473&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java
Mon Apr 23 21:58:55 2012
@@ -146,7 +146,7 @@ public class StageReleaseMojo
releaseDescriptor.setPerformGoals( goals );
- releaseManager.perform( releaseDescriptor,
getReleaseEnvironment(), reactorProjects, false );
+ releaseManager.perform( releaseDescriptor,
getReleaseEnvironment(), getReactorProjects(), false );
}
catch ( ReleaseExecutionException e )
{
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java?rev=1329473&r1=1329472&r2=1329473&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
Mon Apr 23 21:58:55 2012
@@ -104,7 +104,7 @@ public class UpdateVersionsMojo
try
{
- releaseManager.updateVersions( config, getReleaseEnvironment(),
reactorProjects );
+ releaseManager.updateVersions( config, getReleaseEnvironment(),
getReactorProjects() );
}
catch ( ReleaseExecutionException e )
{
