From a90de1fa497b67c3517f113b75ee01ec8c17c08f Mon Sep 17 00:00:00 2001
From: Clinton Alexander <clinton.alexander@r3cev.com>
Date: Fri, 18 Nov 2016 13:12:27 +0000
Subject: [PATCH] Cordformation now publishes to bintray.

---
 gradle-plugins/build.gradle               |  3 +-
 gradle-plugins/cordformation/build.gradle | 35 +++++++++++++++++++++++
 gradle-plugins/gradle.properties          |  1 -
 gradle-plugins/publish-utils/build.gradle |  1 -
 4 files changed, 37 insertions(+), 3 deletions(-)
 delete mode 100644 gradle-plugins/gradle.properties

diff --git a/gradle-plugins/build.gradle b/gradle-plugins/build.gradle
index 4ccb6e61b4..c123d21948 100644
--- a/gradle-plugins/build.gradle
+++ b/gradle-plugins/build.gradle
@@ -12,6 +12,7 @@ buildscript {
 
     dependencies {
         classpath "net.corda.plugins:publish-utils:$corda_published_version"
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
     }
 }
 
@@ -19,7 +20,7 @@ apply plugin: 'maven-publish'
 
 allprojects {
     group 'net.corda'
-    version "$corda_version"
+    version "$corda_published_version"
 }
 
 // Aliasing the publishToMavenLocal for simplicity.
diff --git a/gradle-plugins/cordformation/build.gradle b/gradle-plugins/cordformation/build.gradle
index 68936f8658..8197d33af4 100644
--- a/gradle-plugins/cordformation/build.gradle
+++ b/gradle-plugins/cordformation/build.gradle
@@ -1,5 +1,7 @@
 apply plugin: 'groovy'
 apply plugin: 'net.corda.plugins.publish-utils'
+apply plugin: 'maven-publish'
+apply plugin: 'com.jfrog.bintray'
 
 dependencies {
     compile gradleApi()
@@ -12,6 +14,19 @@ repositories {
     mavenCentral()
 }
 
+bintray {
+    user = System.getenv('CORDA_BINTRAY_USER')
+    key = System.getenv('CORDA_BINTRAY_KEY')
+    publications = ['cordformation']
+    dryRun = false
+    pkg {
+        repo = 'corda'
+        name = 'cordformation'
+        userOrg = 'r3'
+        licenses = ['Apache-2.0']
+    }
+}
+
 publishing {
     publications {
         cordformation(MavenPublication) {
@@ -21,6 +36,26 @@ publishing {
 
             artifact sourceJar
             artifact javadocJar
+
+            pom.withXml {
+                asNode().children().last() + {
+                    resolveStrategy = Closure.DELEGATE_FIRST
+                    name 'cordformation'
+                    description 'A small gradle plugin for adding some basic Quasar tasks and configurations to reduce build.gradle bloat.'
+                    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/gradle.properties b/gradle-plugins/gradle.properties
deleted file mode 100644
index 37f09592fb..0000000000
--- a/gradle-plugins/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-version 0.6
diff --git a/gradle-plugins/publish-utils/build.gradle b/gradle-plugins/publish-utils/build.gradle
index 0dfdedc1e7..9392af6ce4 100644
--- a/gradle-plugins/publish-utils/build.gradle
+++ b/gradle-plugins/publish-utils/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'groovy'
-apply plugin: 'net.corda.plugins.publish-utils' // TODO: Remove when bintray publishing code is in master
 apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'