You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/06/24 22:52:15 UTC
svn commit: r1139435 [1/2] - in
/maven/release/trunk/maven-release-manager/src/main:
java/org/apache/maven/shared/release/
java/org/apache/maven/shared/release/config/
java/org/apache/maven/shared/release/exec/
java/org/apache/maven/shared/release/phas...
Author: hboutemy
Date: Fri Jun 24 20:52:14 2011
New Revision: 1139435
URL: http://svn.apache.org/viewvc?rev=1139435&view=rev
Log:
fixed errors reported by Checkstyle
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseResult.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ReleaseScmCommandException.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java Fri Jun 24 20:52:14 2011
@@ -91,14 +91,15 @@ public class DefaultReleaseManager
private static final int PHASE_SKIP = 0, PHASE_START = 1, PHASE_END = 2, GOAL_START = 11, GOAL_END = 12, ERROR = 99;
- public void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
prepare( releaseDescriptor, releaseEnvironment, reactorProjects, true, false, null );
}
- public void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean resume,
- boolean dryRun )
+ public void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean resume, boolean dryRun )
throws ReleaseExecutionException, ReleaseFailureException
{
prepare( releaseDescriptor, releaseEnvironment, reactorProjects, resume, dryRun, null );
@@ -134,15 +135,17 @@ public class DefaultReleaseManager
return result;
}
- public void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean resume,
- boolean dryRun, ReleaseManagerListener listener )
+ public void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean resume, boolean dryRun,
+ ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException
{
prepare( releaseDescriptor, releaseEnvironment, reactorProjects, resume, dryRun, listener, null );
}
- private void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean resume,
- boolean dryRun, ReleaseManagerListener listener, ReleaseResult result )
+ private void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean resume, boolean dryRun,
+ ReleaseManagerListener listener, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
updateListener( listener, "prepare", GOAL_START );
@@ -165,13 +168,13 @@ public class DefaultReleaseManager
for ( int idx = 0; idx <= index; idx++ )
{
- updateListener( listener, preparePhases.get( idx ).toString(), PHASE_SKIP );
+ updateListener( listener, preparePhases.get( idx ), PHASE_SKIP );
}
if ( index == preparePhases.size() - 1 )
{
- logInfo( result, "Release preparation already completed. You can now continue with release:perform, " +
- "or start again using the -Dresume=false flag" );
+ logInfo( result, "Release preparation already completed. You can now continue with release:perform, "
+ + "or start again using the -Dresume=false flag" );
}
else if ( index >= 0 )
{
@@ -181,9 +184,9 @@ public class DefaultReleaseManager
// start from next phase
for ( int i = index + 1; i < preparePhases.size(); i++ )
{
- String name = (String) preparePhases.get( i );
+ String name = preparePhases.get( i );
- ReleasePhase phase = (ReleasePhase) releasePhases.get( name );
+ ReleasePhase phase = releasePhases.get( name );
if ( phase == null )
{
@@ -229,25 +232,24 @@ public class DefaultReleaseManager
updateListener( listener, "prepare", GOAL_END );
}
- public void rollback( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public void rollback( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
rollback( releaseDescriptor, releaseEnvironment, reactorProjects, null );
}
- public void rollback( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
- ReleaseManagerListener listener )
+ public void rollback( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException
{
updateListener( listener, "rollback", GOAL_START );
releaseDescriptor = loadReleaseDescriptor( releaseDescriptor, null );
- for ( Iterator<String> phases = rollbackPhases.iterator(); phases.hasNext(); )
+ for ( String name : rollbackPhases )
{
- String name = phases.next();
-
- ReleasePhase phase = (ReleasePhase) releasePhases.get( name );
+ ReleasePhase phase = releasePhases.get( name );
if ( phase == null )
{
@@ -264,27 +266,29 @@ public class DefaultReleaseManager
updateListener( listener, "prepare", GOAL_END );
}
- public void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
perform( releaseDescriptor, releaseEnvironment, reactorProjects, null, true );
}
- public void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean clean )
+ public void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean clean )
throws ReleaseExecutionException, ReleaseFailureException
{
perform( releaseDescriptor, releaseEnvironment, reactorProjects, null, clean );
}
- public void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
- ReleaseManagerListener listener )
+ public void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException
{
perform( releaseDescriptor, releaseEnvironment, reactorProjects, listener, true );
}
- public void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
- ReleaseManagerListener listener, boolean clean )
+ public void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, ReleaseManagerListener listener, boolean clean )
throws ReleaseExecutionException, ReleaseFailureException
{
perform( releaseDescriptor, releaseEnvironment, reactorProjects, listener, new ReleaseResult(), clean );
@@ -319,8 +323,9 @@ public class DefaultReleaseManager
return result;
}
- private void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
- ReleaseManagerListener listener, ReleaseResult result, boolean clean )
+ private void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, ReleaseManagerListener listener, ReleaseResult result,
+ boolean clean )
throws ReleaseExecutionException, ReleaseFailureException
{
updateListener( listener, "perform", GOAL_START );
@@ -329,11 +334,9 @@ public class DefaultReleaseManager
ReleaseResult phaseResult = null;
- for ( Iterator<String> phases = performPhases.iterator(); phases.hasNext(); )
+ for ( String name : performPhases )
{
- String name = phases.next();
-
- ReleasePhase phase = (ReleasePhase) releasePhases.get( name );
+ ReleasePhase phase = releasePhases.get( name );
if ( phase == null )
{
@@ -355,25 +358,24 @@ public class DefaultReleaseManager
updateListener( listener, "perform", GOAL_END );
}
- public void branch( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean dryRun )
+ public void branch( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean dryRun )
throws ReleaseExecutionException, ReleaseFailureException
{
branch( releaseDescriptor, releaseEnvironment, reactorProjects, dryRun, null );
}
- public void branch( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean dryRun,
- ReleaseManagerListener listener )
+ public void branch( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean dryRun, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException
{
updateListener( listener, "branch", GOAL_START );
releaseDescriptor = loadReleaseDescriptor( releaseDescriptor, listener );
- for ( Iterator<String> phases = branchPhases.iterator(); phases.hasNext(); )
+ for ( String name : branchPhases )
{
- String name = phases.next();
-
- ReleasePhase phase = (ReleasePhase) releasePhases.get( name );
+ ReleasePhase phase = releasePhases.get( name );
if ( phase == null )
{
@@ -400,7 +402,8 @@ public class DefaultReleaseManager
updateListener( listener, "branch", GOAL_END );
}
- public void updateVersions( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public void updateVersions( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseManagerListener listener = null;
@@ -409,11 +412,9 @@ public class DefaultReleaseManager
releaseDescriptor = loadReleaseDescriptor( releaseDescriptor, listener );
- for ( Iterator<String> phases = updateVersionsPhases.iterator(); phases.hasNext(); )
+ for ( String name : updateVersionsPhases )
{
- String name = phases.next();
-
- ReleasePhase phase = (ReleasePhase) releasePhases.get( name );
+ ReleasePhase phase = releasePhases.get( name );
if ( phase == null )
{
@@ -471,21 +472,20 @@ public class DefaultReleaseManager
}
}
- public void clean( ReleaseDescriptor releaseDescriptor, ReleaseManagerListener listener, List<MavenProject> reactorProjects )
+ public void clean( ReleaseDescriptor releaseDescriptor, ReleaseManagerListener listener,
+ List<MavenProject> reactorProjects )
{
updateListener( listener, "cleanup", PHASE_START );
getLogger().info( "Cleaning up after release..." );
configStore.delete( releaseDescriptor );
- Set<String> phases = new LinkedHashSet<String>(preparePhases);
- phases.addAll(branchPhases);
+ Set<String> phases = new LinkedHashSet<String>( preparePhases );
+ phases.addAll( branchPhases );
- for ( Iterator<String> i = phases.iterator(); i.hasNext(); )
+ for ( String name : phases )
{
- String name = i.next();
-
- ReleasePhase phase = (ReleasePhase) releasePhases.get( name );
+ ReleasePhase phase = releasePhases.get( name );
phase.clean( reactorProjects );
}
@@ -550,7 +550,6 @@ public class DefaultReleaseManager
phases.addAll( updateVersionsPhases );
}
-
return Collections.unmodifiableList( phases );
}
@@ -573,110 +572,86 @@ public class DefaultReleaseManager
result.setResultCode( ReleaseResult.ERROR );
}
- public void branch( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects,
+ public void branch( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
boolean dryRun )
throws ReleaseExecutionException, ReleaseFailureException
{
branch( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, dryRun );
}
- public void branch( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects,
- boolean dryRun,
- ReleaseManagerListener listener )
+ public void branch( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
+ boolean dryRun, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException
{
- branch( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, dryRun, listener );
+ branch( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, dryRun,
+ listener );
}
- public void perform( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects )
+ public void perform( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
perform( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects );
}
- public void perform( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects,
+ public void perform( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException
{
perform( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, listener );
}
- public void perform( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects,
+ public void perform( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
boolean clean )
throws ReleaseExecutionException, ReleaseFailureException
{
perform( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, clean );
}
- public ReleaseResult performWithResult( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects,
- ReleaseManagerListener listener )
+ public ReleaseResult performWithResult( ReleaseDescriptor releaseDescriptor, Settings settings,
+ List<MavenProject> reactorProjects, ReleaseManagerListener listener )
{
- return performWithResult( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, listener );
+ return performWithResult( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ),
+ reactorProjects, listener );
}
- public void prepare( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects )
+ public void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
prepare( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects );
}
- public void prepare( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects,
- boolean resume,
- boolean dryRun )
+ public void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
+ boolean resume, boolean dryRun )
throws ReleaseExecutionException, ReleaseFailureException
{
- prepare( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, resume, dryRun );
+ prepare( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, resume,
+ dryRun );
}
- public void prepare( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects,
- boolean resume,
- boolean dryRun,
- ReleaseManagerListener listener )
+ public void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
+ boolean resume, boolean dryRun, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException
{
- prepare( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, resume, dryRun, listener );
+ prepare( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, resume,
+ dryRun, listener );
}
- public ReleaseResult prepareWithResult( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects,
- boolean resume,
- boolean dryRun,
+ public ReleaseResult prepareWithResult( ReleaseDescriptor releaseDescriptor, Settings settings,
+ List<MavenProject> reactorProjects, boolean resume, boolean dryRun,
ReleaseManagerListener listener )
{
- return prepareWithResult( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, resume, dryRun, listener );
+ return prepareWithResult( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ),
+ reactorProjects, resume, dryRun, listener );
}
- public void rollback( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects,
+ public void rollback( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException
{
rollback( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, listener );
}
- public void rollback( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects )
+ public void rollback( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
rollback( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, null );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java Fri Jun 24 20:52:14 2011
@@ -47,7 +47,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem performing the release
* @throws ReleaseFailureException if there is a problem performing the release
*/
- void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -75,8 +76,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem performing the release
* @throws ReleaseFailureException if there is a problem performing the release
*/
- void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean resume,
- boolean dryRun )
+ void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean resume, boolean dryRun )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -92,8 +93,8 @@ public interface ReleaseManager
*
* @deprecated Use {@link ReleaseManager#prepare(ReleaseDescriptor, ReleaseEnvironment, List, boolean, boolean)} instead.
*/
- void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects, boolean resume,
- boolean dryRun )
+ void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
+ boolean resume, boolean dryRun )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -108,8 +109,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem performing the release
* @throws ReleaseFailureException if there is a problem performing the release
*/
- void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean resume,
- boolean dryRun, ReleaseManagerListener listener )
+ void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean resume, boolean dryRun, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -126,18 +127,20 @@ public interface ReleaseManager
*
* @deprecated Use {@link ReleaseManager#prepare(ReleaseDescriptor, ReleaseEnvironment, List, boolean, boolean, ReleaseManagerListener)} instead.
*/
- void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects, boolean resume,
- boolean dryRun, ReleaseManagerListener listener )
+ void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
+ boolean resume, boolean dryRun, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException;
- ReleaseResult prepareWithResult( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
- boolean resume, boolean dryRun, ReleaseManagerListener listener );
+ ReleaseResult prepareWithResult( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean resume, boolean dryRun,
+ ReleaseManagerListener listener );
/**
* @deprecated Use {@link ReleaseManager#prepareWithResult(ReleaseDescriptor, ReleaseEnvironment, List, boolean, boolean, ReleaseManagerListener)} instead.
*/
- ReleaseResult prepareWithResult( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
- boolean resume, boolean dryRun, ReleaseManagerListener listener );
+ ReleaseResult prepareWithResult( ReleaseDescriptor releaseDescriptor, Settings settings,
+ List<MavenProject> reactorProjects, boolean resume, boolean dryRun,
+ ReleaseManagerListener listener );
/**
* Perform a release.
@@ -148,7 +151,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem performing the release
* @throws ReleaseFailureException if there is a problem performing the release
*/
- void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -175,8 +179,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem performing the release
* @throws ReleaseFailureException if there is a problem performing the release
*/
- void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
- ReleaseManagerListener listener )
+ void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -195,15 +199,14 @@ public interface ReleaseManager
ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException;
- ReleaseResult performWithResult( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
- ReleaseManagerListener listener );
+ ReleaseResult performWithResult( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, ReleaseManagerListener listener );
/**
* @deprecated Use {@link ReleaseManager#performWithResult(ReleaseDescriptor, ReleaseEnvironment, List, ReleaseManagerListener)} instead.
*/
- ReleaseResult performWithResult( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
- ReleaseManagerListener listener );
-
+ ReleaseResult performWithResult( ReleaseDescriptor releaseDescriptor, Settings settings,
+ List<MavenProject> reactorProjects, ReleaseManagerListener listener );
/**
* Perform a release, and optionnaly cleanup.
@@ -215,7 +218,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem performing the release
* @throws ReleaseFailureException if there is a problem performing the release
*/
- void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean clean )
+ void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean clean )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -230,7 +234,8 @@ public interface ReleaseManager
*
* @deprecated Use {@link ReleaseManager#perform(ReleaseDescriptor, ReleaseEnvironment, List, boolean)} instead.
*/
- void perform( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects, boolean clean )
+ void perform( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
+ boolean clean )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -250,7 +255,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem during release rollback
* @throws ReleaseFailureException if there is a problem during release rollback
*/
- void rollback( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ void rollback( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -277,8 +283,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem during release rollback
* @throws ReleaseFailureException if there is a problem during release rollback
*/
- void rollback( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
- ReleaseManagerListener listener )
+ void rollback( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -307,7 +313,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem during release rollback
* @throws ReleaseFailureException if there is a problem during release rollback
*/
- void branch( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean dryRun )
+ void branch( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean dryRun )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -322,7 +329,8 @@ public interface ReleaseManager
*
* @deprecated Use {@link ReleaseManager#branch(ReleaseDescriptor, ReleaseEnvironment, List, boolean)} instead.
*/
- void branch( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects, boolean dryRun )
+ void branch( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
+ boolean dryRun )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -336,8 +344,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem during release rollback
* @throws ReleaseFailureException if there is a problem during release rollback
*/
- void branch( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean dryRun,
- ReleaseManagerListener listener )
+ void branch( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean dryRun, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -353,8 +361,8 @@ public interface ReleaseManager
*
* @deprecated Use {@link ReleaseManager#branch(ReleaseDescriptor, ReleaseEnvironment, List, boolean, ReleaseManagerListener)} instead.
*/
- void branch( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects, boolean dryRun,
- ReleaseManagerListener listener )
+ void branch( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
+ boolean dryRun, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -366,7 +374,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem during release rollback
* @throws ReleaseFailureException if there is a problem during release rollback
*/
- void updateVersions( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ void updateVersions( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException;
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseResult.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseResult.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseResult.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseResult.java Fri Jun 24 20:52:14 2011
@@ -37,7 +37,7 @@ public class ReleaseResult
private long endTime;
- private final String LS = System.getProperty( "line.separator" );
+ private final static String LS = System.getProperty( "line.separator" );
public void appendInfo( String message )
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java Fri Jun 24 20:52:14 2011
@@ -168,13 +168,15 @@ public class PropertiesReleaseDescriptor
properties.setProperty( "completionGoals", config.getCompletionGoals() );
}
- properties.setProperty( "exec.snapshotReleasePluginAllowed", Boolean.toString( config.isSnapshotReleasePluginAllowed() ) );
+ properties.setProperty( "exec.snapshotReleasePluginAllowed",
+ Boolean.toString( config.isSnapshotReleasePluginAllowed() ) );
properties.setProperty( "remoteTagging", Boolean.toString( config.isRemoteTagging() ) );
properties.setProperty( "pushChanges", Boolean.toString( config.isPushChanges() ) );
- // others boolean properties are not written to the properties file because the value from the caller is always used
+ // others boolean properties are not written to the properties file because the value from the caller is always
+ // used
for ( Iterator i = config.getReleaseVersions().entrySet().iterator(); i.hasNext(); )
{
@@ -218,8 +220,8 @@ public class PropertiesReleaseDescriptor
}
}
- if ( ( config.getResolvedSnapshotDependencies() != null ) &&
- ( config.getResolvedSnapshotDependencies().size() > 0 ) )
+ if ( ( config.getResolvedSnapshotDependencies() != null )
+ && ( config.getResolvedSnapshotDependencies().size() > 0 ) )
{
processResolvedDependencies( properties, config.getResolvedSnapshotDependencies() );
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java Fri Jun 24 20:52:14 2011
@@ -42,30 +42,31 @@ public class RawStreamPumper
this.out = out;
this.poll = poll;
}
+
public RawStreamPumper( InputStream in , OutputStream out )
{
this.in = in;
this.out = out;
this.poll = false;
}
-
+
public void setDone()
{
done = true;
}
-
+
public void closeInput()
- throws IOException
+ throws IOException
{
in.close();
}
-
- public void closeOutput()
- throws IOException
+
+ public void closeOutput()
+ throws IOException
{
out.close();
}
-
+
public void run()
{
try
@@ -77,19 +78,19 @@ public class RawStreamPumper
if ( in.available() > 0 )
{
int i = in.read( buffer );
- if (i != -1)
+ if ( i != -1 )
{
out.write( buffer, 0, i );
out.flush();
- }
+ }
else
{
done = true;
}
- }
+ }
else
{
- Thread.sleep( 1 );
+ Thread.sleep( 1 );
}
}
}
@@ -98,17 +99,17 @@ public class RawStreamPumper
int i = in.read( buffer );
while ( i != -1 && !done )
{
- if ( i != -1 )
+ if ( i != -1 )
{
out.write( buffer, 0, i );
out.flush();
- }
+ }
else
{
done = true;
}
i = in.read( buffer );
- }
+ }
}
}
catch ( Throwable e )
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java Fri Jun 24 20:52:14 2011
@@ -112,10 +112,8 @@ public abstract class AbstractRewritePom
List<MavenProject> reactorProjects, boolean simulate, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
- for ( Iterator<MavenProject> it = reactorProjects.iterator(); it.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = (MavenProject) it.next();
-
logInfo( result, "Transforming '" + project.getName() + "'..." );
transformProject( project, releaseDescriptor, releaseEnvironment, reactorProjects, simulate, result );
@@ -123,8 +121,8 @@ public abstract class AbstractRewritePom
}
private void transformProject( MavenProject project, ReleaseDescriptor releaseDescriptor,
- ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean simulate,
- ReleaseResult result )
+ ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
+ boolean simulate, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
Document document;
@@ -316,7 +314,8 @@ public abstract class AbstractRewritePom
}
catch ( IOException e )
{
- throw new ReleaseExecutionException("Exception occurred while calculating common basedir: " + e.getMessage(), e);
+ throw new ReleaseExecutionException( "Exception occurred while calculating common basedir: "
+ + e.getMessage(), e );
}
transformScm( project, rootElement, namespace, releaseDescriptor, projectId, scmRepository, result,
commonBasedir );
@@ -535,18 +534,19 @@ public abstract class AbstractRewritePom
XPath xpath;
if ( !StringUtils.isEmpty( dependencyRoot.getNamespaceURI() ) )
{
- xpath = XPath.newInstance(
- "./pom:" + groupTagName + "/pom:" + tagName + "[normalize-space(pom:groupId)='" + groupId +
- "' and normalize-space(pom:artifactId)='" + artifactId + "']" );
+ xpath =
+ XPath.newInstance( "./pom:" + groupTagName + "/pom:" + tagName + "[normalize-space(pom:groupId)='"
+ + groupId + "' and normalize-space(pom:artifactId)='" + artifactId + "']" );
xpath.addNamespace( "pom", dependencyRoot.getNamespaceURI() );
}
else
{
- xpath = XPath.newInstance( "./" + groupTagName + "/" + tagName + "[normalize-space(groupId)='" + groupId +
- "' and normalize-space(artifactId)='" + artifactId + "']" );
+ xpath =
+ XPath.newInstance( "./" + groupTagName + "/" + tagName + "[normalize-space(groupId)='" + groupId
+ + "' and normalize-space(artifactId)='" + artifactId + "']" );
}
- List dependencies = xpath.selectNodes( dependencyRoot );
+ List<Element> dependencies = xpath.selectNodes( dependencyRoot );
//MRELEASE-147
if ( ( dependencies == null || dependencies.isEmpty() ) && groupId.indexOf( "${" ) == -1 )
@@ -563,29 +563,28 @@ public abstract class AbstractRewritePom
}
private void updateDomVersion( String groupId, String artifactId, Map mappedVersions,
- Map resolvedSnapshotDepedencies, String version, Map originalVersions,
+ Map resolvedSnapshotDependencies, String version, Map originalVersions,
String groupTagName, String tagName, Element dependencyRoot, String projectId,
Element properties, ReleaseResult result, ReleaseDescriptor releaseDescriptor )
throws ReleaseExecutionException, ReleaseFailureException
{
String key = ArtifactUtils.versionlessKey( groupId, artifactId );
String mappedVersion = (String) mappedVersions.get( key );
- String resolvedSnapshotVersion = getResolvedSnapshotVersion( key, resolvedSnapshotDepedencies );
+ String resolvedSnapshotVersion = getResolvedSnapshotVersion( key, resolvedSnapshotDependencies );
Object originalVersion = originalVersions.get( key );
// workaround
if ( originalVersion == null )
{
- originalVersion = getOriginalResolvedSnapshotVersion( key, resolvedSnapshotDepedencies );
+ originalVersion = getOriginalResolvedSnapshotVersion( key, resolvedSnapshotDependencies );
}
try
{
List<Element> dependencies = getDependencies( groupId, artifactId, groupTagName, tagName, dependencyRoot );
- for ( Iterator<Element> i = dependencies.iterator(); i.hasNext(); )
+ for ( Element dependency : dependencies )
{
- Element dependency = i.next();
String dependencyVersion = "";
Element versionElement = null;
@@ -599,8 +598,8 @@ public abstract class AbstractRewritePom
}
//MRELEASE-220
- if ( mappedVersion != null && mappedVersion.endsWith( "SNAPSHOT" ) &&
- !dependencyVersion.endsWith( "SNAPSHOT" ) && !releaseDescriptor.isUpdateDependencies() )
+ if ( mappedVersion != null && mappedVersion.endsWith( "SNAPSHOT" )
+ && !dependencyVersion.endsWith( "SNAPSHOT" ) && !releaseDescriptor.isUpdateDependencies() )
{
return;
}
@@ -609,8 +608,8 @@ public abstract class AbstractRewritePom
{
if ( ( mappedVersion != null ) || ( resolvedSnapshotVersion != null ) )
{
- logInfo( result, "Updating " + artifactId + " to " +
- ( ( mappedVersion != null ) ? mappedVersion : resolvedSnapshotVersion ) );
+ logInfo( result, "Updating " + artifactId + " to "
+ + ( ( mappedVersion != null ) ? mappedVersion : resolvedSnapshotVersion ) );
// If it was inherited, nothing to do
if ( dependency != null )
@@ -656,14 +655,14 @@ public abstract class AbstractRewritePom
else if ( mappedVersion.equals( propertyValue ) )
{
//this property may have been updated during processing a sibling.
- logInfo( result, "Ignoring artifact version update for expression: " +
- mappedVersion + " because it is already updated." );
+ logInfo( result, "Ignoring artifact version update for expression: "
+ + mappedVersion + " because it is already updated." );
}
else if ( !mappedVersion.equals( versionText ) )
{
- if ( mappedVersion.matches( "\\$\\{project.+\\}" ) ||
- mappedVersion.matches( "\\$\\{pom.+\\}" ) ||
- "${version}".equals( mappedVersion ) )
+ if ( mappedVersion.matches( "\\$\\{project.+\\}" )
+ || mappedVersion.matches( "\\$\\{pom.+\\}" )
+ || "${version}".equals( mappedVersion ) )
{
logInfo( result, "Ignoring artifact version update for expression: " +
mappedVersion );
@@ -672,11 +671,11 @@ public abstract class AbstractRewritePom
else
{
// the value of the expression conflicts with what the user wanted to release
- throw new ReleaseFailureException(
- "The artifact (" + key + ") requires a " + "different version (" +
- mappedVersion + ") than what is found (" + propertyValue +
- ") for the expression (" + expression + ") in the " +
- "project (" + projectId + ")." );
+ throw new ReleaseFailureException( "The artifact (" + key
+ + ") requires a " + "different version (" + mappedVersion
+ + ") than what is found (" + propertyValue
+ + ") for the expression (" + expression + ") in the " + "project ("
+ + projectId + ")." );
}
}
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java Fri Jun 24 20:52:14 2011
@@ -45,7 +45,7 @@ public abstract class AbstractRunGoalsPh
*
* @plexus.requirement role="org.apache.maven.shared.release.exec.MavenExecutor"
*/
- private Map<String,MavenExecutor> mavenExecutors;
+ private Map<String, MavenExecutor> mavenExecutors;
/**
* @deprecated Use {@link AbstractRunGoalsPhase#execute(ReleaseDescriptor, ReleaseEnvironment, File, String)} instead.
@@ -70,8 +70,7 @@ public abstract class AbstractRunGoalsPh
{
logInfo( result, "Executing goals '" + goals + "'..." );
- MavenExecutor mavenExecutor =
- (MavenExecutor) mavenExecutors.get( releaseEnvironment.getMavenExecutorId() );
+ MavenExecutor mavenExecutor = mavenExecutors.get( releaseEnvironment.getMavenExecutorId() );
if ( mavenExecutor == null )
{
@@ -107,7 +106,7 @@ public abstract class AbstractRunGoalsPh
{
if ( mavenExecutors == null )
{
- mavenExecutors = new HashMap<String,MavenExecutor>();
+ mavenExecutors = new HashMap<String, MavenExecutor>();
}
mavenExecutors.put( id, executor );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java Fri Jun 24 20:52:14 2011
@@ -77,9 +77,8 @@ public class CheckoutProjectFromScm
// the first step is a bit tricky, we need to know which provider! like e.g. "scm:jgit:http://"
// the offset of 4 is because 'scm:' has 4 characters...
- String providerPart = releaseDescriptor.getScmSourceUrl().substring( 0,
- releaseDescriptor.getScmSourceUrl().indexOf(
- ':', 4 ) );
+ String providerPart =
+ releaseDescriptor.getScmSourceUrl().substring( 0, releaseDescriptor.getScmSourceUrl().indexOf( ':', 4 ) );
releaseDescriptor.setScmSourceUrl( providerPart + ":file://" + releaseDescriptor.getWorkingDirectory() );
getLogger().info( "Performing a LOCAL checkout from " + releaseDescriptor.getScmSourceUrl() );
}
@@ -161,7 +160,8 @@ public class CheckoutProjectFromScm
}
catch ( IOException e )
{
- throw new ReleaseExecutionException("Exception occurred while calculating common basedir: " + e.getMessage(), e);
+ throw new ReleaseExecutionException( "Exception occurred while calculating common basedir: "
+ + e.getMessage(), e );
}
String rootProjectBasedir = rootProject.getBasedir().getAbsolutePath();
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java Fri Jun 24 20:52:14 2011
@@ -80,20 +80,21 @@ public class GenerateReleasePomsPhase
*
* @plexus.requirement role="org.apache.maven.shared.release.scm.ScmTranslator"
*/
- private Map<String,ScmTranslator> scmTranslators;
+ private Map<String, ScmTranslator> scmTranslators;
/*
* @see org.apache.maven.shared.release.phase.ReleasePhase#execute(org.apache.maven.shared.release.config.ReleaseDescriptor,
* org.apache.maven.settings.Settings, java.util.List)
*/
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
return execute( releaseDescriptor, releaseEnvironment, reactorProjects, false );
}
- private ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
- boolean simulate )
+ private ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean simulate )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -114,26 +115,26 @@ public class GenerateReleasePomsPhase
return result;
}
- private void generateReleasePoms( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
- boolean simulate, ReleaseResult result )
+ private void generateReleasePoms( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean simulate, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
List<File> releasePoms = new ArrayList<File>();
- for ( Iterator<MavenProject> iterator = reactorProjects.iterator(); iterator.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = iterator.next();
-
logInfo( result, "Generating release POM for '" + project.getName() + "'..." );
- releasePoms.add( generateReleasePom( project, releaseDescriptor, releaseEnvironment, reactorProjects, simulate, result ) );
+ releasePoms.add( generateReleasePom( project, releaseDescriptor, releaseEnvironment, reactorProjects,
+ simulate, result ) );
}
addReleasePomsToScm( releaseDescriptor, releaseEnvironment, reactorProjects, simulate, result, releasePoms );
}
- private File generateReleasePom( MavenProject project, ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects, boolean simulate, ReleaseResult result )
+ private File generateReleasePom( MavenProject project, ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
+ boolean simulate, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
// create release pom
@@ -148,7 +149,9 @@ public class GenerateReleasePomsPhase
// MRELEASE-273 : A release pom can be null
if ( releasePomFile == null )
+ {
throw new ReleaseExecutionException( "Cannot generate release POM : pom file is null" );
+ }
Writer fileWriter = null;
@@ -170,7 +173,9 @@ public class GenerateReleasePomsPhase
return releasePomFile;
}
- private void addReleasePomsToScm( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects, boolean simulate, ReleaseResult result, List<File> releasePoms )
+ private void addReleasePomsToScm( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean simulate, ReleaseResult result,
+ List<File> releasePoms )
throws ReleaseFailureException, ReleaseExecutionException
{
if ( simulate )
@@ -202,8 +207,9 @@ public class GenerateReleasePomsPhase
}
}
- private Model createReleaseModel( MavenProject project, ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects, ReleaseResult result )
+ private Model createReleaseModel( MavenProject project, ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
+ ReleaseResult result )
throws ReleaseFailureException, ReleaseExecutionException
{
Map originalVersions = getOriginalVersionMap( releaseDescriptor, reactorProjects );
@@ -221,7 +227,8 @@ public class GenerateReleasePomsPhase
// update project version
String projectVersion = releaseModel.getVersion();
- String releaseVersion = getNextVersion( mappedVersions, project.getGroupId(), project.getArtifactId(), projectVersion );
+ String releaseVersion =
+ getNextVersion( mappedVersions, project.getGroupId(), project.getArtifactId(), projectVersion );
releaseModel.setVersion( releaseVersion );
// update final name if implicit
@@ -266,17 +273,20 @@ public class GenerateReleasePomsPhase
releaseModel.getBuild().setPlugins( createReleasePlugins( originalVersions, mappedVersions, releaseProject ) );
// rewrite reports
- releaseModel.getReporting().setPlugins( createReleaseReportPlugins( originalVersions, mappedVersions, releaseProject ) );
+ releaseModel.getReporting().setPlugins( createReleaseReportPlugins( originalVersions, mappedVersions,
+ releaseProject ) );
// rewrite extensions
- releaseModel.getBuild().setExtensions( createReleaseExtensions( originalVersions, mappedVersions, releaseProject ) );
+ releaseModel.getBuild().setExtensions( createReleaseExtensions( originalVersions, mappedVersions,
+ releaseProject ) );
pathTranslator.unalignFromBaseDirectory( releaseProject.getModel(), project.getFile().getParentFile() );
return releaseModel;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
return execute( releaseDescriptor, releaseEnvironment, reactorProjects, true );
@@ -465,7 +475,8 @@ public class GenerateReleasePomsPhase
return releasePlugins;
}
- private List<ReportPlugin> createReleaseReportPlugins( Map originalVersions, Map mappedVersions, MavenProject project )
+ private List<ReportPlugin> createReleaseReportPlugins( Map originalVersions, Map mappedVersions,
+ MavenProject project )
throws ReleaseFailureException
{
List<ReportPlugin> releaseReportPlugins = null;
@@ -549,10 +560,8 @@ public class GenerateReleasePomsPhase
{
ReleaseResult result = new ReleaseResult();
- for ( Iterator<MavenProject> iterator = reactorProjects.iterator(); iterator.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = iterator.next();
-
File releasePom = ReleaseUtil.getReleasePom( project );
// MRELEASE-273 : A release pom can be null
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java Fri Jun 24 20:52:14 2011
@@ -77,7 +77,8 @@ public class InputVariablesPhase
{
try
{
- ScmRepository repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
+ ScmRepository repository =
+ scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
return scmRepositoryConfigurator.getRepositoryProvider( repository );
}
@@ -92,7 +93,8 @@ public class InputVariablesPhase
}
}
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
@@ -156,8 +158,9 @@ public class InputVariablesPhase
{
try
{
- tag = prompter.prompt( "What is SCM release tag or label for \"" + project.getName() + "\"? (" +
- project.getGroupId() + ":" + project.getArtifactId() + ")", defaultTag );
+ tag =
+ prompter.prompt( "What is SCM release tag or label for \"" + project.getName() + "\"? ("
+ + project.getGroupId() + ":" + project.getArtifactId() + ")", defaultTag );
}
catch ( PrompterException e )
{
@@ -177,7 +180,8 @@ public class InputVariablesPhase
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java Fri Jun 24 20:52:14 2011
@@ -63,7 +63,8 @@ public class MapVersionsPhase
this.prompter = prompter;
}
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
@@ -259,10 +260,9 @@ public class MapVersionsPhase
{
if ( convertToBranch )
{
- //branch modification
- if ( releaseDescriptor.isUpdateBranchVersions() && (
- ArtifactUtils.isSnapshot( project.getVersion() ) ||
- releaseDescriptor.isUpdateVersionsToSnapshot() ) )
+ // branch modification
+ if ( releaseDescriptor.isUpdateBranchVersions()
+ && ( ArtifactUtils.isSnapshot( project.getVersion() ) || releaseDescriptor.isUpdateVersionsToSnapshot() ) )
{
nextVersion = releaseVersionInfo.getSnapshotVersionString();
if ( !releaseVersionIsExplicit && releaseDescriptor.isInteractive() )
@@ -280,15 +280,16 @@ public class MapVersionsPhase
}
else
{
- //working copy modification
- if ( ArtifactUtils.isSnapshot( project.getVersion() ) &&
- releaseDescriptor.isUpdateWorkingCopyVersions() )
+ // working copy modification
+ if ( ArtifactUtils.isSnapshot( project.getVersion() )
+ && releaseDescriptor.isUpdateWorkingCopyVersions() )
{
nextVersion = nextSnapshotVersionInfo.getSnapshotVersionString();
if ( releaseDescriptor.isInteractive() && !nextSnapshotVersionIsExplicit )
{
- nextVersion = prompter.prompt( "What is the new working copy version for \"" +
- project.getName() + "\"? (" + projectId + ")", nextVersion );
+ nextVersion =
+ prompter.prompt( "What is the new working copy version for \"" + project.getName()
+ + "\"? (" + projectId + ")", nextVersion );
}
}
else
@@ -302,8 +303,9 @@ public class MapVersionsPhase
nextVersion = nextSnapshotVersionInfo.getSnapshotVersionString();
if ( releaseDescriptor.isInteractive() && !nextSnapshotVersionIsExplicit )
{
- nextVersion = prompter.prompt( "What is the new development version for \"" +
- project.getName() + "\"? (" + projectId + ")", nextVersion );
+ nextVersion =
+ prompter.prompt( "What is the new development version for \"" + project.getName() + "\"? ("
+ + projectId + ")", nextVersion );
}
}
}
@@ -334,7 +336,8 @@ public class MapVersionsPhase
return nextVersion;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java Fri Jun 24 20:52:14 2011
@@ -1,14 +1,5 @@
package org.apache.maven.shared.release.phase;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.release.ReleaseExecutionException;
-import org.apache.maven.shared.release.ReleaseFailureException;
-import org.apache.maven.shared.release.ReleaseResult;
-import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.shared.release.env.ReleaseEnvironment;
-
-import java.util.List;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -28,6 +19,15 @@ import java.util.List;
* under the License.
*/
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.release.ReleaseExecutionException;
+import org.apache.maven.shared.release.ReleaseFailureException;
+import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
+
+import java.util.List;
+
/**
* @author Edwin Punzalan
* @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase" role-hint="remove-scm-tag"
@@ -35,7 +35,8 @@ import java.util.List;
public class RemoveScmTagPhase
extends AbstractReleasePhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -47,7 +48,8 @@ public class RemoveScmTagPhase
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
return execute( releaseDescriptor, releaseEnvironment, reactorProjects );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java Fri Jun 24 20:52:14 2011
@@ -47,7 +47,7 @@ public class RewritePomsForBranchPhase
/**
* SCM URL translators mapped by provider name.
*/
- private Map<String,ScmTranslator> scmTranslators;
+ private Map<String, ScmTranslator> scmTranslators;
protected void transformScm( MavenProject project, Element rootElement, Namespace namespace,
ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
@@ -68,7 +68,7 @@ public class RewritePomsForBranchPhase
}
catch ( IOException e )
{
- throw new ReleaseExecutionException(e.getMessage(), e);
+ throw new ReleaseExecutionException( e.getMessage(), e );
}
}
else
@@ -97,7 +97,7 @@ public class RewritePomsForBranchPhase
}
catch ( IOException e )
{
- throw new ReleaseExecutionException(e.getMessage(), e);
+ throw new ReleaseExecutionException( e.getMessage(), e );
}
}
}
@@ -110,7 +110,7 @@ public class RewritePomsForBranchPhase
String commonBasedir )
throws IOException
{
- ScmTranslator translator = (ScmTranslator) scmTranslators.get( scmRepository.getProvider() );
+ ScmTranslator translator = scmTranslators.get( scmRepository.getProvider() );
boolean result = false;
if ( translator != null )
{
@@ -226,7 +226,7 @@ public class RewritePomsForBranchPhase
if ( versionsMap != null )
{
- return (String) ( versionsMap.get( ReleaseDescriptor.RELEASE_KEY ) );
+ return (String) versionsMap.get( ReleaseDescriptor.RELEASE_KEY );
}
else
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java Fri Jun 24 20:52:14 2011
@@ -43,7 +43,7 @@ public class RewritePomsForDevelopmentPh
/**
* SCM URL translators mapped by provider name.
*/
- private Map<String,ScmTranslator> scmTranslators;
+ private Map<String, ScmTranslator> scmTranslators;
protected void transformScm( MavenProject project, Element rootElement, Namespace namespace,
ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java Fri Jun 24 20:52:14 2011
@@ -47,7 +47,7 @@ public class RewritePomsForReleasePhase
/**
* SCM URL translators mapped by provider name.
*/
- private Map<String,ScmTranslator> scmTranslators;
+ private Map<String, ScmTranslator> scmTranslators;
protected void transformScm( MavenProject project, Element rootElement, Namespace namespace,
ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
@@ -97,7 +97,7 @@ public class RewritePomsForReleasePhase
}
catch ( IOException e )
{
- throw new ReleaseExecutionException(e.getMessage(), e);
+ throw new ReleaseExecutionException( e.getMessage(), e );
}
}
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java Fri Jun 24 20:52:14 2011
@@ -38,20 +38,22 @@ import org.apache.maven.shared.release.e
public class RunCompleteGoalsPhase
extends AbstractRunGoalsPhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
return execute( releaseDescriptor, releaseEnvironment, new File( releaseDescriptor.getWorkingDirectory() ),
releaseDescriptor.getAdditionalArguments() );
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
- logInfo( result, "Executing completion goals - since this is simulation mode it is running against the " +
- "original project, not the rewritten ones" );
+ logInfo( result, "Executing completion goals - since this is simulation mode it is running against the "
+ + "original project, not the rewritten ones" );
execute( releaseDescriptor, releaseEnvironment, reactorProjects );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java Fri Jun 24 20:52:14 2011
@@ -39,7 +39,8 @@ import java.util.List;
public class RunPerformGoalsPhase
extends AbstractRunGoalsPhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
String additionalArguments = releaseDescriptor.getAdditionalArguments();
@@ -67,7 +68,7 @@ public class RunPerformGoalsPhase
}
String workDir = releaseDescriptor.getWorkingDirectory();
- if ( workDir == null)
+ if ( workDir == null )
{
workDir = System.getProperty( "user.dir" );
}
@@ -93,10 +94,12 @@ public class RunPerformGoalsPhase
}
- return execute( releaseDescriptor, releaseEnvironment, new File( releaseDescriptor.getCheckoutDirectory() ), additionalArguments );
+ return execute( releaseDescriptor, releaseEnvironment, new File( releaseDescriptor.getCheckoutDirectory() ),
+ additionalArguments );
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();