You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/05/09 03:22:50 UTC
svn commit: r405262 - in /maven/plugins/trunk/maven-release-plugin/src:
main/java/org/apache/maven/plugins/release/DefaultReleaseManager.java
test/java/org/apache/maven/plugins/release/DefaultReleaseManagerTest.java
Author: brett
Date: Mon May 8 18:22:46 2006
New Revision: 405262
URL: http://svn.apache.org/viewcvs?rev=405262&view=rev
Log:
fix NPE if there is no url parameter
Modified:
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/DefaultReleaseManager.java
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/DefaultReleaseManagerTest.java
Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/DefaultReleaseManager.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/DefaultReleaseManager.java?rev=405262&r1=405261&r2=405262&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/DefaultReleaseManager.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/DefaultReleaseManager.java Mon May 8 18:22:46 2006
@@ -175,6 +175,11 @@
"Cannot perform release - the preparation step was stopped mid-way. Please re-run release:prepare to continue, or perform the release from an SCM tag." );
}
+ if ( releaseConfiguration.getUrl() == null )
+ {
+ throw new ReleaseFailureException( "No SCM URL was provided to perform the release from" );
+ }
+
ScmRepository repository;
ScmProvider provider;
try
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/DefaultReleaseManagerTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/DefaultReleaseManagerTest.java?rev=405262&r1=405261&r2=405262&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/DefaultReleaseManagerTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/DefaultReleaseManagerTest.java Mon May 8 18:22:46 2006
@@ -584,6 +584,26 @@
}
}
+ public void testNoScmUrlPerform()
+ throws Exception
+ {
+ ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
+ releaseConfiguration.setWorkingDirectory( getTestFile( "target/test/checkout" ) );
+
+ DefaultReleaseManager releaseManager = (DefaultReleaseManager) lookup( ReleaseManager.ROLE, "test" );
+
+ try
+ {
+ releaseManager.perform( releaseConfiguration, null, null, false );
+
+ fail( "perform should have failed" );
+ }
+ catch ( ReleaseFailureException e )
+ {
+ assertNull( "check no cause", e.getCause() );
+ }
+ }
+
public void testNoSuchScmProviderExceptionThrown()
throws Exception
{