Author: rfscholte
Date: Tue May 1 20:59:06 2012
New Revision: 1332817
URL: http://svn.apache.org/viewvc?rev=1332817&view=rev
Log:
code formatting
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/ReleaseResult.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
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=1332817&r1=1332816&r2=1332817&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
Tue May 1 20:59:06 2012
@@ -177,7 +177,8 @@ public class DefaultReleaseManager
ReleaseDescriptor config;
if ( BooleanUtils.isNotFalse( prepareRequest.getResume() ) )
{
- config = loadReleaseDescriptor(
prepareRequest.getReleaseDescriptor(),
prepareRequest.getReleaseManagerListener() );
+ config = loadReleaseDescriptor(
prepareRequest.getReleaseDescriptor(),
+
prepareRequest.getReleaseManagerListener() );
}
else
{
@@ -226,13 +227,13 @@ public class DefaultReleaseManager
{
phaseResult = phase.simulate( config,
prepareRequest.getReleaseEnvironment(),
-
prepareRequest.getReactorProjects());
+
prepareRequest.getReactorProjects() );
}
else
{
phaseResult = phase.execute( config,
prepareRequest.getReleaseEnvironment(),
-
prepareRequest.getReactorProjects());
+
prepareRequest.getReactorProjects() );
}
}
finally
@@ -529,7 +530,8 @@ public class DefaultReleaseManager
{
updateListener( updateVersionsRequest.getReleaseManagerListener(),
"updateVersions", GOAL_START );
- ReleaseDescriptor releaseDescriptor = loadReleaseDescriptor(
updateVersionsRequest.getReleaseDescriptor(),
updateVersionsRequest.getReleaseManagerListener() );
+ ReleaseDescriptor releaseDescriptor = loadReleaseDescriptor(
updateVersionsRequest.getReleaseDescriptor(),
+
updateVersionsRequest.getReleaseManagerListener() );
for ( String name : updateVersionsPhases )
{
@@ -547,7 +549,9 @@ public class DefaultReleaseManager
updateListener( updateVersionsRequest.getReleaseManagerListener(),
name, PHASE_END );
}
- clean( releaseDescriptor,
updateVersionsRequest.getReleaseManagerListener(),
updateVersionsRequest.getReactorProjects() );
+ clean( releaseDescriptor,
+ updateVersionsRequest.getReleaseManagerListener(),
+ updateVersionsRequest.getReactorProjects() );
updateListener( updateVersionsRequest.getReleaseManagerListener(),
"updateVersions", GOAL_END );
}
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=1332817&r1=1332816&r2=1332817&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
Tue May 1 20:59:06 2012
@@ -27,7 +27,7 @@ import java.io.PrintStream;
*/
public class ReleaseResult
{
- public final static int UNDEFINED = -1, SUCCESS = 0, ERROR = 1;
+ public static final int UNDEFINED = -1, SUCCESS = 0, ERROR = 1;
private StringBuffer stdOut = new StringBuffer();
@@ -37,7 +37,7 @@ public class ReleaseResult
private long endTime;
- private final static String LS = System.getProperty( "line.separator" );
+ private static final 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/exec/ForkedMavenExecutor.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java?rev=1332817&r1=1332816&r2=1332817&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
Tue May 1 20:59:06 2012
@@ -108,7 +108,7 @@ public class ForkedMavenExecutor
if ( settingsFile != null )
{
- cl.createArg().setValue( "-s");
+ cl.createArg().setValue( "-s" );
cl.createArg().setFile( settingsFile );
}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java?rev=1332817&r1=1332816&r2=1332817&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
Tue May 1 20:59:06 2012
@@ -165,7 +165,9 @@ public class InvokerMavenExecutor
}
// TODO: Configuring an invocation request from a command line could as
well be part of the Invoker API
- private void setupRequest( InvocationRequest req, LoggerBridge bridge,
String additionalArguments )
+ private void setupRequest( InvocationRequest req,
+ LoggerBridge bridge,
+ String additionalArguments )
throws MavenExecutorException
{
try
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java?rev=1332817&r1=1332816&r2=1332817&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
Tue May 1 20:59:06 2012
@@ -45,6 +45,7 @@ public interface MavenExecutor
* @param interactive whether to execute in interactive mode, or
the default batch mode
* @param additionalArguments additional arguments to pass to the Maven
command
* @param pomFileName the file name of the POM to execute on
+ * @param result holds all results of the execution
* @throws MavenExecutorException if an error occurred executing Maven
*/
void executeGoals( File workingDirectory, String goals, ReleaseEnvironment
releaseEnvironment,
@@ -59,6 +60,7 @@ public interface MavenExecutor
* @param releaseEnvironment the environmental settings, maven-home, etc
used for this release
* @param interactive whether to execute in interactive mode, or
the default batch mode
* @param additionalArguments additional arguments to pass to the Maven
command
+ * @param result holds all results of the execution
* @throws MavenExecutorException if an error occurred executing Maven
*/
void executeGoals( File workingDirectory, String goals, ReleaseEnvironment
releaseEnvironment,
@@ -73,6 +75,7 @@ public interface MavenExecutor
* @param interactive whether to execute in interactive mode, or
the default batch mode
* @param additionalArguments additional arguments to pass to the Maven
command
* @param pomFileName the file name of the POM to execute on
+ * @param result holds all results of the execution
* @throws MavenExecutorException if an error occurred executing Maven
*
* @deprecated Use {@link MavenExecutor#executeGoals(File, String,
ReleaseEnvironment, boolean, String, String, ReleaseResult)} instead
@@ -88,6 +91,7 @@ public interface MavenExecutor
* @param goals the goals to run (space delimited)
* @param interactive whether to execute in interactive mode, or
the default batch mode
* @param additionalArguments additional arguments to pass to the Maven
command
+ * @param result holds all results of the execution
* @throws MavenExecutorException if an error occurred executing Maven
*
* @deprecated Use {@link MavenExecutor#executeGoals(File, String,
ReleaseEnvironment, boolean, String, ReleaseResult)} instead
