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 [4/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/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java Tue Feb 1 11:55:50 2011
@@ -66,8 +66,6 @@ public class ScmCommitPreparationPhaseTe
{
private static final String PREFIX = "[maven-release-manager] prepare release ";
- private static final File[] EMPTY_FILE_ARRAY = new File[0];
-
protected void setUp()
throws Exception
{
@@ -90,7 +88,7 @@ public class ScmCommitPreparationPhaseTe
public void testCommit()
throws Exception
{
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor descriptor = new ReleaseDescriptor();
descriptor.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
@@ -123,20 +121,19 @@ public class ScmCommitPreparationPhaseTe
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List reactorProjects = createReactorProjects( "scm-commit/", "multiple-poms" );
+ List<MavenProject> reactorProjects = createReactorProjects( "scm-commit/", "multiple-poms" );
descriptor.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
descriptor.setScmReleaseLabel( "release-label" );
- List poms = new ArrayList();
- for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ List<File> poms = new ArrayList<File>();
+ for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
{
- MavenProject project = (MavenProject) i.next();
+ MavenProject project = i.next();
poms.add( project.getFile() );
}
- ScmFileSet fileSet = new ScmFileSet( rootProject.getFile().getParentFile(), (File[]) poms.toArray(
- EMPTY_FILE_ARRAY ) );
+ ScmFileSet fileSet = new ScmFileSet( rootProject.getFile().getParentFile(), poms);
Mock scmProviderMock = new Mock( ScmProvider.class );
Constraint[] arguments = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( fileSet ), new IsNull(),
@@ -162,7 +159,7 @@ public class ScmCommitPreparationPhaseTe
phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "scm-commit-development" );
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
descriptor.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
@@ -192,7 +189,7 @@ public class ScmCommitPreparationPhaseTe
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
try
{
@@ -208,7 +205,7 @@ public class ScmCommitPreparationPhaseTe
public void testCommitGenerateReleasePoms()
throws Exception
{
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor descriptor = new ReleaseDescriptor();
descriptor.setScmSourceUrl( "scm-url" );
descriptor.setGenerateReleasePoms( true );
@@ -216,7 +213,7 @@ public class ScmCommitPreparationPhaseTe
descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
descriptor.setScmReleaseLabel( "release-label" );
- List files = new ArrayList();
+ List<File> files = new ArrayList<File>();
files.add( rootProject.getFile() );
files.add( ReleaseUtil.getReleasePom( rootProject ) );
ScmFileSet fileSet = new ScmFileSet( rootProject.getFile().getParentFile(), files );
@@ -243,7 +240,7 @@ public class ScmCommitPreparationPhaseTe
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
descriptor.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
@@ -260,7 +257,7 @@ public class ScmCommitPreparationPhaseTe
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
try
{
@@ -276,7 +273,7 @@ public class ScmCommitPreparationPhaseTe
public void testNoSuchScmProviderExceptionThrown()
throws Exception
{
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
Mock scmManagerMock = new Mock( ScmManager.class );
@@ -303,7 +300,7 @@ public class ScmCommitPreparationPhaseTe
public void testScmRepositoryExceptionThrown()
throws Exception
{
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
Mock scmManagerMock = new Mock( ScmManager.class );
@@ -330,7 +327,7 @@ public class ScmCommitPreparationPhaseTe
public void testScmExceptionThrown()
throws Exception
{
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
Mock scmProviderMock = new Mock( ScmProvider.class );
@@ -355,7 +352,7 @@ public class ScmCommitPreparationPhaseTe
public void testScmResultFailure()
throws Exception
{
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
@@ -380,7 +377,7 @@ public class ScmCommitPreparationPhaseTe
throws Exception
{
ReleaseDescriptor descriptor = createReleaseDescriptor();
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
descriptor.setRemoteTagging( true );
descriptor.setSuppressCommitBeforeTagOrBranch( true );
@@ -405,7 +402,7 @@ public class ScmCommitPreparationPhaseTe
throws Exception
{
ReleaseDescriptor descriptor = createReleaseDescriptor();
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
descriptor.setBranchCreation( true );
descriptor.setRemoteTagging( false );
@@ -428,7 +425,7 @@ public class ScmCommitPreparationPhaseTe
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
}
- private List createReactorProjects()
+ private List<MavenProject> createReactorProjects()
throws Exception
{
return createReactorProjects( "scm-commit/", "single-pom" );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java Tue Feb 1 11:55:50 2011
@@ -75,7 +75,7 @@ public class ScmTagPhaseTest
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
descriptor.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
@@ -106,7 +106,7 @@ public class ScmTagPhaseTest
public void testCommitMultiModuleDeepFolders()
throws Exception
{
- List reactorProjects = createReactorProjects( "scm-commit/", "multimodule-with-deep-subprojects" );
+ List<MavenProject> reactorProjects = createReactorProjects( "scm-commit/", "multimodule-with-deep-subprojects" );
String sourceUrl = "http://svn.example.com/repos/project/trunk/";
String scmUrl = "scm:svn:" + sourceUrl;
ReleaseDescriptor descriptor = new ReleaseDescriptor();
@@ -143,7 +143,7 @@ public class ScmTagPhaseTest
public void testCommitForFlatMultiModule()
throws Exception
{
- List reactorProjects =
+ List<MavenProject> reactorProjects =
createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "/root-project" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
ReleaseDescriptor descriptor = new ReleaseDescriptor();
@@ -180,7 +180,7 @@ public class ScmTagPhaseTest
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List reactorProjects = createReactorProjects( "scm-commit/", "multiple-poms" );
+ List<MavenProject> reactorProjects = createReactorProjects( "scm-commit/", "multiple-poms" );
descriptor.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
@@ -212,7 +212,7 @@ public class ScmTagPhaseTest
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
try
{
@@ -229,7 +229,7 @@ public class ScmTagPhaseTest
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
descriptor.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
@@ -250,7 +250,7 @@ public class ScmTagPhaseTest
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
try
{
@@ -266,7 +266,7 @@ public class ScmTagPhaseTest
public void testNoSuchScmProviderExceptionThrown()
throws Exception
{
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
Mock scmManagerMock = new Mock( ScmManager.class );
@@ -293,7 +293,7 @@ public class ScmTagPhaseTest
public void testScmRepositoryExceptionThrown()
throws Exception
{
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
Mock scmManagerMock = new Mock( ScmManager.class );
@@ -320,7 +320,7 @@ public class ScmTagPhaseTest
public void testScmExceptionThrown()
throws Exception
{
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
Mock scmProviderMock = new Mock( ScmProvider.class );
@@ -345,7 +345,7 @@ public class ScmTagPhaseTest
public void testScmResultFailure()
throws Exception
{
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
@@ -366,7 +366,7 @@ public class ScmTagPhaseTest
}
}
- private List createReactorProjects()
+ private List<MavenProject> createReactorProjects()
throws Exception
{
return createReactorProjects( "scm-commit/", "single-pom" );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java Tue Feb 1 11:55:50 2011
@@ -32,7 +32,7 @@ import org.apache.maven.scm.repository.S
public class ScmManagerStub
extends org.apache.maven.scm.manager.ScmManagerStub
{
- private Map/*<String, ScmRepository>*/ scmRepositoriesForUrl = new HashMap/*<String, ScmRepository>*/();
+ private Map<String, ScmRepository> scmRepositoriesForUrl = new HashMap<String, ScmRepository>();
/*@Override*/
public ScmRepository makeScmRepository( String scmUrl )
Modified: maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/FlatMultiModuleMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/FlatMultiModuleMavenProjectStub.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/FlatMultiModuleMavenProjectStub.java (original)
+++ maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/FlatMultiModuleMavenProjectStub.java Tue Feb 1 11:55:50 2011
@@ -60,9 +60,9 @@ public class FlatMultiModuleMavenProject
return getModel().getDistributionManagement();
}
- public List getModules()
+ public List<String> getModules()
{
- List modules = new ArrayList();
+ List<String> modules = new ArrayList<String>();
modules.add( "../core" );
modules.add( "../webapp" );
modules.add( "../commons" );