You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/09/13 21:17:33 UTC
svn commit: r1384477 - in /maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/phase/
test/java/org/apache/maven/shared/release/exec/
test/java/org/apache/maven/shared/release/phase/
Author: rfscholte
Date: Thu Sep 13 19:17:32 2012
New Revision: 1384477
URL: http://svn.apache.org/viewvc?rev=1384477&view=rev
Log:
Use Arrays.asList with varargs
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?rev=1384477&r1=1384476&r2=1384477&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java Thu Sep 13 19:17:32 2012
@@ -79,6 +79,12 @@ public class CheckDependencySnapshotsPha
* @plexus.requirement
*/
private ArtifactFactory artifactFactory;
+
+ private Set<Artifact> snapshotDependencies = new HashSet<Artifact>();
+ private Set<Artifact> snapshotReportDependencies = new HashSet<Artifact>();
+ private Set<Artifact> snapshotExtensionsDependencies = new HashSet<Artifact>();
+ private Set<Artifact> snapshotPluginDependencies = new HashSet<Artifact>();
+
public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
@@ -111,11 +117,6 @@ public class CheckDependencySnapshotsPha
@SuppressWarnings( "unchecked" )
Map<String, Artifact> artifactMap = ArtifactUtils.artifactMapByVersionlessId( project.getArtifacts() );
- Set<Artifact> snapshotDependencies = new HashSet<Artifact>();
- Set<Artifact> snapshotReportDependencies = new HashSet<Artifact>();
- Set<Artifact> snapshotExtensionsDependencies = new HashSet<Artifact>();
- Set<Artifact> snapshotPluginDependencies = new HashSet<Artifact>();
-
if ( project.getParentArtifact() != null )
{
if ( checkArtifact( project.getParentArtifact(), originalVersions, artifactMap, releaseDescriptor ) )
@@ -170,7 +171,7 @@ public class CheckDependencySnapshotsPha
prompter.showMessage( "This project relies on a SNAPSHOT of the release plugin. "
+ "This may be necessary during testing.\n" );
result = prompter.prompt( "Do you want to continue with the release?",
- Arrays.asList( new String[]{ "yes", "no" } ), "no" );
+ Arrays.asList( "yes", "no" ), "no" );
}
else
{
@@ -334,14 +335,14 @@ public class CheckDependencySnapshotsPha
{
prompter.showMessage( RESOLVE_SNAPSHOT_MESSAGE );
String result =
- prompter.prompt( RESOLVE_SNAPSHOT_PROMPT, Arrays.asList( new String[]{"yes", "no"} ), "no" );
+ prompter.prompt( RESOLVE_SNAPSHOT_PROMPT, Arrays.asList( "yes", "no" ), "no" );
if ( result.toLowerCase( Locale.ENGLISH ).startsWith( "y" ) )
{
Map<String, Map<String, String>> resolvedSnapshots = null;
prompter.showMessage( RESOLVE_SNAPSHOT_TYPE_MESSAGE );
result = prompter.prompt( RESOLVE_SNAPSHOT_TYPE_PROMPT,
- Arrays.asList( new String[]{"0", "1", "2", "3"} ), "1" );
+ Arrays.asList( "0", "1", "2", "3" ), "1" );
switch ( Integer.parseInt( result.toLowerCase( Locale.ENGLISH ) ) )
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java?rev=1384477&r1=1384476&r2=1384477&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java Thu Sep 13 19:17:32 2012
@@ -76,10 +76,10 @@ public class ScmCheckModificationsPhase
*
* @todo proper construction of filenames, especially release properties
*/
- private Set<String> exclusionPatterns = new HashSet<String>( Arrays.asList( new String[] {
+ private Set<String> exclusionPatterns = new HashSet<String>( Arrays.asList(
"**" + File.separator + "pom.xml.backup", "**" + File.separator + "pom.xml.tag",
"**" + File.separator + "pom.xml.next", "**" + File.separator + "pom.xml.branch",
- "**" + File.separator + "release.properties", "**" + File.separator + "pom.xml.releaseBackup" } ) );
+ "**" + File.separator + "release.properties", "**" + File.separator + "pom.xml.releaseBackup" ) );
public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
List<MavenProject> reactorProjects )
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java?rev=1384477&r1=1384476&r2=1384477&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java Thu Sep 13 19:17:32 2012
@@ -53,42 +53,42 @@ public class AbstractMavenExecutorTest
executor.executeGoals( null, " clean verify ", true, null, null );
verify( executor ).executeGoals( isNull( File.class ),
- eq( Arrays.asList( new String[] { "clean", "verify" } ) ),
+ eq( Arrays.asList( "clean", "verify" ) ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
isNull( String.class ), isNull( ReleaseResult.class ) );
reset( executor );
executor.executeGoals( null, ",clean,verify,", true, null, null );
verify( executor ).executeGoals( isNull( File.class ),
- eq( Arrays.asList( new String[] { "clean", "verify" } ) ),
+ eq( Arrays.asList( "clean", "verify" ) ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
isNull( String.class ), isNull( ReleaseResult.class ) );
reset( executor );
executor.executeGoals( null, "\nclean\nverify\n", true, null, null );
verify( executor ).executeGoals( isNull( File.class ),
- eq( Arrays.asList( new String[] { "clean", "verify" } ) ),
+ eq( Arrays.asList( "clean", "verify" ) ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
isNull( String.class ), isNull( ReleaseResult.class ) );
reset( executor );
executor.executeGoals( null, "\rclean\rverify\r", true, null, null );
verify( executor ).executeGoals( isNull( File.class ),
- eq( Arrays.asList( new String[] { "clean", "verify" } ) ),
+ eq( Arrays.asList( "clean", "verify" ) ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
isNull( String.class ), isNull( ReleaseResult.class ) );
reset( executor );
executor.executeGoals( null, "\r\nclean\r\nverify\r\n", true, null, null );
verify( executor ).executeGoals( isNull( File.class ),
- eq( Arrays.asList( new String[] { "clean", "verify" } ) ),
+ eq( Arrays.asList( "clean", "verify" ) ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
isNull( String.class ), isNull( ReleaseResult.class ) );
reset( executor );
executor.executeGoals( null, "\tclean\tverify\t", true, null, null );
verify( executor ).executeGoals( isNull( File.class ),
- eq( Arrays.asList( new String[] { "clean", "verify" } ) ),
+ eq( Arrays.asList( "clean", "verify" ) ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
isNull( String.class ), isNull( ReleaseResult.class ) );
reset( executor );
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=1384477&r1=1384476&r2=1384477&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 Thu Sep 13 19:17:32 2012
@@ -256,8 +256,8 @@ public class ScmCheckModificationsPhaseT
{
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- setChangedFiles( releaseDescriptor, Arrays.asList( new String[] { "release.properties", "pom.xml.backup",
- "pom.xml.tag", "pom.xml.next" } ) );
+ setChangedFiles( releaseDescriptor, Arrays.asList( "release.properties", "pom.xml.backup",
+ "pom.xml.tag", "pom.xml.next" ) );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null );
@@ -275,8 +275,8 @@ public class ScmCheckModificationsPhaseT
releaseDescriptor.setCheckModificationExcludes( Collections.singletonList( "**/keep.me" ) );
- setChangedFiles( releaseDescriptor, Arrays.asList( new String[] { "release.properties", "pom.xml.backup",
- "pom.xml.tag", "pom.xml.next", "keep.me", "src/app/keep.me", "config\\keep.me" } ) );
+ setChangedFiles( releaseDescriptor, Arrays.asList( "release.properties", "pom.xml.backup",
+ "pom.xml.tag", "pom.xml.next", "keep.me", "src/app/keep.me", "config\\keep.me" ) );
assertEquals( ReleaseResult.SUCCESS, phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
@@ -288,7 +288,7 @@ public class ScmCheckModificationsPhaseT
{
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- setChangedFiles( releaseDescriptor, Arrays.asList( new String[] { "pom.xml", "module/pom.xml" } ) );
+ setChangedFiles( releaseDescriptor, Arrays.asList( "pom.xml", "module/pom.xml" ) );
try
{
@@ -348,8 +348,8 @@ public class ScmCheckModificationsPhaseT
{
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- setChangedFiles( releaseDescriptor, Arrays.asList( new String[] { "release.properties", "pom.xml.backup",
- "pom.xml.tag", "pom.xml.release", "something.txt" } ) );
+ setChangedFiles( releaseDescriptor, Arrays.asList( "release.properties", "pom.xml.backup",
+ "pom.xml.tag", "pom.xml.release", "something.txt" ) );
try
{
@@ -394,7 +394,7 @@ public class ScmCheckModificationsPhaseT
releaseDescriptor.setCheckModificationExcludes( Collections.singletonList( "release.properties" ) );
- setChangedFiles( releaseDescriptor, Arrays.asList( new String[] { "release.properties" } ) );
+ setChangedFiles( releaseDescriptor, Arrays.asList( "release.properties" ) );
assertEquals( ReleaseResult.SUCCESS, phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );