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 [3/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/CheckDependencySnapshotsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.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.ReleaseFailureException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
@@ -44,7 +45,7 @@ public class CheckDependencySnapshotsPha
private static final String YES = "yes";
- private static final List YES_NO_ARRAY = Arrays.asList( YES, NO );
+ private static final List<String> YES_NO_ARRAY = Arrays.asList( YES, NO );
private static final String DEFAULT_CHOICE = "1";
@@ -62,7 +63,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "no-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "no-snapshot-dependencies" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -79,7 +80,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "no-snapshot-range-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "no-snapshot-range-dependencies" );
phase.setPrompter( createMockPrompter( YES, DEFAULT_CHOICE, new VersionPair( "1.1", "1.2-SNAPSHOT" ) ) );
@@ -97,7 +98,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "internal-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-snapshot-dependencies" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -111,7 +112,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
releaseDescriptor.setInteractive( false );
try
@@ -144,7 +145,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
phase.setPrompter( createMockPrompterWithSnapshotReleasePlugin( NO, NO ) );
@@ -180,7 +181,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
phase.setPrompter( createYesMockPrompter() );
@@ -196,7 +197,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
phase.setPrompter( createYesMockPrompter() );
@@ -212,7 +213,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
phase.setPrompter( createMockPrompterWithSnapshotReleasePlugin( "donkey", NO ) );
@@ -248,7 +249,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
Prompter mockPrompter = mock( Prompter.class );
when( mockPrompter.prompt( anyString(), eq( YES_NO_ARRAY ), eq( NO ) ) ).thenThrow( new PrompterException(
@@ -289,7 +290,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "internal-differing-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-differing-snapshot-dependencies" );
phase.setPrompter( createNoMockPrompter() );
@@ -322,7 +323,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "internal-managed-snapshot-dependency" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-managed-snapshot-dependency" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -336,7 +337,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "unused-internal-managed-snapshot-dependency" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "unused-internal-managed-snapshot-dependency" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -350,7 +351,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "unused-external-managed-snapshot-dependency" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "unused-external-managed-snapshot-dependency" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -364,7 +365,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-managed-snapshot-dependency" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-managed-snapshot-dependency" );
releaseDescriptor.setInteractive( false );
@@ -395,7 +396,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
releaseDescriptor.setInteractive( false );
@@ -426,7 +427,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-range-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-range-snapshot-dependencies" );
releaseDescriptor.setInteractive( false );
@@ -460,7 +461,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
phase.setPrompter( createMockPrompter( YES, DEFAULT_CHOICE, new VersionPair( "1.0", "1.1-SNAPSHOT" ),
new VersionPair( "1.0", "1.0" ) ) );
@@ -475,6 +476,7 @@ public class CheckDependencySnapshotsPha
}
// validate
+ @SuppressWarnings("rawtypes")
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId" );
assertNotNull( versionsMap );
@@ -502,7 +504,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
phase.setPrompter( createMockPrompter( YES, DEFAULT_CHOICE, new VersionPair( "0.9", "1.0-SNAPSHOT" ),
new VersionPair( "1.0", "1.0-SNAPSHOT" ) ) );
@@ -517,6 +519,7 @@ public class CheckDependencySnapshotsPha
}
// validate
+ @SuppressWarnings("rawtypes")
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId" );
assertNotNull( versionsMap );
@@ -531,7 +534,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
phase.setPrompter( createMockPrompter( YES, DEFAULT_CHOICE, new VersionPair( "1.0", "1.0" ) ) );
@@ -545,6 +548,7 @@ public class CheckDependencySnapshotsPha
}
// validate
+ @SuppressWarnings("rawtypes")
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId" );
assertNotNull( versionsMap );
@@ -559,7 +563,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
phase.setPrompter( createMockPrompter( YES, "0", new VersionPair( "1.0", "1.0" ) ) );
@@ -573,6 +577,7 @@ public class CheckDependencySnapshotsPha
}
// validate
+ @SuppressWarnings("rawtypes")
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId" );
assertNotNull( versionsMap );
@@ -588,7 +593,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-snapshot-all" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-all" );
Prompter mockPrompter = createMockPrompter( YES, "0", Arrays.asList( new VersionPair( "1.0", "1.0" ),
new VersionPair( "1.1", "1.1" ),
@@ -606,6 +611,7 @@ public class CheckDependencySnapshotsPha
}
// validate
+ @SuppressWarnings("rawtypes")
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId" );
assertNotNull( versionsMap );
@@ -621,7 +627,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "multimodule-external-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "multimodule-external-snapshot-dependencies" );
VersionPair pair = new VersionPair( "1.0", "1.1-SNAPSHOT" );
VersionPair defaultPair = new VersionPair( "1.0", "1.0" );
@@ -638,6 +644,7 @@ public class CheckDependencySnapshotsPha
fail( e.getMessage() );
}
+ @SuppressWarnings("rawtypes")
Map resolvedDependencies = releaseDescriptor.getResolvedSnapshotDependencies();
assertNotNull( resolvedDependencies );
@@ -646,6 +653,7 @@ public class CheckDependencySnapshotsPha
assertTrue( resolvedDependencies.containsKey( "external:artifactId" ) );
assertTrue( resolvedDependencies.containsKey( "external:artifactId2") );
+ @SuppressWarnings("rawtypes")
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId" );
assertNotNull( versionsMap );
@@ -666,7 +674,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "internal-and-external-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-and-external-snapshot-dependencies" );
phase.setPrompter( createNoMockPrompter() );
@@ -699,7 +707,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "no-snapshot-report-plugins" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "no-snapshot-report-plugins" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -713,7 +721,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "internal-snapshot-report-plugins" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-snapshot-report-plugins" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -730,7 +738,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-snapshot-report-plugins" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-report-plugins" );
phase.setPrompter( createNoMockPrompter() );
@@ -766,7 +774,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "internal-and-external-snapshot-report-plugins" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-and-external-snapshot-report-plugins" );
phase.setPrompter( createNoMockPrompter() );
@@ -799,7 +807,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "no-snapshot-plugins" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "no-snapshot-plugins" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -813,7 +821,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "internal-snapshot-plugins" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-snapshot-plugins" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -827,7 +835,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "internal-managed-snapshot-plugin" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-managed-snapshot-plugin" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -841,7 +849,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "unused-internal-managed-snapshot-plugin" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "unused-internal-managed-snapshot-plugin" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -855,7 +863,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "unused-external-managed-snapshot-plugin" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "unused-external-managed-snapshot-plugin" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -872,7 +880,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-managed-snapshot-plugin" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-managed-snapshot-plugin" );
phase.setPrompter( createNoMockPrompter() );
@@ -908,7 +916,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-snapshot-plugins" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-plugins" );
phase.setPrompter( createNoMockPrompter() );
@@ -944,7 +952,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "internal-and-external-snapshot-plugins" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-and-external-snapshot-plugins" );
phase.setPrompter( createNoMockPrompter() );
@@ -980,7 +988,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-snapshot-parent/child" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-parent/child" );
phase.setPrompter( createNoMockPrompter() );
@@ -1016,7 +1024,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-snapshot-parent/child" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-parent/child" );
Prompter mockPrompter = createMockPrompter( YES, DEFAULT_CHOICE, new VersionPair( "1.0-test", "1.0-test" ),
new VersionPair( "1.0", "1.0-test" ) );
@@ -1032,6 +1040,7 @@ public class CheckDependencySnapshotsPha
}
// validate
+ @SuppressWarnings("rawtypes")
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "groupId:parent-external" );
assertNotNull( versionsMap );
@@ -1043,7 +1052,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-parent/child" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-parent/child" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -1060,7 +1069,7 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-snapshot-extension" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-extension" );
phase.setPrompter( createNoMockPrompter() );
@@ -1093,7 +1102,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "internal-snapshot-extension" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-snapshot-extension" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -1107,7 +1116,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-extension" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-extension" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -1121,7 +1130,7 @@ public class CheckDependencySnapshotsPha
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List reactorProjects = createDescriptorFromProjects( "external-timestamped-snapshot-dependencies" );
+ List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-timestamped-snapshot-dependencies" );
releaseDescriptor.setInteractive( false );
@@ -1148,7 +1157,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
- private List createDescriptorFromProjects( String path )
+ private List<MavenProject> createDescriptorFromProjects( String path )
throws Exception
{
return createReactorProjects( "check-dependencies/", path );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.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.scm.ScmFileSet;
import org.apache.maven.scm.ScmTag;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
@@ -78,7 +79,7 @@ public class CheckoutProjectFromScmTest
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
stub.addScmRepositoryForUrl( scmUrl, repository );
- List reactorProjects = createReactorProjects( "scm-commit", "/single-pom" );
+ List<MavenProject> reactorProjects = createReactorProjects( "scm-commit", "/single-pom" );
phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects );
assertEquals( "", descriptor.getScmRelativePathProjectDirectory() );
@@ -108,7 +109,7 @@ public class CheckoutProjectFromScmTest
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
stub.addScmRepositoryForUrl( scmUrl, repository );
- List reactorProjects = createReactorProjects( "scm-commit", "/multimodule-with-deep-subprojects" );
+ List<MavenProject> reactorProjects = createReactorProjects( "scm-commit", "/multimodule-with-deep-subprojects" );
phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects );
assertEquals( "", descriptor.getScmRelativePathProjectDirectory() );
@@ -138,7 +139,7 @@ public class CheckoutProjectFromScmTest
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
stub.addScmRepositoryForUrl( scmUrl, repository );
- List reactorProjects = createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "/root-project" );
+ List<MavenProject> reactorProjects = createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "/root-project" );
phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects );
assertEquals( "root-project", descriptor.getScmRelativePathProjectDirectory() );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java Tue Feb 1 11:55:50 2011
@@ -72,7 +72,7 @@ public class CreateBackupPomsPhaseTest
private void runExecuteOnProjects( String path )
throws Exception
{
- List projects = getReactorProjects( getTestPath( path ) );
+ List<MavenProject> projects = getReactorProjects( getTestPath( path ) );
phase.execute( null, new DefaultReleaseEnvironment(), projects );
@@ -82,7 +82,7 @@ public class CreateBackupPomsPhaseTest
private void runSimulateOnProjects( String path )
throws Exception
{
- List projects = getReactorProjects( getTestPath( path ) );
+ List<MavenProject> projects = getReactorProjects( getTestPath( path ) );
phase.simulate( null, new DefaultReleaseEnvironment(), projects );
@@ -92,19 +92,19 @@ public class CreateBackupPomsPhaseTest
private void runCleanOnProjects( String path )
throws Exception
{
- List projects = getReactorProjects( getTestPath( path ) );
+ List<MavenProject> projects = getReactorProjects( getTestPath( path ) );
phase.clean( projects );
testProjectBackups( projects, false );
}
- protected void testProjectBackups( List reactorProjects, boolean created )
+ protected void testProjectBackups( List<MavenProject> reactorProjects, boolean created )
throws Exception
{
- for( Iterator projects = reactorProjects.iterator(); projects.hasNext(); )
+ for( Iterator<MavenProject> projects = reactorProjects.iterator(); projects.hasNext(); )
{
- MavenProject project = (MavenProject) projects.next();
+ MavenProject project = projects.next();
File pomFile = project.getFile();
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java Tue Feb 1 11:55:50 2011
@@ -80,7 +80,7 @@ public class GenerateReleasePomsPhaseTes
public void testRewriteExternalRangeDependency() throws Exception
{
- List reactorProjects = createReactorProjects( "external-range-dependency" );
+ List<MavenProject> reactorProjects = createReactorProjects( "external-range-dependency" );
ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -91,7 +91,7 @@ public class GenerateReleasePomsPhaseTes
/*
* @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createDescriptorFromProjects(java.util.List)
*/
- protected ReleaseDescriptor createDescriptorFromProjects( List reactorProjects )
+ protected ReleaseDescriptor createDescriptorFromProjects( List<MavenProject> reactorProjects )
{
ReleaseDescriptor descriptor = super.createDescriptorFromProjects( reactorProjects );
descriptor.setScmReleaseLabel( "release-label" );
@@ -103,20 +103,20 @@ public class GenerateReleasePomsPhaseTes
* @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createReactorProjects(java.lang.String,
* boolean)
*/
- protected List createReactorProjects( String path, boolean copyFiles ) throws Exception
+ protected List<MavenProject> createReactorProjects( String path, boolean copyFiles ) throws Exception
{
- List reactorProjects = createReactorProjects( "generate-release-poms/", path );
+ List<MavenProject> reactorProjects = createReactorProjects( "generate-release-poms/", path );
// add scm provider expectations for each project in the reactor
// TODO: can we move this somewhere better?
scmProviderMock = new Mock( ScmProvider.class );
- List releasePoms = new ArrayList();
+ List<File> releasePoms = new ArrayList<File>();
- for ( Iterator iterator = reactorProjects.iterator(); iterator.hasNext(); )
+ for ( Iterator<MavenProject> iterator = reactorProjects.iterator(); iterator.hasNext(); )
{
- MavenProject project = (MavenProject) iterator.next();
+ MavenProject project = iterator.next();
releasePoms.add( ReleaseUtil.getReleasePom( project ) );
}
@@ -171,7 +171,7 @@ public class GenerateReleasePomsPhaseTes
/*
* @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createConfigurationForPomWithParentAlternateNextVersion(java.util.List)
*/
- protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List reactorProjects )
+ protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List<MavenProject> reactorProjects )
throws Exception
{
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
@@ -185,7 +185,7 @@ public class GenerateReleasePomsPhaseTes
/*
* @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createConfigurationForWithParentNextVersion(java.util.List)
*/
- protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List reactorProjects ) throws Exception
+ protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List<MavenProject> reactorProjects ) throws Exception
{
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java Tue Feb 1 11:55:50 2011
@@ -64,7 +64,7 @@ public class InputVariablesPhaseTest
new ReturnStub( "tag-value" ) );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
releaseDescriptor.mapReleaseVersion( "groupId:artifactId", "1.0" );
@@ -91,7 +91,7 @@ public class InputVariablesPhaseTest
public void testUnmappedVersion()
throws Exception
{
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
@@ -127,7 +127,7 @@ public class InputVariablesPhaseTest
mockPrompter.expects( new TestFailureMatcher( "prompter should not be called" ) ).method( "prompt" );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
releaseDescriptor.setInteractive( false );
@@ -158,7 +158,7 @@ public class InputVariablesPhaseTest
mockPrompter.expects( new TestFailureMatcher( "prompter should not be called" ) ).method( "prompt" );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
releaseDescriptor.setInteractive( false );
@@ -187,7 +187,7 @@ public class InputVariablesPhaseTest
mockPrompter.expects( new TestFailureMatcher( "prompter should not be called" ) ).method( "prompt" );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
releaseDescriptor.setScmReleaseLabel( "tag-value" );
@@ -215,7 +215,7 @@ public class InputVariablesPhaseTest
new ThrowStub( new PrompterException( "..." ) ) );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
releaseDescriptor.mapReleaseVersion( "groupId:artifactId", "1.0" );
@@ -260,7 +260,7 @@ public class InputVariablesPhaseTest
mockPrompter.expects( new TestFailureMatcher( "prompter should not be called" ) ).method( "prompt" );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
ReleaseDescriptor releaseConfiguration = new ReleaseDescriptor();
releaseConfiguration.setInteractive( false );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java Tue Feb 1 11:55:50 2011
@@ -19,11 +19,11 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import java.util.Arrays;
+
import org.apache.maven.scm.ScmFileSet;
import org.jmock.core.Constraint;
-import java.util.Arrays;
-
/**
* JMock constraint to compare file sets since it has no equals method.
*
@@ -45,7 +45,7 @@ public class IsScmFileSetEquals
ScmFileSet fs = (ScmFileSet) object;
return fs.getBasedir().equals( fileSet.getBasedir() ) &&
- Arrays.asList( fs.getFiles() ).equals( Arrays.asList( fileSet.getFiles() ) );
+ Arrays.asList( fs.getFiles() ).equals( Arrays.asList( fileSet.getFiles() ) );
}
public StringBuffer describeTo( StringBuffer stringBuffer )
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParamtersEquals.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParamtersEquals.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParamtersEquals.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParamtersEquals.java Tue Feb 1 11:55:50 2011
@@ -1,6 +1,5 @@
package org.apache.maven.shared.release.phase;
-import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTagParameters;
import org.jmock.core.Constraint;
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java Tue Feb 1 11:55:50 2011
@@ -19,6 +19,9 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import java.util.Collections;
+import java.util.List;
+
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
@@ -31,15 +34,11 @@ import org.codehaus.plexus.components.in
import org.jmock.Mock;
import org.jmock.core.constraint.IsAnything;
import org.jmock.core.constraint.IsEqual;
-import org.jmock.core.constraint.IsNull;
import org.jmock.core.matcher.InvokeOnceMatcher;
import org.jmock.core.matcher.TestFailureMatcher;
import org.jmock.core.stub.ReturnStub;
import org.jmock.core.stub.ThrowStub;
-import java.util.Collections;
-import java.util.List;
-
/**
* Test the version mapping phase.
*
@@ -59,7 +58,7 @@ public class MapVersionsPhaseTest
new ReturnStub( "2.0" ) );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0-SNAPSHOT" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0-SNAPSHOT" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
@@ -96,7 +95,7 @@ public class MapVersionsPhaseTest
new ReturnStub( "2.0" ) );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "SNAPSHOT" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "SNAPSHOT" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
@@ -124,7 +123,7 @@ public class MapVersionsPhaseTest
public void testMapReleaseVersionsNonInteractiveWithExplicitVersion()
throws Exception
{
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "SNAPSHOT" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "SNAPSHOT" ) );
MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, "test-map-release-versions" );
@@ -163,7 +162,7 @@ public class MapVersionsPhaseTest
mockPrompter.expects( new TestFailureMatcher( "prompter should not be called" ) ).method( "prompt" );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0-SNAPSHOT" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0-SNAPSHOT" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
releaseDescriptor.setInteractive( false );
@@ -196,7 +195,7 @@ public class MapVersionsPhaseTest
new ReturnStub( "2.0-SNAPSHOT" ) );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
@@ -227,7 +226,7 @@ public class MapVersionsPhaseTest
mockPrompter.expects( new TestFailureMatcher( "prompter should not be called" ) ).method( "prompt" );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
releaseDescriptor.setInteractive( false );
@@ -256,7 +255,7 @@ public class MapVersionsPhaseTest
throws Exception
{
MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, "test-map-development-versions" );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
// execute
Mock mockPrompter = new Mock( Prompter.class );
@@ -296,7 +295,7 @@ public class MapVersionsPhaseTest
new ThrowStub( new PrompterException( "..." ) ) );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
@@ -340,7 +339,7 @@ public class MapVersionsPhaseTest
new ReturnStub( "2.0-SNAPSHOT" ) );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "foo" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "foo" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
@@ -367,7 +366,7 @@ public class MapVersionsPhaseTest
{
MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, "test-map-development-versions" );
- List reactorProjects = Collections.singletonList( createProject( "artifactId", "foo" ) );
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "foo" ) );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
releaseDescriptor.setInteractive( false );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
@@ -49,7 +50,7 @@ public class ReleasePhaseStub
*/
private boolean cleaned;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
{
ReleaseResult result = new ReleaseResult();
@@ -60,7 +61,7 @@ public class ReleasePhaseStub
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
{
ReleaseResult result = new ReleaseResult();
@@ -71,7 +72,7 @@ public class ReleasePhaseStub
return result;
}
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
{
ReleaseResult result = new ReleaseResult();
@@ -82,7 +83,7 @@ public class ReleasePhaseStub
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
{
ReleaseResult result = new ReleaseResult();
@@ -93,7 +94,7 @@ public class ReleasePhaseStub
return result;
}
- public ReleaseResult clean( List reactorProjects )
+ public ReleaseResult clean( List<MavenProject> reactorProjects )
{
ReleaseResult result = new ReleaseResult();
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java Tue Feb 1 11:55:50 2011
@@ -63,7 +63,7 @@ public class RemoveReleasePomsPhaseTest
public void testExecuteBasicPom()
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptor config = createReleaseDescriptor();
MavenProject project = ReleaseUtil.getRootProject( reactorProjects );
@@ -92,13 +92,13 @@ public class RemoveReleasePomsPhaseTest
public void testExecutePomWithModules()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-modules" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-modules" );
ReleaseDescriptor config = createReleaseDescriptor();
- List releasePoms = new ArrayList();
- for ( Iterator iterator = reactorProjects.iterator(); iterator.hasNext(); )
+ List<File> releasePoms = new ArrayList<File>();
+ for ( Iterator<MavenProject> iterator = reactorProjects.iterator(); iterator.hasNext(); )
{
- MavenProject project = (MavenProject) iterator.next();
+ MavenProject project = iterator.next();
File releasePom = ReleaseUtil.getReleasePom( project );
releasePoms.add( releasePom );
}
@@ -125,7 +125,7 @@ public class RemoveReleasePomsPhaseTest
public void testSimulateBasicPom()
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptor config = createReleaseDescriptor();
Mock scmProviderMock = new Mock( ScmProvider.class );
@@ -139,7 +139,7 @@ public class RemoveReleasePomsPhaseTest
scmProviderMock.verify();
}
- private List createReactorProjects( String path )
+ private List<MavenProject> createReactorProjects( String path )
throws Exception
{
return createReactorProjects( "remove-release-poms/", path );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java Tue Feb 1 11:55:50 2011
@@ -76,7 +76,7 @@ public class RestoreBackupPomsPhaseTest
private void runExecuteOnProjects( String path )
throws Exception
{
- List projects = getReactorProjects( getTestPath( path ) );
+ List<MavenProject> projects = getReactorProjects( getTestPath( path ) );
ReleaseDescriptor desc = new ReleaseDescriptor();
desc.setScmSourceUrl( "scm:svn:http://myhost/myrepo" );
@@ -85,12 +85,12 @@ public class RestoreBackupPomsPhaseTest
testProjectIsRestored( projects );
}
- private void testProjectIsRestored( List reactorProjects )
+ private void testProjectIsRestored( List<MavenProject> reactorProjects )
throws Exception
{
- for ( Iterator projects = reactorProjects.iterator(); projects.hasNext(); )
+ for ( Iterator<MavenProject> projects = reactorProjects.iterator(); projects.hasNext(); )
{
- MavenProject project = (MavenProject) projects.next();
+ MavenProject project = projects.next();
File pomFile = project.getFile();
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java Tue Feb 1 11:55:50 2011
@@ -60,7 +60,7 @@ public class RewritePomsForDevelopmentPh
public void testSimulateRewrite()
throws Exception
{
- List reactorProjects = createReactorProjectsWhenSimulated( "basic-pom" );
+ List<MavenProject> reactorProjects = createReactorProjectsWhenSimulated( "basic-pom" );
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
@@ -77,7 +77,7 @@ public class RewritePomsForDevelopmentPh
assertEquals( "Check the transformed POM", expected, actual );
}
- private List createReactorProjectsWhenSimulated( String name )
+ private List<MavenProject> createReactorProjectsWhenSimulated( String name )
throws Exception
{
return createReactorProjects( "rewrite-for-release/", "rewrite-for-development/", name );
@@ -86,7 +86,7 @@ public class RewritePomsForDevelopmentPh
public void testSimulateRewriteEjbClientDeps()
throws Exception
{
- List reactorProjects = new LinkedList( createReactorProjects( "basic-pom-ejb-client-dep/project" ) );
+ List<MavenProject> reactorProjects = new LinkedList<MavenProject>( createReactorProjects( "basic-pom-ejb-client-dep/project" ) );
reactorProjects.addAll( createReactorProjects( "basic-pom-ejb-client-dep/ejb" ) );
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
@@ -109,7 +109,7 @@ public class RewritePomsForDevelopmentPh
public void testClean()
throws Exception
{
- List reactorProjects = createReactorProjectsWhenSimulated( "basic-pom" );
+ List<MavenProject> reactorProjects = createReactorProjectsWhenSimulated( "basic-pom" );
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
@@ -130,7 +130,7 @@ public class RewritePomsForDevelopmentPh
public void testCleanNotExists()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
@@ -147,7 +147,7 @@ public class RewritePomsForDevelopmentPh
public void testRewriteBasicPomUnmappedScm()
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom", true );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom", true );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
@@ -177,13 +177,13 @@ public class RewritePomsForDevelopmentPh
return ReleaseUtil.readXmlFile( getTestFile( "target/test-classes/projects/"+ subpath + fileName ) );
}
- protected List createReactorProjects( String path, boolean copyFiles )
+ protected List<MavenProject> createReactorProjects( String path, boolean copyFiles )
throws Exception
{
return createReactorProjects( "rewrite-for-development/", path );
}
- protected ReleaseDescriptor createDescriptorFromBasicPom( List reactorProjects )
+ protected ReleaseDescriptor createDescriptorFromBasicPom( List<MavenProject> reactorProjects )
throws Exception
{
ReleaseDescriptor config = super.createDescriptorFromBasicPom( reactorProjects );
@@ -219,7 +219,7 @@ public class RewritePomsForDevelopmentPh
config.mapReleaseVersion( projectId, RELEASE_VERSION );
}
- protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List reactorProjects )
+ protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List<MavenProject> reactorProjects )
throws Exception
{
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
@@ -233,7 +233,7 @@ public class RewritePomsForDevelopmentPh
return config;
}
- protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List reactorProjects )
+ protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List<MavenProject> reactorProjects )
throws Exception
{
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
@@ -251,7 +251,7 @@ public class RewritePomsForDevelopmentPh
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-with-cvs" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-cvs" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
@@ -270,7 +270,7 @@ public class RewritePomsForDevelopmentPh
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-with-cvs-from-tag" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-cvs-from-tag" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
@@ -290,7 +290,7 @@ public class RewritePomsForDevelopmentPh
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-inherited-scm" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-inherited-scm" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
@@ -316,7 +316,7 @@ public class RewritePomsForDevelopmentPh
public void testRewritePomWithParentAndProperties()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-parent-and-properties" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-parent-and-properties" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
@@ -337,7 +337,7 @@ public class RewritePomsForDevelopmentPh
throws Exception
{
// use the original ones since simulation didn't modify them
- List reactorProjects = createReactorProjects( "pom-with-parent-and-properties-sim" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-parent-and-properties-sim" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
@@ -351,9 +351,9 @@ public class RewritePomsForDevelopmentPh
phase.simulate( config, new DefaultReleaseEnvironment(), reactorProjects );
- for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
{
- MavenProject project = (MavenProject) i.next();
+ MavenProject project = i.next();
File pomFile = project.getFile();
File actualFile = new File( pomFile.getParentFile(), pomFile.getName() + ".next" );
@@ -367,7 +367,7 @@ public class RewritePomsForDevelopmentPh
public void testRewritePomWithDependencyPropertyCoordinate()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-property-dependency-coordinate" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-property-dependency-coordinate" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
@@ -387,7 +387,7 @@ public class RewritePomsForDevelopmentPh
public void testRewritePomDependenciesWithoutDependenciesVersionUpdate()
throws Exception
{
- List reactorProjects =
+ List<MavenProject> reactorProjects =
createReactorProjects( "internal-snapshot-dependencies-without-dependencies-version-update" );
ReleaseDescriptor config = createDefaultConfiguration( reactorProjects );
config.setUpdateDependencies( false );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java Tue Feb 1 11:55:50 2011
@@ -49,7 +49,7 @@ public class RewritePomsForReleasePhaseT
phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "rewrite-poms-for-release" );
}
- protected List createReactorProjects( String path, boolean copyFiles )
+ protected List<MavenProject> createReactorProjects( String path, boolean copyFiles )
throws Exception
{
return createReactorProjects( "rewrite-for-release/", path );
@@ -64,7 +64,7 @@ public class RewritePomsForReleasePhaseT
public void testSimulateRewrite()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -83,7 +83,7 @@ public class RewritePomsForReleasePhaseT
public void testRewriteWithDashedComments()
throws Exception
{
- List reactorProjects = createReactorProjects("basic-pom-with-dashes-in-comment");
+ List<MavenProject> reactorProjects = createReactorProjects("basic-pom-with-dashes-in-comment");
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -102,7 +102,7 @@ public class RewritePomsForReleasePhaseT
public void testClean()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -122,7 +122,7 @@ public class RewritePomsForReleasePhaseT
public void testCleanNotExists()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -139,7 +139,7 @@ public class RewritePomsForReleasePhaseT
public void testScmOverridden()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-overridden-scm" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-overridden-scm" );
ReleaseDescriptor config = createConfigurationForWithParentNextVersion( reactorProjects );
config.mapReleaseVersion( "groupId:subsubproject", NEXT_VERSION );
@@ -158,7 +158,7 @@ public class RewritePomsForReleasePhaseT
config.mapReleaseVersion( projectId, NEXT_VERSION );
}
- protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List reactorProjects )
+ protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List<MavenProject> reactorProjects )
throws Exception
{
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
@@ -168,7 +168,7 @@ public class RewritePomsForReleasePhaseT
return config;
}
- protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List reactorProjects )
+ protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List<MavenProject> reactorProjects )
throws Exception
{
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
@@ -187,7 +187,7 @@ public class RewritePomsForReleasePhaseT
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-with-cvs" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-cvs" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
@@ -200,7 +200,7 @@ public class RewritePomsForReleasePhaseT
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-with-scm-expression" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-scm-expression" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
@@ -213,7 +213,7 @@ public class RewritePomsForReleasePhaseT
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-with-tag-base" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-tag-base" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.setScmTagBase( "file://localhost/tmp/scm-repo/releases" );
mapNextVersion( config, "groupId:artifactId" );
@@ -226,7 +226,7 @@ public class RewritePomsForReleasePhaseT
public void testRewriteBasicPomWithTagBaseAndVaryingScmUrls()
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-with-tag-base-and-varying-scm-urls" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-tag-base-and-varying-scm-urls" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.setScmTagBase( "file://localhost/tmp/scm-repo/allprojects/releases" );
mapNextVersion( config, "groupId:artifactId" );
@@ -239,7 +239,7 @@ public class RewritePomsForReleasePhaseT
public void testRewriteBasicPomWithCvsFromTag()
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-with-cvs-from-tag" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-cvs-from-tag" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
@@ -251,7 +251,7 @@ public class RewritePomsForReleasePhaseT
public void testRewriteBasicPomWithEmptyScm()
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-with-empty-scm" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-empty-scm" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
@@ -263,7 +263,7 @@ public class RewritePomsForReleasePhaseT
public void testRewriteInterpolatedVersions()
throws Exception
{
- List reactorProjects = createReactorProjects( "interpolated-versions" );
+ List<MavenProject> reactorProjects = createReactorProjects( "interpolated-versions" );
ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -275,7 +275,7 @@ public class RewritePomsForReleasePhaseT
throws Exception
{
- List reactorProjects = createReactorProjects( "interpolated-versions" );
+ List<MavenProject> reactorProjects = createReactorProjects( "interpolated-versions" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -285,9 +285,9 @@ public class RewritePomsForReleasePhaseT
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
- for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
{
- MavenProject project = (MavenProject) i.next();
+ MavenProject project = i.next();
// skip subproject1 - we don't need to worry about its version mapping change, it has no deps of any kind
if ( !"groupId".equals( project.getGroupId() ) || !"subproject1".equals( project.getArtifactId() ) )
@@ -300,7 +300,7 @@ public class RewritePomsForReleasePhaseT
public void testRewriteBasicPomWithInheritedScm()
throws Exception
{
- List reactorProjects = createReactorProjects( "basic-pom-inherited-scm" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-inherited-scm" );
ReleaseDescriptor config = createConfigurationForWithParentNextVersion( reactorProjects );
config.mapReleaseVersion( "groupId:subsubproject", NEXT_VERSION );
@@ -312,7 +312,7 @@ public class RewritePomsForReleasePhaseT
public void testRewritePomWithParentAndProperties()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-parent-and-properties" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-parent-and-properties" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -328,7 +328,7 @@ public class RewritePomsForReleasePhaseT
public void testRewritePomWithDependencyPropertyCoordinate()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-property-dependency-coordinate" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-property-dependency-coordinate" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -344,7 +344,7 @@ public class RewritePomsForReleasePhaseT
public void testRewritePomWithScmOfParentEndingWithASlash()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-scm-of-parent-ending-with-a-slash" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-scm-of-parent-ending-with-a-slash" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -358,7 +358,7 @@ public class RewritePomsForReleasePhaseT
public void testRewritePomWithDeepSubprojects()
throws Exception
{
- List reactorProjects = createReactorProjects( "multimodule-with-deep-subprojects" );
+ List<MavenProject> reactorProjects = createReactorProjects( "multimodule-with-deep-subprojects" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -373,7 +373,7 @@ public class RewritePomsForReleasePhaseT
public void testRewritePomForFlatMultiModule()
throws Exception
{
- List reactorProjects = createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "/root-project" );
+ List<MavenProject> reactorProjects = createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "/root-project" );
ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -385,7 +385,7 @@ public class RewritePomsForReleasePhaseT
public void testRewritePomWithCDATASectionOnWindows()
throws Exception
{
- List reactorProjects = createReactorProjects( "cdata-section" );
+ List<MavenProject> reactorProjects = createReactorProjects( "cdata-section" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
@@ -397,7 +397,7 @@ public class RewritePomsForReleasePhaseT
assertTrue( comparePomFiles( reactorProjects, false ) );
}
- protected ReleaseDescriptor createDescriptorFromProjects( List reactorProjects )
+ protected ReleaseDescriptor createDescriptorFromProjects( List<MavenProject> reactorProjects )
{
ReleaseDescriptor descriptor = super.createDescriptorFromProjects( reactorProjects );
descriptor.setScmReleaseLabel( "release-label" );
@@ -407,7 +407,7 @@ public class RewritePomsForReleasePhaseT
public void testRewritePomWithExternallyReleasedParent()
throws Exception
{
- List reactorProjects = createReactorProjects( "pom-with-externally-released-parent" );
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-externally-released-parent" );
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapResolvedSnapshotDependencies( "external:parent-artifactId", "1" , "2-SNAPSHOT" );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.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.settings.Settings;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
@@ -60,7 +61,7 @@ public class RunPerformGoalsPhaseTest
try
{
- phase.execute( config, (Settings) null, (List) null );
+ phase.execute( config, (Settings) null, (List<MavenProject>) null );
fail( "Should have thrown an exception" );
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.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;
@@ -74,7 +75,7 @@ public class RunPrepareGoalsPhaseTest
phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
- phase.execute( config, (Settings) null, (List) null );
+ phase.execute( config, (Settings) null, (List<MavenProject>) null );
// just needs to survive the mock
assertTrue( true );
@@ -121,7 +122,7 @@ public class RunPrepareGoalsPhaseTest
try
{
- phase.execute( config, (Settings) null, (List) null );
+ phase.execute( config, (Settings) null, (List<MavenProject>) null );
fail( "Should have thrown an exception" );
}
@@ -173,7 +174,7 @@ public class RunPrepareGoalsPhaseTest
phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
- phase.execute( config, (Settings) null, (List) null );
+ phase.execute( config, (Settings) null, (List<MavenProject>) null );
// just needs to survive the mock
assertTrue( true );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java Tue Feb 1 11:55:50 2011
@@ -221,7 +221,7 @@ public class ScmCheckModificationsPhaseT
{
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- setChangedFiles( releaseDescriptor, Collections.EMPTY_LIST );
+ setChangedFiles( releaseDescriptor, Collections.<String>emptyList() );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null );
@@ -338,7 +338,7 @@ public class ScmCheckModificationsPhaseT
}
}
- private void setChangedFiles( ReleaseDescriptor releaseDescriptor, List changedFiles )
+ private void setChangedFiles( ReleaseDescriptor releaseDescriptor, List<String> changedFiles )
throws Exception
{
ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
@@ -348,12 +348,12 @@ public class ScmCheckModificationsPhaseT
providerStub.setStatusScmResult( new StatusScmResult( "", createScmFiles( changedFiles ) ) );
}
- private static List createScmFiles( List changedFiles )
+ private static List<ScmFile> createScmFiles( List<String> changedFiles )
{
- List files = new ArrayList( changedFiles.size() );
- for ( Iterator i = changedFiles.iterator(); i.hasNext(); )
+ List<ScmFile> files = new ArrayList<ScmFile>( changedFiles.size() );
+ for ( Iterator<String> i = changedFiles.iterator(); i.hasNext(); )
{
- String fileName = (String) i.next();
+ String fileName = i.next();
files.add( new ScmFile( fileName, ScmFileStatus.MODIFIED ) );
}
return files;
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java?rev=1066014&r1=1066013&r2=1066014&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java Tue Feb 1 11:55:50 2011
@@ -55,7 +55,7 @@ public class ScmCommitDevelopmentPhaseTe
private static final String ROLLBACK_PREFIX =
"[maven-release-manager] rollback changes from release preparation of ";
- private List reactorProjects;
+ private List<MavenProject> reactorProjects;
private MavenProject rootProject;
@@ -83,7 +83,7 @@ public class ScmCommitDevelopmentPhaseTe
throws Exception
{
ReleaseDescriptor descriptor = createReleaseDescriptor( rootProject );
- List reactorProjects = createReactorProjects();
+ List<MavenProject> reactorProjects = createReactorProjects();
descriptor.setRemoteTagging( false );
descriptor.setSuppressCommitBeforeTagOrBranch( true );
@@ -150,7 +150,7 @@ public class ScmCommitDevelopmentPhaseTe
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
}
- private List createReactorProjects()
+ private List<MavenProject> createReactorProjects()
throws Exception
{
return createReactorProjects( "scm-commit/", "single-pom" );