From 14ca7847d0101cde44872b732ccdfacce54f90d1 Mon Sep 17 00:00:00 2001
From: Clinton Alexander <clinton.alexander@r3cev.com>
Date: Wed, 16 Nov 2016 18:09:23 +0000
Subject: [PATCH] Publishing to jcenter possible via bintrayUpload (with the
 correct credentials) and corda now has a dependency on the published gradle
 plugin to allow the split.

---
 build.gradle                                  |  1 +
 core/build.gradle                             |  3 +--
 finance/build.gradle                          |  2 +-
 gradle-plugins/publish-utils/build.gradle     | 23 +++++++++++++++++++
 ...ublishTasks.groovy => PublishTasks.groovy} |  2 +-
 ...net.corda.plugins.publish-utils.properties |  2 +-
 6 files changed, 28 insertions(+), 5 deletions(-)
 rename gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/{DefaultPublishTasks.groovy => PublishTasks.groovy} (92%)

diff --git a/build.gradle b/build.gradle
index a050de599b..2e1fe7b57c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,6 +21,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
+        classpath 'net.corda.plugins:publish-utils:0.5'
 
         // Can run 'gradle dependencyUpdates' to find new versions of things.
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
diff --git a/core/build.gradle b/core/build.gradle
index 7d89235caf..2b8644d274 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'kotlin'
 apply plugin: QuasarPlugin
-// Applying the maven plugin means this will get installed locally when running "gradle install"
-apply plugin: DefaultPublishTasks
+apply plugin: 'net.corda.plugins.publish-utils'
 
 buildscript {
     repositories {
diff --git a/finance/build.gradle b/finance/build.gradle
index 9595da47b4..1f45735d19 100644
--- a/finance/build.gradle
+++ b/finance/build.gradle
@@ -40,4 +40,4 @@ publishing {
             artifact javadocJar
         }
     }
-}
\ No newline at end of file
+}
diff --git a/gradle-plugins/publish-utils/build.gradle b/gradle-plugins/publish-utils/build.gradle
index 319f195215..0dfdedc1e7 100644
--- a/gradle-plugins/publish-utils/build.gradle
+++ b/gradle-plugins/publish-utils/build.gradle
@@ -26,6 +26,7 @@ bintray {
     user = System.getenv('CORDA_BINTRAY_USER')
     key = System.getenv('CORDA_BINTRAY_KEY')
     publications = ['publishUtils']
+    dryRun = false
     pkg {
         repo = 'corda'
         name = 'publish-utils'
@@ -34,6 +35,8 @@ bintray {
     }
 }
 
+task(install, dependsOn: 'publishToMavenLocal')
+
 publishing {
     publications {
         publishUtils(MavenPublication) {
@@ -43,6 +46,26 @@ publishing {
 
             artifact sourceJar
             artifact javadocJar
+
+            pom.withXml {
+                asNode().children().last() + {
+                    resolveStrategy = Closure.DELEGATE_FIRST
+                    name 'publish-utils'
+                    description 'A small gradle plugin that adds a couple of convenience functions for publishing to Maven'
+                    url 'https://github.com/corda/corda'
+                    scm {
+                        url 'https://github.com/corda/corda'
+                    }
+
+                    licenses {
+                        license {
+                            name 'Apache-2.0'
+                            url 'https://www.apache.org/licenses/LICENSE-2.0'
+                            distribution 'repo'
+                        }
+                    }
+                }
+            }
         }
     }
 }
diff --git a/gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/DefaultPublishTasks.groovy b/gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/PublishTasks.groovy
similarity index 92%
rename from gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/DefaultPublishTasks.groovy
rename to gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/PublishTasks.groovy
index 0d0f39714d..c2d38e1f81 100644
--- a/gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/DefaultPublishTasks.groovy
+++ b/gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/PublishTasks.groovy
@@ -8,7 +8,7 @@ import org.gradle.api.Project
 /**
  * A utility plugin that when applied will automatically create source and javadoc publishing tasks
  */
-class DefaultPublishTasks implements Plugin<Project> {
+class PublishTasks implements Plugin<Project> {
     void apply(Project project) {
         project.task("sourceJar", type: Jar, dependsOn: project.classes) {
             classifier = 'sources'
diff --git a/gradle-plugins/publish-utils/src/main/resources/META-INF/gradle-plugins/net.corda.plugins.publish-utils.properties b/gradle-plugins/publish-utils/src/main/resources/META-INF/gradle-plugins/net.corda.plugins.publish-utils.properties
index fff93a0ec4..b680f7d301 100644
--- a/gradle-plugins/publish-utils/src/main/resources/META-INF/gradle-plugins/net.corda.plugins.publish-utils.properties
+++ b/gradle-plugins/publish-utils/src/main/resources/META-INF/gradle-plugins/net.corda.plugins.publish-utils.properties
@@ -1 +1 @@
-implementation-class=net.corda.plugins.DefaultPublishTasks
+implementation-class=net.corda.plugins.PublishTasks