Merge lp:~justin-halfempty/gradle-release/bug1018437 into lp:gradle-release

[Justin Ryan]

Fix for #1018437

=== modified file 'src/main/groovy/release/BaseScmPlugin.groovy'
--- src/main/groovy/release/BaseScmPlugin.groovy	2012-02-22 07:31:07 +0000
+++ src/main/groovy/release/BaseScmPlugin.groovy	2012-09-04 23:54:20 +0000
@@ -21,7 +21,9 @@
 		project.task('checkUpdateNeeded', group: ReleasePlugin.RELEASE_GROUP,
 				description: 'Checks to see if there are any incoming or outgoing changes that haven\'t been applied locally.') << this.&checkUpdateNeeded
 
-	}
+        setConvention()
+
+    }
 
 	/**
 	 * Called by {@link ReleasePlugin} when plugin's convention needs to be set.

=== modified file 'src/main/groovy/release/ReleasePlugin.groovy'
--- src/main/groovy/release/ReleasePlugin.groovy	2012-06-27 18:33:42 +0000
+++ src/main/groovy/release/ReleasePlugin.groovy	2012-09-04 23:54:20 +0000
@@ -98,7 +98,6 @@
 	void initScmPlugin() {
 
 		checkPropertiesFile()
-		scmPlugin.setConvention()
 		scmPlugin.init()
 	}