Changes needed for release plugin

.gitignore

@@ -44,8 +44,8 @@ Thumbs.db
 */target
 /build
 */build
-#
-# # IntelliJ specific files/directories
+
+# IntelliJ specific files/directories
 out
 .idea
 *.ipr

gradle/convention.gradle

@@ -10,7 +10,7 @@ subprojects { project ->
     sourceCompatibility = 1.6
 
     // GRADLE-2087 workaround, perform after java plugin
-    status = version.contains('-SNAPSHOT')?'snapshot':'release'
+    status = rootProject.status
 
     task sourcesJar(type: Jar, dependsOn:classes) {
         classifier = 'sources'
@@ -22,6 +22,10 @@ subprojects { project ->
         from javadoc.destinationDir
     }
 
+    // Ensure output is on a new line
+    javadoc.doFirst { println "" }
+
+
     artifacts {
         archives sourcesJar
         archives javadocJar

gradle/maven.gradle

@@ -29,11 +29,6 @@ subprojects {
 
                 // Closure to configure all the POM with extra info, common to all projects
                 pom.project {
-                    parent {
-                        groupId 'org.sonatype.oss'
-                        artifactId 'oss-parent'
-                        version '7'
-                    }
                     licenses {
                         license {
                             name 'The Apache Software License, Version 2.0'

gradle/release.gradle

@@ -1,4 +1,3 @@
-
 apply plugin: 'release'
 
 // Ignore release plugin's task because it calls out via GradleBuild. This is a good place to put an email to send out
@@ -25,6 +24,8 @@ task uploadArtifactory(type: GradleBuild) {
     startParameter.getExcludedTaskNames().add('check')
     tasks = [ 'build', 'artifactoryPublish' ]
 }
+task releaseArtifactory(dependsOn: [checkSnapshotDependencies, uploadArtifactory])
+
 
 task buildWithArtifactory(type: GradleBuild) {
     startParameter = project.gradle.startParameter.newInstance()
@@ -34,11 +35,11 @@ task buildWithArtifactory(type: GradleBuild) {
 }
 
 // Ensure upload happens before taggging but after all pre-checks
-uploadArtifactory.dependsOn checkSnapshotDependencies
-createReleaseTag.dependsOn uploadArtifactory
+releaseArtifactory.dependsOn checkSnapshotDependencies
+createReleaseTag.dependsOn releaseArtifactory
 gradle.taskGraph.whenReady { taskGraph ->
-    if ( taskGraph.hasTask(uploadArtifactory) && !taskGraph.hasTask(':release') ) {
-        throw new GradleException('"release" task has to be run before uploading to Artifactory')
+    if ( taskGraph.hasTask(uploadArtifactory) && rootProject.status == 'release' && !taskGraph.hasTask(':release') ) {
+        throw new GradleException('"release" task has to be run before uploading a release to Artifactory')
     }
 }
 subprojects.each { project ->
@@ -61,5 +62,6 @@ release {
     failOnPublishNeeded=true
     failOnUnversionedFiles=true
     failOnUpdateNeeded=true
+    includeProjectNameInTag=true
     requireBranch = null
 }