Verify before we can't take it back, use preferredVersion variable

Author: Justin Ryan

gradle/buildscript.gradle

@@ -6,6 +6,6 @@ repositories {
 dependencies {
     classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.6.1'
     classpath 'com.mapvine:gradle-cobertura-plugin:0.1'
-    classpath 'gradle-release:gradle-release:1.1.4'
+    classpath 'gradle-release:gradle-release:1.1.5'
     classpath 'org.ajoberstar:gradle-git:0.5.0'
 }

gradle/convention.gradle

@@ -1,4 +1,5 @@
-status = version.contains('SNAPSHOT')?'snapshot':status
+// GRADLE-2087 workaround, perform after java plugin
+status = project.hasProperty('preferredStatus')?project.preferredStatus:(version.contains('SNAPSHOT')?'snapshot':'release')
 
 subprojects { project ->
     apply plugin: 'java' // Plugin as major conventions

gradle/release.gradle

@@ -19,7 +19,11 @@ task forceCandidate {
     onlyIf { gradle.taskGraph.hasTask(releaseCandidate) }
     doFirst { project.status = 'candidate' }
 }
-release.dependsOn(forceCandidate)
+task forceRelease {
+    onlyIf { !gradle.taskGraph.hasTask(releaseCandidate) }
+    doFirst { project.status = 'release' }
+}
+release.dependsOn([forceCandidate, forceRelease])
 
 task uploadMavenCentral(dependsOn: subprojects.tasks.uploadMavenCentral)
 task releaseSnapshot(dependsOn: [uploadArtifactory, uploadMavenCentral])
@@ -34,8 +38,9 @@ task verifyStatus << {
 uploadArtifactory.dependsOn(verifyStatus)
 uploadMavenCentral.dependsOn(verifyStatus)
 
-// Ensure upload happens before taggging but after all pre-checks
-createReleaseTag.dependsOn([uploadArtifactory, uploadMavenCentral])
+// Ensure upload happens before taggging, hence upload failures will leave repo in a revertable state
+preTagCommit.dependsOn([uploadArtifactory, uploadMavenCentral])
+
 
 gradle.taskGraph.whenReady { taskGraph ->
     def hasRelease = taskGraph.hasTask('commitNewVersion')