You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/02/01 12:55:52 UTC
svn commit: r1066014 [2/4] - in /maven/release/trunk:
maven-release-manager/src/main/java/org/apache/maven/shared/release/
maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/
maven-release-manager/src/main/java/org/apache/maven/sh...
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=1066014&r1=1066013&r2=1066014&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 Tue Feb 1 11:55:50 2011
@@ -63,7 +63,7 @@ public class MapVersionsPhase
this.prompter = prompter;
}
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
@@ -95,9 +95,9 @@ public class MapVersionsPhase
releaseDescriptor.mapReleaseVersion( projectId, nextVersion );
}
- for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
{
- MavenProject subProject = (MavenProject) i.next();
+ MavenProject subProject = i.next();
String subProjectId =
ArtifactUtils.versionlessKey( subProject.getGroupId(), subProject.getArtifactId() );
@@ -130,9 +130,9 @@ public class MapVersionsPhase
}
else
{
- for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
{
- MavenProject project = (MavenProject) i.next();
+ MavenProject project = i.next();
String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
@@ -334,7 +334,7 @@ public class MapVersionsPhase
return nextVersion;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List 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/ReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java Tue Feb 1 11:55:50 2011
@@ -19,6 +19,7 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
@@ -49,7 +50,7 @@ public interface ReleasePhase
* @throws ReleaseExecutionException an exception during the execution of the phase
* @throws ReleaseFailureException a failure during the execution of the phase
*/
- ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -61,7 +62,7 @@ public interface ReleasePhase
* @throws ReleaseExecutionException an exception during the execution of the phase
* @throws ReleaseFailureException a failure during the execution of the phase
*/
- ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -75,7 +76,7 @@ public interface ReleasePhase
*
* @deprecated Use {@link ReleasePhase#execute(ReleaseDescriptor, ReleaseEnvironment, List)} instead.
*/
- ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -89,7 +90,7 @@ public interface ReleasePhase
*
* @deprecated Use {@link ReleasePhase#simulate(ReleaseDescriptor, ReleaseEnvironment, List)} instead.
*/
- ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -97,5 +98,5 @@ public interface ReleasePhase
*
* @param reactorProjects the reactor projects
*/
- ReleaseResult clean( List reactorProjects );
+ ReleaseResult clean( List<MavenProject> reactorProjects );
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java Tue Feb 1 11:55:50 2011
@@ -48,19 +48,19 @@ import java.util.List;
public class RemoveReleasePomsPhase
extends AbstractReleasePomsPhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseFailureException, ReleaseExecutionException
{
return execute( releaseDescriptor, releaseEnvironment, reactorProjects, false );
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseFailureException, ReleaseExecutionException
{
return execute( releaseDescriptor, releaseEnvironment, reactorProjects, true );
}
- private ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects,
+ private ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
boolean simulate )
throws ReleaseFailureException, ReleaseExecutionException
{
@@ -83,14 +83,14 @@ public class RemoveReleasePomsPhase
}
private void removeReleasePoms( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, boolean simulate,
- ReleaseResult result, List projects )
+ ReleaseResult result, List<MavenProject> projects )
throws ReleaseFailureException, ReleaseExecutionException
{
- List releasePoms = new ArrayList();
+ List<File> releasePoms = new ArrayList<File>();
- for ( Iterator iterator = projects.iterator(); iterator.hasNext(); )
+ for ( Iterator<MavenProject> iterator = projects.iterator(); iterator.hasNext(); )
{
- MavenProject project = (MavenProject) iterator.next();
+ MavenProject project = iterator.next();
logInfo( result, "Removing release POM for '" + project.getName() + "'..." );
@@ -101,7 +101,7 @@ public class RemoveReleasePomsPhase
}
private void removeReleasePomsFromScm( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, boolean simulate,
- ReleaseResult result, List releasePoms )
+ ReleaseResult result, List<File> releasePoms )
throws ReleaseFailureException, ReleaseExecutionException
{
if ( simulate )
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=1066014&r1=1066013&r2=1066014&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 Tue Feb 1 11:55:50 2011
@@ -1,5 +1,6 @@
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;
@@ -34,7 +35,7 @@ import java.util.List;
public class RemoveScmTagPhase
extends AbstractReleasePhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -46,7 +47,7 @@ public class RemoveScmTagPhase
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List 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/RestoreBackupPomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java Tue Feb 1 11:55:50 2011
@@ -57,14 +57,14 @@ public class RestoreBackupPomsPhase
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
- for ( Iterator projects = reactorProjects.iterator(); projects.hasNext(); )
+ for ( Iterator<MavenProject> projects = reactorProjects.iterator(); projects.hasNext(); )
{
- MavenProject project = (MavenProject) projects.next();
+ MavenProject project = projects.next();
restorePomBackup( releaseDescriptor, releaseEnvironment, project );
}
@@ -74,7 +74,7 @@ public class RestoreBackupPomsPhase
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List 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/RewritePomVersionsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java Tue Feb 1 11:55:50 2011
@@ -47,7 +47,7 @@ public class RewritePomVersionsPhase
// We are only updating versions no mods to scm needed
}
- protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor, List reactorProjects, boolean simulate )
+ protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor, List<MavenProject> reactorProjects, boolean simulate )
{
return releaseDescriptor.getReleaseVersions();
}
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=1066014&r1=1066013&r2=1066014&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 Tue Feb 1 11:55:50 2011
@@ -45,7 +45,7 @@ public class RewritePomsForBranchPhase
/**
* SCM URL translators mapped by provider name.
*/
- private Map 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/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=1066014&r1=1066013&r2=1066014&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 Tue Feb 1 11:55:50 2011
@@ -43,7 +43,7 @@ public class RewritePomsForDevelopmentPh
/**
* SCM URL translators mapped by provider name.
*/
- private Map scmTranslators;
+ private Map<String,ScmTranslator> scmTranslators;
protected void transformScm( MavenProject project, Element rootElement, Namespace namespace,
ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
@@ -64,7 +64,7 @@ public class RewritePomsForDevelopmentPh
"Unable to find original SCM info for '" + project.getName() + "'" );
}
- ScmTranslator translator = (ScmTranslator) scmTranslators.get( scmRepository.getProvider() );
+ ScmTranslator translator = scmTranslators.get( scmRepository.getProvider() );
if ( translator != null )
{
Scm scm = (Scm) originalScmInfo.get( projectId );
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=1066014&r1=1066013&r2=1066014&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 Tue Feb 1 11:55:50 2011
@@ -45,7 +45,7 @@ public class RewritePomsForReleasePhase
/**
* SCM URL translators mapped by provider name.
*/
- private Map scmTranslators;
+ private Map<String,ScmTranslator> scmTranslators;
protected void transformScm( MavenProject project, Element rootElement, Namespace namespace,
ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
@@ -213,7 +213,7 @@ public class RewritePomsForReleasePhase
return result;
}
- protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor, List reactorProjects, boolean simulate )
+ protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor, List<MavenProject> reactorProjects, boolean simulate )
{
return releaseDescriptor.getOriginalVersions( reactorProjects );
}
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=1066014&r1=1066013&r2=1066014&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 Tue Feb 1 11:55:50 2011
@@ -22,6 +22,7 @@ package org.apache.maven.shared.release.
import java.io.File;
import java.util.List;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
@@ -37,14 +38,14 @@ import org.apache.maven.shared.release.e
public class RunCompleteGoalsPhase
extends AbstractRunGoalsPhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List 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 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/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=1066014&r1=1066013&r2=1066014&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 Tue Feb 1 11:55:50 2011
@@ -19,6 +19,7 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
@@ -38,7 +39,7 @@ import java.util.List;
public class RunPerformGoalsPhase
extends AbstractRunGoalsPhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
String additionalArguments = releaseDescriptor.getAdditionalArguments();
@@ -95,7 +96,7 @@ public class RunPerformGoalsPhase
return execute( releaseDescriptor, releaseEnvironment, new File( releaseDescriptor.getCheckoutDirectory() ), additionalArguments );
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List 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/RunPrepareGoalsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java Tue Feb 1 11:55:50 2011
@@ -19,6 +19,7 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
@@ -36,14 +37,14 @@ import java.util.List;
public class RunPrepareGoalsPhase
extends AbstractRunGoalsPhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List 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 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/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=1066014&r1=1066013&r2=1066014&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 Tue Feb 1 11:55:50 2011
@@ -19,6 +19,7 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.ScmBranchParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -55,7 +56,7 @@ public class ScmBranchPhase
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult relResult = new ReleaseResult();
@@ -112,7 +113,7 @@ public class ScmBranchPhase
return relResult;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java Tue Feb 1 11:55:50 2011
@@ -20,6 +20,7 @@ package org.apache.maven.shared.release.
*/
import org.apache.commons.lang.StringUtils;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -65,15 +66,15 @@ public class ScmCheckModificationsPhase
*
* @todo proper construction of filenames, especially release properties
*/
- private Set excludedFiles = new HashSet( Arrays.asList( new String[] { "pom.xml.backup", "pom.xml.tag",
+ private Set<String> excludedFiles = new HashSet<String>( Arrays.asList( new String[] { "pom.xml.backup", "pom.xml.tag",
"pom.xml.next", "pom.xml.branch", "release.properties", "pom.xml.releaseBackup" } ) );
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult relResult = new ReleaseResult();
- List additionalExcludes = releaseDescriptor.getCheckModificationExcludes();
+ List<String> additionalExcludes = releaseDescriptor.getCheckModificationExcludes();
if ( additionalExcludes != null )
{
@@ -123,12 +124,12 @@ public class ScmCheckModificationsPhase
throw new ReleaseScmCommandException( "Unable to check for local modifications", result );
}
- List changedFiles = result.getChangedFiles();
+ List<ScmFile> changedFiles = result.getChangedFiles();
// TODO: would be nice for SCM status command to do this for me.
- for ( Iterator i = changedFiles.iterator(); i.hasNext(); )
+ for ( Iterator<ScmFile> i = changedFiles.iterator(); i.hasNext(); )
{
- ScmFile f = (ScmFile) i.next();
+ ScmFile f = i.next();
String fileName = f.getPath().replace( '\\', '/' );
fileName = fileName.substring( fileName.lastIndexOf( '/' ) + 1, fileName.length() );
@@ -143,9 +144,9 @@ public class ScmCheckModificationsPhase
{
StringBuffer message = new StringBuffer();
- for ( Iterator i = changedFiles.iterator(); i.hasNext(); )
+ for ( Iterator<ScmFile> i = changedFiles.iterator(); i.hasNext(); )
{
- ScmFile file = (ScmFile) i.next();
+ ScmFile file = i.next();
message.append( file.toString() );
@@ -161,7 +162,7 @@ public class ScmCheckModificationsPhase
return relResult;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
// It makes no modifications, so simulate is the same as execute
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhase.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhase.java Tue Feb 1 11:55:50 2011
@@ -19,6 +19,12 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import java.io.File;
+import java.text.MessageFormat;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
@@ -26,10 +32,6 @@ import org.apache.maven.shared.release.e
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
-import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.List;
-
/**
* Commit the changes that were done to prepare the branch or tag to the SCM.
*
@@ -45,7 +47,7 @@ public class ScmCommitDevelopmentPhase
private String rollbackMessageFormat;
protected void runLogic( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List reactorProjects, ReleaseResult result, boolean simulating )
+ List<MavenProject> reactorProjects, ReleaseResult result, boolean simulating )
throws ReleaseScmCommandException, ReleaseExecutionException, ReleaseScmRepositoryException
{
// no rollback required
@@ -80,7 +82,7 @@ public class ScmCommitDevelopmentPhase
}
if ( simulating )
{
- Collection pomFiles = createPomFiles( releaseDescriptor, reactorProjects );
+ Collection<File> pomFiles = createPomFiles( releaseDescriptor, reactorProjects );
logInfo( result,
"Full run would be commit " + pomFiles.size() + " files with message: '" + message + "'" );
}
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=1066014&r1=1066013&r2=1066014&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 Tue Feb 1 11:55:50 2011
@@ -55,12 +55,12 @@ public class ReleaseUtil
{
}
- public static MavenProject getRootProject( List reactorProjects )
+ public static MavenProject getRootProject( List<MavenProject> reactorProjects )
{
MavenProject project = (MavenProject) reactorProjects.get( 0 );
- for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
{
- MavenProject currentProject = (MavenProject) i.next();
+ MavenProject currentProject = i.next();
if ( currentProject.isExecutionRoot() )
{
project = currentProject;
@@ -161,7 +161,7 @@ public class ReleaseUtil
}
public static ReleaseDescriptor createBasedirAlignedReleaseDescriptor( ReleaseDescriptor releaseDescriptor,
- List reactorProjects )
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
String basedir = getCommonBasedir( reactorProjects );
@@ -179,18 +179,18 @@ public class ReleaseUtil
return descriptor;
}
- public static String getCommonBasedir( List reactorProjects )
+ public static String getCommonBasedir( List<MavenProject> reactorProjects )
{
return getCommonBasedir( reactorProjects, FS );
}
- public static String getCommonBasedir( List reactorProjects, char separator )
+ public static String getCommonBasedir( List<MavenProject> reactorProjects, char separator )
{
String[] baseDirs = new String[reactorProjects.size()];
int idx = 0;
- for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
{
- MavenProject p = (MavenProject) i.next();
+ MavenProject p = i.next();
// we can only normalize paths with /
String dir = FileUtils.normalize( p.getBasedir().getPath().replace( '\\', '/' ) );
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=1066014&r1=1066013&r2=1066014&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 Tue Feb 1 11:55:50 2011
@@ -60,7 +60,7 @@ public class DefaultVersionInfo
{
private final String strVersion;
- private final List digits;
+ private final List<String> digits;
private String annotation;
@@ -172,7 +172,7 @@ public class DefaultVersionInfo
}
}
- public DefaultVersionInfo( List digits, String annotation, String annotationRevision, String buildSpecifier,
+ public DefaultVersionInfo( List<String> digits, String annotation, String annotationRevision, String buildSpecifier,
String annotationSeparator, String annotationRevSeparator, String buildSeparator )
{
this.digits = digits;
@@ -204,7 +204,7 @@ public class DefaultVersionInfo
DefaultVersionInfo version = null;
if ( digits != null )
{
- List digits = new ArrayList( this.digits );
+ List<String> digits = new ArrayList<String>( this.digits );
String annotationRevision = this.annotationRevision;
if ( StringUtils.isNumeric( annotationRevision ) )
{
@@ -229,7 +229,7 @@ public class DefaultVersionInfo
* @return the comparison value
* @throws IllegalArgumentException if the components differ between the objects or if either of the annotations can not be determined.
*/
- public int compareTo( Object obj )
+ public int compareTo( VersionInfo obj )
{
DefaultVersionInfo that = (DefaultVersionInfo) obj;
@@ -264,7 +264,7 @@ public class DefaultVersionInfo
return false;
}
- return compareTo( obj ) == 0;
+ return compareTo( (VersionInfo) obj ) == 0;
}
/**
@@ -369,7 +369,7 @@ public class DefaultVersionInfo
*
* @param digits
*/
- protected static String joinDigitString( List digits )
+ protected static String joinDigitString( List<String> digits )
{
return digits != null ? StringUtils.join( digits.iterator(), DIGIT_SEPARATOR_STRING ) : null;
}
@@ -380,7 +380,7 @@ public class DefaultVersionInfo
*
* @param strDigits
*/
- private List parseDigits( String strDigits )
+ private List<String> parseDigits( String strDigits )
{
return Arrays.asList( StringUtils.split( strDigits, DIGIT_SEPARATOR_STRING ) );
}
@@ -394,7 +394,7 @@ public class DefaultVersionInfo
return StringUtils.isEmpty( s ) ? null : s;
}
- public List getDigits()
+ public List<String> getDigits()
{
return digits;
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/VersionInfo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/VersionInfo.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/VersionInfo.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/VersionInfo.java Tue Feb 1 11:55:50 2011
@@ -23,7 +23,7 @@ package org.apache.maven.shared.release.
* @todo this has an overlap with ArtifactVersion in maven-artifact - would be good to migrate this there.
*/
public interface VersionInfo
- extends Comparable
+ extends Comparable<VersionInfo>
{
/**
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java Tue Feb 1 11:55:50 2011
@@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTag;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
@@ -92,7 +93,8 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null );
- Map phases = container.lookupMap( ReleasePhase.ROLE );
+ @SuppressWarnings("unchecked")
+ Map<String,ReleasePhaseStub> phases = container.lookupMap( ReleasePhase.ROLE );
ReleasePhaseStub phase = (ReleasePhaseStub) phases.get( "step1" );
assertTrue( "step1 executed", phase.isExecuted() );
@@ -115,7 +117,8 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null );
- Map phases = container.lookupMap( ReleasePhase.ROLE );
+ @SuppressWarnings("unchecked")
+ Map<String,ReleasePhaseStub> phases = container.lookupMap( ReleasePhase.ROLE );
ReleasePhaseStub phase = (ReleasePhaseStub) phases.get( "step1" );
assertFalse( "step1 not executed", phase.isExecuted() );
@@ -138,7 +141,8 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null, false, false );
- Map phases = container.lookupMap( ReleasePhase.ROLE );
+ @SuppressWarnings("unchecked")
+ Map<String,ReleasePhaseStub> phases = container.lookupMap( ReleasePhase.ROLE );
ReleasePhaseStub phase = (ReleasePhaseStub) phases.get( "step1" );
assertTrue( "step1 executed", phase.isExecuted() );
@@ -161,7 +165,8 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null );
- Map phases = container.lookupMap( ReleasePhase.ROLE );
+ @SuppressWarnings("unchecked")
+ Map<String,ReleasePhaseStub> phases = container.lookupMap( ReleasePhase.ROLE );
ReleasePhaseStub phase = (ReleasePhaseStub) phases.get( "step1" );
assertFalse( "step1 not executed", phase.isExecuted() );
@@ -184,15 +189,16 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null );
- Map phases = container.lookupMap( ReleasePhase.ROLE );
+ @SuppressWarnings("unchecked")
+ Map<String,ReleasePhaseStub> phases = container.lookupMap( ReleasePhase.ROLE );
- ReleasePhaseStub phase = (ReleasePhaseStub) phases.get( "step1" );
+ ReleasePhaseStub phase = phases.get( "step1" );
assertTrue( "step1 executed", phase.isExecuted() );
assertFalse( "step1 not simulated", phase.isSimulated() );
- phase = (ReleasePhaseStub) phases.get( "step2" );
+ phase = phases.get( "step2" );
assertTrue( "step2 executed", phase.isExecuted() );
assertFalse( "step2 not simulated", phase.isSimulated() );
- phase = (ReleasePhaseStub) phases.get( "step3" );
+ phase = phases.get( "step3" );
assertTrue( "step3 executed", phase.isExecuted() );
assertFalse( "step3 not simulated", phase.isSimulated() );
}
@@ -207,7 +213,8 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null, true, true );
- Map phases = container.lookupMap( ReleasePhase.ROLE );
+ @SuppressWarnings("unchecked")
+ Map<String,ReleasePhaseStub> phases = container.lookupMap( ReleasePhase.ROLE );
ReleasePhaseStub phase = (ReleasePhaseStub) phases.get( "step1" );
assertTrue( "step1 simulated", phase.isSimulated() );
@@ -230,7 +237,8 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null, true, true );
- Map phases = container.lookupMap( ReleasePhase.ROLE );
+ @SuppressWarnings("unchecked")
+ Map<String,ReleasePhaseStub> phases = container.lookupMap( ReleasePhase.ROLE );
ReleasePhaseStub phase = (ReleasePhaseStub) phases.get( "step1" );
assertFalse( "step1 not simulated", phase.isSimulated() );
@@ -253,7 +261,8 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null, true, true );
- Map phases = container.lookupMap( ReleasePhase.ROLE );
+ @SuppressWarnings("unchecked")
+ Map<String,ReleasePhaseStub> phases = container.lookupMap( ReleasePhase.ROLE );
ReleasePhaseStub phase = (ReleasePhaseStub) phases.get( "step1" );
assertFalse( "step1 not simulated", phase.isSimulated() );
@@ -276,7 +285,8 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null, true, true );
- Map phases = container.lookupMap( ReleasePhase.ROLE );
+ @SuppressWarnings("unchecked")
+ Map<String,ReleasePhaseStub> phases = container.lookupMap( ReleasePhase.ROLE );
ReleasePhaseStub phase = (ReleasePhaseStub) phases.get( "step1" );
assertTrue( "step1 simulated", phase.isSimulated() );
@@ -377,7 +387,8 @@ public class DefaultReleaseManagerTest
releaseManager.clean( releaseDescriptor, null, null );
- Map phases = container.lookupMap( ReleasePhase.ROLE );
+ @SuppressWarnings("unchecked")
+ Map<String,ReleasePhaseStub> phases = container.lookupMap( ReleasePhase.ROLE );
ReleasePhaseStub phase = (ReleasePhaseStub) phases.get( "step1" );
assertTrue( "step1 not cleaned", phase.isCleaned() );
@@ -413,7 +424,7 @@ public class DefaultReleaseManagerTest
constraints = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ),
new IsInstanceOf( ScmTag.class )};
scmProviderMock.expects( new InvokeOnceMatcher() ).method( "checkOut" ).with( constraints ).will(
- new ReturnStub( new CheckOutScmResult( "...", Collections.EMPTY_LIST ) ) );
+ new ReturnStub( new CheckOutScmResult( "...", Collections.<ScmFile>emptyList() ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
@@ -423,7 +434,7 @@ public class DefaultReleaseManagerTest
assertTrue( true );
}
- private static List createReactorProjects()
+ private static List<MavenProject> createReactorProjects()
{
MavenProject project = new MavenProject();
project.setFile( getTestFile( "target/dummy-project/pom.xml" ) );
@@ -466,7 +477,7 @@ public class DefaultReleaseManagerTest
constraints = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ),
new IsInstanceOf( ScmTag.class )};
scmProviderMock.expects( new InvokeOnceMatcher() ).method( "checkOut" ).with( constraints ).will(
- new ReturnStub( new CheckOutScmResult( "...", Collections.EMPTY_LIST ) ) );
+ new ReturnStub( new CheckOutScmResult( "...", Collections.<ScmFile>emptyList() ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
@@ -501,7 +512,7 @@ public class DefaultReleaseManagerTest
constraints = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ),
new IsInstanceOf( ScmTag.class )};
scmProviderMock.expects( new InvokeOnceMatcher() ).method( "checkOut" ).with( constraints ).will(
- new ReturnStub( new CheckOutScmResult( "...", Collections.EMPTY_LIST ) ) );
+ new ReturnStub( new CheckOutScmResult( "...", Collections.<ScmFile>emptyList() ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
@@ -533,7 +544,7 @@ public class DefaultReleaseManagerTest
constraints = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ),
new IsInstanceOf( ScmTag.class )};
scmProviderMock.expects( new InvokeOnceMatcher() ).method( "checkOut" ).with( constraints ).will(
- new ReturnStub( new CheckOutScmResult( "...", Collections.EMPTY_LIST ) ) );
+ new ReturnStub( new CheckOutScmResult( "...", Collections.<ScmFile>emptyList() ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
@@ -566,7 +577,7 @@ public class DefaultReleaseManagerTest
constraints = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ),
new IsInstanceOf( ScmTag.class )};
scmProviderMock.expects( new InvokeOnceMatcher() ).method( "checkOut" ).with( constraints ).will(
- new ReturnStub( new CheckOutScmResult( "...", Collections.EMPTY_LIST ) ) );
+ new ReturnStub( new CheckOutScmResult( "...", Collections.<ScmFile>emptyList() ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java Tue Feb 1 11:55:50 2011
@@ -19,6 +19,8 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.shared.release.ReleaseResult;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.StringInputStream;
@@ -30,8 +32,6 @@ import org.jmock.core.matcher.InvokeOnce
import org.jmock.core.stub.ReturnStub;
import org.jmock.core.stub.ThrowStub;
-import java.io.File;
-
/**
* Test the forked Maven executor.
*
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java Tue Feb 1 11:55:50 2011
@@ -53,10 +53,10 @@ public abstract class AbstractBackupPoms
abstract ReleasePhase getReleasePhase()
throws Exception;
- protected List getReactorProjects( String projectPath )
+ protected List<MavenProject> getReactorProjects( String projectPath )
throws Exception
{
- List reactorProjects = new ArrayList();
+ List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
File pomFile = new File( projectPath, pomFilename );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java Tue Feb 1 11:55:50 2011
@@ -19,6 +19,7 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.command.edit.EditScmResult;
import org.apache.maven.scm.manager.ScmManagerStub;
@@ -47,7 +48,7 @@ public abstract class AbstractEditModeRe
public void testRewriteBasicPomWithEditMode()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
@@ -60,7 +61,7 @@ public abstract class AbstractEditModeRe
public void testRewriteBasicPomWithEditModeFailure()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
@@ -88,7 +89,7 @@ public abstract class AbstractEditModeRe
public void testRewriteBasicPomWithEditModeException()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
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=1066014&r1=1066013&r2=1066014&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 Tue Feb 1 11:55:50 2011
@@ -112,14 +112,14 @@ public abstract class AbstractReleaseTes
super.tearDown();
}
- private Map createManagedVersionMap( String projectId, DependencyManagement dependencyManagement,
+ private Map<String,Artifact> createManagedVersionMap( String projectId, DependencyManagement dependencyManagement,
ArtifactFactory artifactFactory )
throws ProjectBuildingException
{
- Map map;
+ Map<String,Artifact> map;
if ( dependencyManagement != null && dependencyManagement.getDependencies() != null )
{
- map = new HashMap();
+ map = new HashMap<String,Artifact>();
for ( Iterator i = dependencyManagement.getDependencies().iterator(); i.hasNext(); )
{
Dependency d = (Dependency) i.next();
@@ -141,25 +141,25 @@ public abstract class AbstractReleaseTes
}
else
{
- map = Collections.EMPTY_MAP;
+ map = Collections.emptyMap();
}
return map;
}
- protected List createReactorProjects( String path, String subpath )
+ protected List<MavenProject> createReactorProjects( String path, String subpath )
throws Exception
{
return createReactorProjects( path, path, subpath );
}
- protected List createReactorProjects( String path, String targetPath, String subpath )
+ protected List<MavenProject> createReactorProjects( String path, String targetPath, String subpath )
throws Exception
{
File testFile = getTestFile( "target/test-classes/projects/" + path + subpath + "/pom.xml" );
- Stack projectFiles = new Stack();
+ Stack<File> projectFiles = new Stack<File>();
projectFiles.push( testFile );
- List repos =
+ List<DefaultArtifactRepository> repos =
Collections.singletonList( new DefaultArtifactRepository( "central", getRemoteRepositoryURL(), new DefaultRepositoryLayout() ) );
Repository repository = new Repository();
@@ -173,7 +173,7 @@ public abstract class AbstractReleaseTes
profileManager.addProfile( profile );
profileManager.activateAsDefault( profile.getId() );
- List reactorProjects = new ArrayList();
+ List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
while ( !projectFiles.isEmpty() )
{
File file = (File) projectFiles.pop();
@@ -242,10 +242,10 @@ public abstract class AbstractReleaseTes
configurator.setScmManager( scmManager );
}
- protected static Map getProjectsAsMap( List reactorProjects )
+ protected static Map<String,MavenProject> getProjectsAsMap( List<MavenProject> reactorProjects )
{
- Map map = new HashMap();
- for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ Map<String,MavenProject> map = new HashMap<String,MavenProject>();
+ for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
{
MavenProject project = (MavenProject) i.next();
@@ -254,13 +254,13 @@ public abstract class AbstractReleaseTes
return map;
}
- protected boolean comparePomFiles( List reactorProjects )
+ protected boolean comparePomFiles( List<MavenProject> reactorProjects )
throws IOException
{
return comparePomFiles( reactorProjects, true );
}
- protected boolean comparePomFiles( List reactorProjects, boolean normalizeLineEndings )
+ protected boolean comparePomFiles( List<MavenProject> reactorProjects, boolean normalizeLineEndings )
throws IOException
{
comparePomFiles( reactorProjects, "", normalizeLineEndings );
@@ -269,18 +269,18 @@ public abstract class AbstractReleaseTes
return true;
}
- protected void comparePomFiles( List reactorProjects, String expectedFileSuffix )
+ protected void comparePomFiles( List<MavenProject> reactorProjects, String expectedFileSuffix )
throws IOException
{
comparePomFiles( reactorProjects, expectedFileSuffix, true );
}
- protected void comparePomFiles( List reactorProjects, String expectedFileSuffix, boolean normalizeLineEndings )
+ protected void comparePomFiles( List<MavenProject> reactorProjects, String expectedFileSuffix, boolean normalizeLineEndings )
throws IOException
{
- for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
{
- MavenProject project = (MavenProject) i.next();
+ MavenProject project = i.next();
comparePomFiles( project, expectedFileSuffix, normalizeLineEndings );
}
@@ -317,17 +317,6 @@ public abstract class AbstractReleaseTes
}
/**
- * Mock-up of {@link ReleaseUtil#readXmlFile(File)}, except this one REMOVES line endings.
- * There is something fishy about the line ending conversion in that method, and it's not the
- * class under test in these test cases.
- */
- private String read( File file )
- throws IOException
- {
- return read( file, true );
- }
-
- /**
* Mock-up of {@link ReleaseUtil#readXmlFile(File)}, except this one REMOVES line endings. There is something fishy
* about the line ending conversion in that method, and it's not the class under test in these test cases.
*
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java Tue Feb 1 11:55:50 2011
@@ -55,7 +55,7 @@ public abstract class AbstractRewritingR
public void testRewriteBasicPom()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
@@ -67,7 +67,7 @@ public abstract class AbstractRewritingR
public void testRewriteBasicPomEntities()
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-entities" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-entities" );
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
@@ -79,7 +79,7 @@ public abstract class AbstractRewritingR
public void testRewriteBasicPomNamespace()
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-namespace" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-namespace" );
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
@@ -91,7 +91,7 @@ public abstract class AbstractRewritingR
public void testRewriteBasicPomWithEncoding()
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-with-encoding" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-encoding" );
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
@@ -103,7 +103,7 @@ public abstract class AbstractRewritingR
public void testRewritePomWithParent()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-parent" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-parent" );
ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -115,11 +115,11 @@ public abstract class AbstractRewritingR
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-parent" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-parent" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
// Process the child first
- reactorProjects = new ArrayList( reactorProjects );
+ reactorProjects = new ArrayList<MavenProject>( reactorProjects );
Collections.reverse( reactorProjects );
mapAlternateNextVersion( config, "groupId:subproject1" );
@@ -140,7 +140,7 @@ public abstract class AbstractRewritingR
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-released-parent" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-released-parent" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
mapAlternateNextVersion( config, "groupId:subproject1" );
@@ -157,7 +157,7 @@ public abstract class AbstractRewritingR
public void testRewritePomWithInheritedVersion()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-inherited-version" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-inherited-version" );
ReleaseDescriptor config = createConfigurationForWithParentNextVersion( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -168,7 +168,7 @@ public abstract class AbstractRewritingR
public void testRewritePomWithChangedInheritedVersion()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-inherited-version" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-inherited-version" );
ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -177,13 +177,13 @@ public abstract class AbstractRewritingR
comparePomFiles( project, "-version-changed" );
}
- protected abstract ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List reactorProjects )
+ protected abstract ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List<MavenProject> reactorProjects )
throws Exception;
public void testRewritePomDependencies()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-snapshot-dependencies" );
ReleaseDescriptor config = createDefaultConfiguration( reactorProjects );
mapNextVersion( config, "groupId:subsubproject" );
@@ -195,7 +195,7 @@ public abstract class AbstractRewritingR
public void testRewritePomUnmappedDependencies()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-snapshot-dependencies" );
ReleaseDescriptor config = createUnmappedConfiguration( reactorProjects );
try
@@ -213,7 +213,7 @@ public abstract class AbstractRewritingR
public void testRewritePomDependenciesDifferentVersion()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-differing-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-differing-snapshot-dependencies" );
ReleaseDescriptor config = createDifferingVersionConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -224,7 +224,7 @@ public abstract class AbstractRewritingR
public void testRewriteManagedPomDependencies()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-managed-snapshot-dependency" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-managed-snapshot-dependency" );
ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -235,7 +235,7 @@ public abstract class AbstractRewritingR
public void testRewriteManagedPomUnmappedDependencies()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-managed-snapshot-dependency" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-managed-snapshot-dependency" );
ReleaseDescriptor config = createUnmappedConfiguration( reactorProjects );
try
@@ -253,7 +253,7 @@ public abstract class AbstractRewritingR
public void testRewritePomPlugins()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-snapshot-plugins" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-snapshot-plugins" );
ReleaseDescriptor config = createDefaultConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -264,7 +264,7 @@ public abstract class AbstractRewritingR
public void testRewritePomUnmappedPlugins()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-snapshot-plugins" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-snapshot-plugins" );
ReleaseDescriptor config = createUnmappedConfiguration( reactorProjects );
try
@@ -282,7 +282,7 @@ public abstract class AbstractRewritingR
public void testRewritePomPluginsDifferentVersion()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-differing-snapshot-plugins" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-differing-snapshot-plugins" );
ReleaseDescriptor config = createDifferingVersionConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -293,7 +293,7 @@ public abstract class AbstractRewritingR
public void testRewriteManagedPomPlugins()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-managed-snapshot-plugin" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-managed-snapshot-plugin" );
ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -304,7 +304,7 @@ public abstract class AbstractRewritingR
public void testRewriteManagedPomUnmappedPlugins()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-managed-snapshot-plugin" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-managed-snapshot-plugin" );
ReleaseDescriptor config = createUnmappedConfiguration( reactorProjects );
try
@@ -322,7 +322,7 @@ public abstract class AbstractRewritingR
public void testRewritePomReportPlugins()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-snapshot-report-plugins" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-snapshot-report-plugins" );
ReleaseDescriptor config = createDefaultConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -333,7 +333,7 @@ public abstract class AbstractRewritingR
public void testRewritePomUnmappedReportPlugins()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-snapshot-report-plugins" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-snapshot-report-plugins" );
ReleaseDescriptor config = createUnmappedConfiguration( reactorProjects );
try
@@ -351,7 +351,7 @@ public abstract class AbstractRewritingR
public void testRewritePomReportPluginsDifferentVersion()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-differing-snapshot-report-plugins" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-differing-snapshot-report-plugins" );
ReleaseDescriptor config = createDifferingVersionConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -362,7 +362,7 @@ public abstract class AbstractRewritingR
public void testRewritePomExtension()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-snapshot-extension" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-snapshot-extension" );
ReleaseDescriptor config = createDefaultConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -373,7 +373,7 @@ public abstract class AbstractRewritingR
public void testRewritePomUnmappedExtension()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-snapshot-extension" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-snapshot-extension" );
ReleaseDescriptor config = createUnmappedConfiguration( reactorProjects );
try
@@ -391,7 +391,7 @@ public abstract class AbstractRewritingR
public void testRewritePomExtensionDifferentVersion()
throws Exception
{
- List reactorProjects = createReactorProjects( "internal-differing-snapshot-extension" );
+ List<MavenProject> reactorProjects = createReactorProjects( "internal-differing-snapshot-extension" );
ReleaseDescriptor config = createDifferingVersionConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -402,7 +402,7 @@ public abstract class AbstractRewritingR
public void testRewritePomExtensionUndefinedVersion()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-without-extension-version" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-without-extension-version" );
ReleaseDescriptor config = createDefaultConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -418,7 +418,7 @@ public abstract class AbstractRewritingR
// Run a second time to check they are not duplicated
for ( int i = 0; i < 2; i++ )
{
- List reactorProjects = createReactorProjects( "basic-pom", copyFiles );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom", copyFiles );
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
config.setAddSchema( true );
@@ -434,7 +434,7 @@ public abstract class AbstractRewritingR
public void testSimulateRewriteEditModeSkipped()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
@@ -457,7 +457,7 @@ public abstract class AbstractRewritingR
public void testRewriteUnmappedPom()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
try
@@ -475,7 +475,7 @@ public abstract class AbstractRewritingR
public void testRewriteBasicPomWithScmRepoException()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
@@ -501,7 +501,7 @@ public abstract class AbstractRewritingR
public void testRewriteBasicPomWithNoSuchProviderException()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
@@ -527,7 +527,7 @@ public abstract class AbstractRewritingR
public void testRewriteWhitespaceAroundValues()
throws Exception
{
- List reactorProjects = createReactorProjects( "whitespace-around-values" );
+ List<MavenProject> reactorProjects = createReactorProjects( "whitespace-around-values" );
ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
mapNextVersion( config, "groupId:subproject2" );
@@ -539,7 +539,7 @@ public abstract class AbstractRewritingR
public void testRewriteCommentsAroundValues()
throws Exception
{
- List reactorProjects = createReactorProjects( "comments-around-values" );
+ List<MavenProject> reactorProjects = createReactorProjects( "comments-around-values" );
ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
mapNextVersion( config, "groupId:subproject2" );
@@ -551,7 +551,7 @@ public abstract class AbstractRewritingR
public void testRewriteCDataAroundValues()
throws Exception
{
- List reactorProjects = createReactorProjects( "cdata-around-values" );
+ List<MavenProject> reactorProjects = createReactorProjects( "cdata-around-values" );
ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
mapNextVersion( config, "groupId:subproject2" );
@@ -568,12 +568,12 @@ public abstract class AbstractRewritingR
config.setScmSourceUrl( "scm:svn:file://localhost/tmp/scm-repo" );
config.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
- phase.clean( Collections.EMPTY_LIST );
+ phase.clean( Collections.<MavenProject>emptyList() );
assertTrue( true );
}
- private ReleaseDescriptor createUnmappedConfiguration( List reactorProjects )
+ private ReleaseDescriptor createUnmappedConfiguration( List<MavenProject> reactorProjects )
throws Exception
{
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
@@ -585,13 +585,13 @@ public abstract class AbstractRewritingR
return config;
}
- protected List createReactorProjects( String path )
+ protected List<MavenProject> createReactorProjects( String path )
throws Exception
{
return createReactorProjects( path, true );
}
- protected ReleaseDescriptor createDefaultConfiguration( List reactorProjects )
+ protected ReleaseDescriptor createDefaultConfiguration( List<MavenProject> reactorProjects )
throws Exception
{
ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
@@ -600,7 +600,7 @@ public abstract class AbstractRewritingR
return config;
}
- protected ReleaseDescriptor createMappedConfiguration( List reactorProjects )
+ protected ReleaseDescriptor createMappedConfiguration( List<MavenProject> reactorProjects )
throws Exception
{
ReleaseDescriptor config = createDifferingVersionConfiguration( reactorProjects );
@@ -609,7 +609,7 @@ public abstract class AbstractRewritingR
return config;
}
- private ReleaseDescriptor createDifferingVersionConfiguration( List reactorProjects )
+ private ReleaseDescriptor createDifferingVersionConfiguration( List<MavenProject> reactorProjects )
throws Exception
{
ReleaseDescriptor config = createConfigurationForWithParentNextVersion( reactorProjects );
@@ -618,20 +618,20 @@ public abstract class AbstractRewritingR
return config;
}
- protected List createReactorProjectsFromBasicPom()
+ protected List<MavenProject> createReactorProjectsFromBasicPom()
throws Exception
{
return createReactorProjects( "basic-pom" );
}
- protected abstract ReleaseDescriptor createConfigurationForWithParentNextVersion( List reactorProjects )
+ protected abstract ReleaseDescriptor createConfigurationForWithParentNextVersion( List<MavenProject> reactorProjects )
throws Exception;
protected abstract void unmapNextVersion( ReleaseDescriptor config, String projectId );
protected abstract void mapNextVersion( ReleaseDescriptor config, String projectId );
- protected ReleaseDescriptor createDescriptorFromBasicPom( List reactorProjects )
+ protected ReleaseDescriptor createDescriptorFromBasicPom( List<MavenProject> reactorProjects )
throws Exception
{
return createDescriptorFromProjects( reactorProjects );
@@ -643,7 +643,7 @@ public abstract class AbstractRewritingR
public void testRewritePomDependenciesWithNamespace()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-namespace" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-namespace" );
ReleaseDescriptor config = createDefaultConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -651,10 +651,10 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
- protected abstract List createReactorProjects( String path, boolean copyFiles )
+ protected abstract List<MavenProject> createReactorProjects( String path, boolean copyFiles )
throws Exception;
- protected ReleaseDescriptor createDescriptorFromProjects( List reactorProjects )
+ protected ReleaseDescriptor createDescriptorFromProjects( List<MavenProject> reactorProjects )
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );