Author: hboutemy
Date: Sun Mar 25 21:32:35 2012
New Revision: 1305146
URL: http://svn.apache.org/viewvc?rev=1305146&view=rev
Log:
use java 5 constructs, 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/ReleaseCleanRequest.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/ReleasePerformRequest.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.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/config/ReleaseUtils.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/IdentifiedScm.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ReleaseScmRepositoryException.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
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.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=1305146&r1=1305145&r2=1305146&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
Sun Mar 25 21:32:35 2012
@@ -165,7 +165,7 @@ public class DefaultReleaseManager
prepareRequest.setResume( resume );
prepareRequest.setDryRun( dryRun );
prepareRequest.setReleaseManagerListener( listener );
-
+
prepare( prepareRequest, result );
}
@@ -384,7 +384,7 @@ public class DefaultReleaseManager
performRequest.setReactorProjects( reactorProjects );
performRequest.setReleaseManagerListener( listener );
performRequest.setClean( clean );
-
+
perform( performRequest, result );
}
@@ -395,7 +395,7 @@ public class DefaultReleaseManager
ReleaseDescriptor releaseDescriptor = loadReleaseDescriptor(
performRequest.getReleaseDescriptor(),
performRequest.getReleaseManagerListener() );
-
+
for ( String name : performPhases )
{
ReleasePhase phase = releasePhases.get( name );
@@ -406,11 +406,11 @@ public class DefaultReleaseManager
}
updateListener( performRequest.getReleaseManagerListener(), name,
PHASE_START );
-
+
ReleaseResult phaseResult = null;
try
{
- if( BooleanUtils.isTrue( performRequest.getDryRun() ) )
+ if ( BooleanUtils.isTrue( performRequest.getDryRun() ) )
{
phaseResult = phase.simulate( releaseDescriptor,
performRequest.getReleaseEnvironment(),
@@ -430,10 +430,10 @@ public class DefaultReleaseManager
result.getOutputBuffer().append( phaseResult.getOutput() );
}
}
-
+
updateListener( performRequest.getReleaseManagerListener(), name,
PHASE_END );
}
-
+
if ( BooleanUtils.isTrue( performRequest.getClean() ) )
{
// call release:clean so that resume will not be possible anymore
after a perform
@@ -462,7 +462,7 @@ public class DefaultReleaseManager
branchRequest.setReactorProjects( reactorProjects );
branchRequest.setDryRun( dryRun );
branchRequest.setReleaseManagerListener( listener );
-
+
branch( branchRequest );
}
@@ -487,7 +487,7 @@ public class DefaultReleaseManager
}
updateListener( branchRequest.getReleaseManagerListener(), name,
PHASE_START );
-
+
if ( dryRun )
{
phase.simulate( releaseDescriptor,
@@ -521,7 +521,6 @@ public class DefaultReleaseManager
updateVersionsRequest.setReleaseDescriptor( releaseDescriptor );
updateVersionsRequest.setReleaseEnvironment( releaseEnvironment );
updateVersionsRequest.setReactorProjects( reactorProjects );
-
}
/** {@inheritDoc} */
@@ -602,7 +601,7 @@ public class DefaultReleaseManager
cleanRequest.setReleaseDescriptor( releaseDescriptor );
cleanRequest.setReleaseManagerListener( listener );
cleanRequest.setReactorProjects( reactorProjects );
-
+
clean( cleanRequest );
}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java
Sun Mar 25 21:32:35 2012
@@ -24,6 +24,7 @@ package org.apache.maven.shared.release;
* @author Robert Scholte
* @since 2.3
*/
-public class ReleaseCleanRequest extends AbstractReleaseRequest
+public class ReleaseCleanRequest
+ extends AbstractReleaseRequest
{
}
\ No newline at end of file
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=1305146&r1=1305145&r2=1305146&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
Sun Mar 25 21:32:35 2012
@@ -231,7 +231,7 @@ public interface ReleaseManager
void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment,
List<MavenProject> reactorProjects, boolean clean )
throws ReleaseExecutionException, ReleaseFailureException;
-
+
/**
* Perform a release
*
@@ -266,7 +266,7 @@ public interface ReleaseManager
* @param reactorProjects the reactor projects
*/
void clean( ReleaseDescriptor releaseDescriptor, ReleaseManagerListener
listener, List<MavenProject> reactorProjects );
-
+
/**
* Clean a release.
*
@@ -331,7 +331,7 @@ public interface ReleaseManager
void rollback( ReleaseDescriptor releaseDescriptor, Settings settings,
List<MavenProject> reactorProjects,
ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException;
-
+
/**
* Rollback changes made by the previous release
*
@@ -342,7 +342,7 @@ public interface ReleaseManager
*/
void rollback( ReleaseRollbackRequest rollbackRequest )
throws ReleaseExecutionException, ReleaseFailureException;
-
+
/**
* Branch a project
*
@@ -404,7 +404,7 @@ public interface ReleaseManager
void branch( ReleaseDescriptor releaseDescriptor, Settings settings,
List<MavenProject> reactorProjects,
boolean dryRun, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException;
-
+
/**
* Branch a project
*
@@ -414,7 +414,7 @@ public interface ReleaseManager
* @since 2.3
*/
void branch( ReleaseBranchRequest branchRequest ) throws
ReleaseExecutionException, ReleaseFailureException;
-
+
/**
* Update version numbers for a project
*
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java
Sun Mar 25 21:32:35 2012
@@ -26,14 +26,15 @@ import org.apache.maven.shared.release.e
* @author Robert Scholte
* @since 2.3
*/
-public class ReleasePerformRequest extends AbstractReleaseRequest
+public class ReleasePerformRequest
+ extends AbstractReleaseRequest
{
// using Boolean to detect if has been set explicitly
private Boolean dryRun;
-
+
// using Boolean to detect if has been set explicitly
private Boolean clean;
-
+
private ReleaseEnvironment releaseEnvironment;
/**
@@ -51,7 +52,7 @@ public class ReleasePerformRequest exten
{
this.dryRun = dryRun;
}
-
+
/**
* @return the clean
*/
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java
Sun Mar 25 21:32:35 2012
@@ -26,14 +26,15 @@ import org.apache.maven.shared.release.e
* @author Robert Scholte
* @since 2.3
*/
-public class ReleasePrepareRequest extends AbstractReleaseRequest
+public class ReleasePrepareRequest
+ extends AbstractReleaseRequest
{
// using Boolean to detect if has been set explicitly
private Boolean dryRun;
-
+
// using Boolean to detect if has been set explicitly
private Boolean resume;
-
+
private ReleaseEnvironment releaseEnvironment;
/**
@@ -51,7 +52,7 @@ public class ReleasePrepareRequest exten
{
this.dryRun = dryRun;
}
-
+
/**
* @return the resume
*/
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java
Sun Mar 25 21:32:35 2012
@@ -26,7 +26,8 @@ import org.apache.maven.shared.release.e
* @author Robert Scholte
* @since 2.3
*/
-public class ReleaseRollbackRequest extends AbstractReleaseRequest
+public class ReleaseRollbackRequest
+ extends AbstractReleaseRequest
{
private ReleaseEnvironment releaseEnvironment;
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java
Sun Mar 25 21:32:35 2012
@@ -26,7 +26,8 @@ import org.apache.maven.shared.release.e
* @author Robert Scholte
* @since 2.3
*/
-public class ReleaseUpdateVersionsRequest extends AbstractReleaseRequest
+public class ReleaseUpdateVersionsRequest
+ extends AbstractReleaseRequest
{
private ReleaseEnvironment releaseEnvironment;
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=1305146&r1=1305145&r2=1305146&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
Sun Mar 25 21:32:35 2012
@@ -183,21 +183,21 @@ public class PropertiesReleaseDescriptor
// 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(); )
+ for ( Iterator<?> i =
config.getReleaseVersions().entrySet().iterator(); i.hasNext(); )
{
- Map.Entry entry = (Map.Entry) i.next();
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>) i.next();
properties.setProperty( "project.rel." + entry.getKey(), (String)
entry.getValue() );
}
- for ( Iterator i =
config.getDevelopmentVersions().entrySet().iterator(); i.hasNext(); )
+ for ( Iterator<?> i =
config.getDevelopmentVersions().entrySet().iterator(); i.hasNext(); )
{
- Map.Entry entry = (Map.Entry) i.next();
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>) i.next();
properties.setProperty( "project.dev." + entry.getKey(), (String)
entry.getValue() );
}
- for ( Iterator i = config.getOriginalScmInfo().entrySet().iterator();
i.hasNext(); )
+ for ( Iterator<?> i =
config.getOriginalScmInfo().entrySet().iterator(); i.hasNext(); )
{
- Map.Entry entry = (Map.Entry) i.next();
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>) i.next();
Scm scm = (Scm) entry.getValue();
String prefix = "project.scm." + entry.getKey();
if ( scm != null )
@@ -221,7 +221,7 @@ public class PropertiesReleaseDescriptor
if ( scm instanceof IdentifiedScm )
{
IdentifiedScm identifiedScm = (IdentifiedScm) scm;
- if( identifiedScm.getId() != null )
+ if ( identifiedScm.getId() != null )
{
properties.setProperty( prefix + ".id",
identifiedScm.getId() );
}
@@ -259,17 +259,17 @@ public class PropertiesReleaseDescriptor
}
- private void processResolvedDependencies( Properties prop, Map
resolvedDependencies )
+ private void processResolvedDependencies( Properties prop, Map<?, ?>
resolvedDependencies )
{
- Set entries = resolvedDependencies.entrySet();
- Iterator iterator = entries.iterator();
- Entry currentEntry;
+ Set<?> entries = resolvedDependencies.entrySet();
+ Iterator<?> iterator = entries.iterator();
+ Entry<?, ?> currentEntry;
while ( iterator.hasNext() )
{
- currentEntry = (Entry) iterator.next();
+ currentEntry = (Entry<?, ?>) iterator.next();
- Map versionMap = (Map) currentEntry.getValue();
+ Map<?, ?> versionMap = (Map<?, ?>) currentEntry.getValue();
prop.setProperty( "dependency." + currentEntry.getKey() +
".release",
(String) versionMap.get(
ReleaseDescriptor.RELEASE_KEY ) );
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
Sun Mar 25 21:32:35 2012
@@ -166,7 +166,7 @@ public class ReleaseUtils
// boolean properties are not written to the properties file because
the value from the caller is always used
- for ( Iterator i = properties.keySet().iterator(); i.hasNext(); )
+ for ( Iterator<?> i = properties.keySet().iterator(); i.hasNext(); )
{
String property = (String) i.next();
if ( property.startsWith( "project.rel." ) )
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
Sun Mar 25 21:32:35 2012
@@ -41,22 +41,15 @@ public abstract class AbstractMavenExecu
}
/** {@inheritDoc} */
- public void executeGoals( File workingDirectory,
- String goals,
- boolean interactive,
- String additionalArguments,
- String pomFileName,
- ReleaseResult result )
+ public void executeGoals( File workingDirectory, String goals, boolean
interactive, String additionalArguments,
+ String pomFileName, ReleaseResult result )
throws MavenExecutorException
{
executeGoals( workingDirectory, goals, new
DefaultReleaseEnvironment(), interactive, additionalArguments, pomFileName,
result );
}
/** {@inheritDoc} */
- public void executeGoals( File workingDirectory,
- String goals,
- boolean interactive,
- String additionalArguments,
+ public void executeGoals( File workingDirectory, String goals, boolean
interactive, String additionalArguments,
ReleaseResult result )
throws MavenExecutorException
{
@@ -70,7 +63,7 @@ public abstract class AbstractMavenExecu
{
executeGoals( workingDirectory, goals, releaseEnvironment,
interactive, arguments, null, result );
}
-
+
/** {@inheritDoc} */
public void executeGoals( File workingDirectory, String goals,
ReleaseEnvironment releaseEnvironment,
boolean interactive, String additionalArguments,
String pomFileName, ReleaseResult result )
@@ -91,7 +84,7 @@ public abstract class AbstractMavenExecu
}
executeGoals( workingDirectory, goalsList, releaseEnvironment,
interactive, additionalArguments, pomFileName, result );
}
-
+
protected abstract void executeGoals( File workingDirectory, List<String>
goals, ReleaseEnvironment releaseEnvironment,
boolean interactive, String additionalArguments,
String pomFileName, ReleaseResult result )
throws MavenExecutorException;
@@ -107,4 +100,4 @@ public abstract class AbstractMavenExecu
{
this.logger = logger;
}
-}
\ No newline at end of file
+}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
Sun Mar 25 21:32:35 2012
@@ -85,8 +85,8 @@ public class DefaultScmRepositoryConfigu
if ( settings != null )
{
Server server = null;
-
- if( releaseDescriptor.getScmId() != null )
+
+ if ( releaseDescriptor.getScmId() != null )
{
server = settings.getServer( releaseDescriptor.getScmId() );
}
@@ -96,14 +96,14 @@ public class DefaultScmRepositoryConfigu
ScmProviderRepositoryWithHost repositoryWithHost =
(ScmProviderRepositoryWithHost)
repository.getProviderRepository();
String host = repositoryWithHost.getHost();
-
+
int port = repositoryWithHost.getPort();
-
+
if ( port > 0 )
{
host += ":" + port;
}
-
+
// TODO: this is a bit dodgy - id is not host, but since we
don't have a <host> field we make an assumption
server = settings.getServer( host );
}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/IdentifiedScm.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/IdentifiedScm.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/IdentifiedScm.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/IdentifiedScm.java
Sun Mar 25 21:32:35 2012
@@ -29,7 +29,8 @@ import org.apache.maven.model.Scm;
*
* @since 2.3
*/
-public class IdentifiedScm extends Scm
+public class IdentifiedScm
+ extends Scm
{
private String id;
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ReleaseScmRepositoryException.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ReleaseScmRepositoryException.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ReleaseScmRepositoryException.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ReleaseScmRepositoryException.java
Sun Mar 25 21:32:35 2012
@@ -21,7 +21,6 @@ package org.apache.maven.shared.release.
import org.apache.maven.shared.release.ReleaseFailureException;
-import java.util.Iterator;
import java.util.List;
/**
@@ -32,23 +31,21 @@ import java.util.List;
public class ReleaseScmRepositoryException
extends ReleaseFailureException
{
- public ReleaseScmRepositoryException( String message, List
validationMessages )
+ public ReleaseScmRepositoryException( String message, List<String>
validationMessages )
{
super( message + listValidationMessages( validationMessages ) );
}
- private static String listValidationMessages( List messages )
+ private static String listValidationMessages( List<String> messages )
{
StringBuffer buffer = new StringBuffer();
if ( messages != null )
{
- Iterator iter = messages.iterator();
-
- while ( iter.hasNext() )
+ for ( String message : messages )
{
buffer.append( "\n - " );
- buffer.append( iter.next().toString() );
+ buffer.append( message );
}
}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
Sun Mar 25 21:32:35 2012
@@ -155,13 +155,13 @@ public class PomFinder
for ( int i = 0; i < childFiles.length; i++ )
{
String childFile = childFiles[ i ];
-
+
File subDir = new File( startDirectory, childFile );
if ( subDir.isDirectory() && !subDir.isHidden() )
{
matchingPom = findMatchingPom( subDir );
}
-
+
if ( matchingPom != null )
{
break;
@@ -185,7 +185,7 @@ public class PomFinder
{
return null;
}
-
+
PomInfo pomInfo = null;
MavenXpp3Reader reader = new MavenXpp3Reader();
@@ -198,10 +198,7 @@ public class PomFinder
}
finally
{
- if ( xmlReader != null )
- {
- IOUtil.close( xmlReader );
- }
+ IOUtil.close( xmlReader );
}
if ( model != null )
{
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
Sun Mar 25 21:32:35 2012
@@ -22,7 +22,6 @@ package org.apache.maven.shared.release.
import java.io.File;
import java.io.IOException;
import java.io.Reader;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -58,10 +57,9 @@ public class ReleaseUtil
public static MavenProject getRootProject( List<MavenProject>
reactorProjects )
{
- MavenProject project = (MavenProject) reactorProjects.get( 0 );
- for ( Iterator<MavenProject> i = reactorProjects.iterator();
i.hasNext(); )
+ MavenProject project = reactorProjects.get( 0 );
+ for ( MavenProject currentProject : reactorProjects )
{
- MavenProject currentProject = i.next();
if ( currentProject.isExecutionRoot() )
{
project = currentProject;
@@ -200,10 +198,8 @@ public class ReleaseUtil
{
String[] baseDirs = new String[reactorProjects.size()];
int idx = 0;
- for ( Iterator<MavenProject> i = reactorProjects.iterator();
i.hasNext(); )
+ for ( MavenProject p : reactorProjects )
{
- MavenProject p = i.next();
-
String dir = p.getBasedir().getCanonicalPath();
// always end with separator so that we know what is a path and
what is a partial directory name in the
@@ -278,7 +274,7 @@ public class ReleaseUtil
}
return url;
}
-
+
public static boolean isSymlink( File file )
throws IOException
{
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
Sun Mar 25 21:32:35 2012
@@ -48,7 +48,7 @@ import java.util.regex.Pattern;
* <b>Digits is the only required piece of the version string, and must
contain at lease one "." period.</b>
* <p/>
* Implementation details:<br>
- * The separators "_" and "-" between components are also optional (though
they are usually reccommended).<br>
+ * The separators "_" and "-" between components are also optional (though
they are usually recommended).<br>
* Example:<br>
* <code>log4j-1.2.9-beta-9-SNAPSHOT == log4j1.2.9beta9SNAPSHOT ==
log4j_1.2.9_beta_9_SNAPSHOT</code>
* <p/>
Modified:
maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
(original)
+++
maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
Sun Mar 25 21:32:35 2012
@@ -881,7 +881,7 @@
return false;
}
- if( thisScm instanceof
org.apache.maven.shared.release.scm.IdentifiedScm && thatScm instanceof
org.apache.maven.shared.release.scm.IdentifiedScm )
+ if ( thisScm instanceof
org.apache.maven.shared.release.scm.IdentifiedScm && thatScm instanceof
org.apache.maven.shared.release.scm.IdentifiedScm )
{
org.apache.maven.shared.release.scm.IdentifiedScm
thisIdentifiedScm = (org.apache.maven.shared.release.scm.IdentifiedScm) thisScm;
org.apache.maven.shared.release.scm.IdentifiedScm
thatIdentifiedScm = (org.apache.maven.shared.release.scm.IdentifiedScm) thatScm;
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java?rev=1305146&r1=1305145&r2=1305146&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
Sun Mar 25 21:32:35 2012
@@ -331,7 +331,7 @@ public abstract class AbstractReleaseTes
public int differenceFound( Difference difference )
{
- if( "${remoterepo}".equals(
difference.getControlNodeDetail().getValue() ) &&
+ if ( "${remoterepo}".equals(
difference.getControlNodeDetail().getValue() ) &&
remoteRepositoryURL.equals(
difference.getTestNodeDetail().getValue() ) )
{
return
DifferenceListener.RETURN_IGNORE_DIFFERENCE_NODES_IDENTICAL;
