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 2012/03/25 23:07:53 UTC
svn commit: r1305135 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/
Author: hboutemy
Date: Sun Mar 25 21:07:53 2012
New Revision: 1305135
URL: http://svn.apache.org/viewvc?rev=1305135&view=rev
Log:
use java 5 constructs, code formatting
Modified:
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/AbstractScmCommitPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.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/CreateBackupPomsPhase.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/MapVersionsPhase.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/RunPerformGoalsPhase.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/ScmTagPhase.java
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=1305135&r1=1305134&r2=1305135&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 Sun Mar 25 21:07:53 2012
@@ -235,12 +235,12 @@ public abstract class AbstractRewritePom
private void normaliseLineEndings( Document document )
{
- for ( Iterator i = document.getDescendants( new ContentFilter( ContentFilter.COMMENT ) ); i.hasNext(); )
+ for ( Iterator<?> i = document.getDescendants( new ContentFilter( ContentFilter.COMMENT ) ); i.hasNext(); )
{
Comment c = (Comment) i.next();
c.setText( ReleaseUtil.normalizeLineEndings( c.getText(), ls ) );
}
- for ( Iterator i = document.getDescendants( new ContentFilter( ContentFilter.CDATA ) ); i.hasNext(); )
+ for ( Iterator<?> i = document.getDescendants( new ContentFilter( ContentFilter.CDATA ) ); i.hasNext(); )
{
CDATA c = (CDATA) i.next();
c.setText( ReleaseUtil.normalizeLineEndings( c.getText(), ls ) );
@@ -345,7 +345,7 @@ public abstract class AbstractRewritePom
Text text = null;
if ( element.getContent() != null )
{
- for ( Iterator it = element.getContent().iterator(); it.hasNext(); )
+ for ( Iterator<?> it = element.getContent().iterator(); it.hasNext(); )
{
Object content = it.next();
if ( ( content instanceof Text ) && ( (Text) content ).getTextTrim().length() > 0 )
@@ -666,7 +666,7 @@ public abstract class AbstractRewritePom
// the empty namespace is considered equal to the POM namespace, so match them up to avoid extra xmlns=""
ElementFilter elementFilter = new ElementFilter( Namespace.getNamespace( "" ) );
- for ( Iterator i = rootElement.getDescendants( elementFilter ); i.hasNext(); )
+ for ( Iterator<?> i = rootElement.getDescendants( elementFilter ); i.hasNext(); )
{
Element e = (Element) i.next();
e.setNamespace( pomNamespace );
@@ -724,10 +724,8 @@ public abstract class AbstractRewritePom
if ( reactorProjects != null )
{
- for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = i.next();
-
File pomFile = ReleaseUtil.getStandardPom( project );
// MRELEASE-273 : if no pom
if ( pomFile != null )
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java?rev=1305135&r1=1305134&r2=1305135&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java Sun Mar 25 21:07:53 2012
@@ -42,7 +42,6 @@ import java.io.File;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
/**
@@ -130,10 +129,8 @@ public abstract class AbstractScmCommitP
if ( releaseDescriptor.isCommitByProject() )
{
- for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = i.next();
-
List<File> pomFiles = createPomFiles( releaseDescriptor, project );
ScmFileSet fileSet = new ScmFileSet( project.getFile().getParentFile(), pomFiles );
@@ -212,9 +209,8 @@ public abstract class AbstractScmCommitP
protected static List<File> createPomFiles( ReleaseDescriptor releaseDescriptor, List<MavenProject> reactorProjects )
{
List<File> pomFiles = new ArrayList<File>();
- for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = i.next();
pomFiles.addAll( createPomFiles( releaseDescriptor, project ) );
}
return pomFiles;
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?rev=1305135&r1=1305134&r2=1305135&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java Sun Mar 25 21:07:53 2012
@@ -213,7 +213,7 @@ public class CheckDependencySnapshotsPha
@SuppressWarnings("unchecked")
Set<Artifact> reportArtifacts = project.getReportArtifacts();
- for ( Artifact artifact : reportArtifacts )
+ for ( Artifact artifact : reportArtifacts )
{
if ( checkArtifact( artifact, originalVersions, artifactMap, releaseDescriptor ) )
{
@@ -284,8 +284,8 @@ public class CheckDependencySnapshotsPha
// We are only looking at dependencies external to the project - ignore anything found in the reactor as
// it's version will be updated
- boolean result = artifact.isSnapshot() &&
- !artifact.getBaseVersion().equals( originalVersions.get( versionlessArtifactKey ) );
+ boolean result =
+ artifact.isSnapshot() && !artifact.getBaseVersion().equals( originalVersions.get( versionlessArtifactKey ) );
// If we have a snapshot but allowTimestampedSnapshots is true, accept the artifact if the version
// indicates that it is a timestamped snapshot.
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java?rev=1305135&r1=1305134&r2=1305135&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java Sun Mar 25 21:07:53 2012
@@ -33,7 +33,6 @@ import org.apache.maven.shared.release.s
import org.apache.maven.shared.release.util.ReleaseUtil;
import org.codehaus.plexus.util.StringUtils;
-import java.util.Iterator;
import java.util.List;
/**
@@ -99,10 +98,8 @@ public class CheckPomPhase
boolean containsSnapshotProjects = false;
- for ( Iterator<MavenProject> it = reactorProjects.iterator(); it.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = it.next();
-
if ( ArtifactUtils.isSnapshot( project.getVersion() ) )
{
containsSnapshotProjects = true;
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=1305135&r1=1305134&r2=1305135&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 Sun Mar 25 21:07:53 2012
@@ -74,7 +74,7 @@ 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));
+ .substring( 0, releaseDescriptor.getScmSourceUrl().indexOf( ':', 4 ) );
String scmPath = releaseDescriptor.getWorkingDirectory();
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java?rev=1305135&r1=1305134&r2=1305135&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java Sun Mar 25 21:07:53 2012
@@ -20,7 +20,6 @@ package org.apache.maven.shared.release.
*/
import java.io.IOException;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.project.MavenProject;
@@ -48,10 +47,8 @@ public class CreateBackupPomsPhase
// remove previous backups, if any
clean( reactorProjects );
- for ( Iterator<MavenProject> projects = reactorProjects.iterator(); projects.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = projects.next();
-
createPomBackup( project );
}
@@ -64,10 +61,8 @@ public class CreateBackupPomsPhase
{
ReleaseResult result = new ReleaseResult();
- for ( Iterator<MavenProject> projects = reactorProjects.iterator(); projects.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = (MavenProject) projects.next();
-
deletePomBackup( project );
}
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=1305135&r1=1305134&r2=1305135&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 Sun Mar 25 21:07:53 2012
@@ -145,7 +145,7 @@ public class GenerateReleasePomsPhase
MavenXpp3Writer pomWriter = new MavenXpp3Writer();
File releasePomFile = ReleaseUtil.getReleasePom( project );
-
+
// MRELEASE-273 : A release pom can be null
if ( releasePomFile == null )
{
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=1305135&r1=1305134&r2=1305135&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 Sun Mar 25 21:07:53 2012
@@ -19,7 +19,6 @@ package org.apache.maven.shared.release.
* under the License.
*/
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.artifact.ArtifactUtils;
@@ -96,9 +95,8 @@ public class MapVersionsPhase
releaseDescriptor.mapReleaseVersion( projectId, nextVersion );
}
- for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
+ for ( MavenProject subProject : reactorProjects )
{
- MavenProject subProject = i.next();
String subProjectId =
ArtifactUtils.versionlessKey( subProject.getGroupId(), subProject.getArtifactId() );
@@ -131,10 +129,8 @@ public class MapVersionsPhase
}
else
{
- for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = i.next();
-
String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
String nextVersion = getNextVersion( project, projectId, releaseDescriptor, result );
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=1305135&r1=1305134&r2=1305135&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 Sun Mar 25 21:07:53 2012
@@ -124,7 +124,7 @@ public class RewritePomsForBranchPhase
{
branchBase = "scm:svn:" + branchBase;
}
-
+
String workingDirectory =
ReleaseUtil.isSymlink( project.getBasedir() ) ? project.getBasedir().getCanonicalPath()
: project.getBasedir().getAbsolutePath();
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=1305135&r1=1305134&r2=1305135&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 Sun Mar 25 21:07:53 2012
@@ -113,7 +113,7 @@ public class RewritePomsForDevelopmentPh
if ( versionsMap != null )
{
- return (String) ( versionsMap.get( ReleaseDescriptor.DEVELOPMENT_KEY ) );
+ return versionsMap.get( ReleaseDescriptor.DEVELOPMENT_KEY );
}
else
{
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=1305135&r1=1305134&r2=1305135&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 Sun Mar 25 21:07:53 2012
@@ -119,7 +119,7 @@ public class RewritePomsForReleasePhase
{
scm = project.getScm();
}
-
+
String tag = releaseDescriptor.getScmReleaseLabel();
String tagBase = releaseDescriptor.getScmTagBase();
@@ -252,7 +252,7 @@ public class RewritePomsForReleasePhase
if ( versionsMap != null )
{
- return (String) ( versionsMap.get( ReleaseDescriptor.RELEASE_KEY ) );
+ return versionsMap.get( ReleaseDescriptor.RELEASE_KEY );
}
else
{
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=1305135&r1=1305134&r2=1305135&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 Sun Mar 25 21:07:53 2012
@@ -45,7 +45,7 @@ public class RunPerformGoalsPhase
{
return runLogic( releaseDescriptor, releaseEnvironment, reactorProjects, false );
}
-
+
private ReleaseResult runLogic( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
List<MavenProject> reactorProjects, boolean simulate )
throws ReleaseExecutionException
@@ -89,9 +89,9 @@ public class RunPerformGoalsPhase
File pomFile = new File( workDir, pomFileName );
PomFinder pomFinder = new PomFinder( getLogger() );
boolean foundPom = pomFinder.parsePom( pomFile );
-
+
File workDirectory;
- if( simulate )
+ if ( simulate )
{
workDirectory = new File( releaseDescriptor.getWorkingDirectory() );
}
@@ -110,7 +110,6 @@ public class RunPerformGoalsPhase
// the same directory as the SCM checkout directory!
// releaseDescriptor.setCheckoutDirectory( matchingPom.getParent() );
}
-
}
return execute( releaseDescriptor, releaseEnvironment, workDirectory, additionalArguments );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java?rev=1305135&r1=1305134&r2=1305135&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java Sun Mar 25 21:07:53 2012
@@ -74,7 +74,7 @@ public class ScmBranchPhase
scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
-
+
provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
}
@@ -92,12 +92,12 @@ public class ScmBranchPhase
{
ScmFileSet fileSet = new ScmFileSet( new File( releaseDescriptor.getWorkingDirectory() ) );
String branchName = releaseDescriptor.getScmReleaseLabel();
-
+
ScmBranchParameters scmBranchParameters = new ScmBranchParameters();
scmBranchParameters.setMessage( releaseDescriptor.getScmCommentPrefix() + " copy for branch " + branchName );
scmBranchParameters.setRemoteBranching( releaseDescriptor.isRemoteTagging() );
scmBranchParameters.setScmRevision( releaseDescriptor.getScmReleasedPomRevision() );
-
+
result = provider.branch( repository, fileSet, branchName, scmBranchParameters );
}
catch ( ScmException e )
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java?rev=1305135&r1=1305134&r2=1305135&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java Sun Mar 25 21:07:53 2012
@@ -92,7 +92,7 @@ public class ScmTagPhase
scmRepositoryConfigurator.getConfiguredRepository( basedirAlignedReleaseDescriptor.getScmSourceUrl(),
releaseDescriptor,
releaseEnvironment.getSettings() );
-
+
repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
provider = scmRepositoryConfigurator.getRepositoryProvider( repository );