From 47338b3598f99d02e7efd3ab84b4ce6c5b418540 Mon Sep 17 00:00:00 2001
From: Joris Borgdorff <joris@thehyve.nl>
Date: Thu, 6 Apr 2017 09:13:17 +0200
Subject: [PATCH] Fixed deployments to GitHub and Bintray

---
 .gitignore                                        |  1 +
 .travis.yml                                       |  5 ++---
 java-sdk/build.gradle                             | 12 ++++++------
 java-sdk/radar-schemas-commons/build.gradle       | 10 +++++-----
 java-sdk/radar-schemas-questionnaire/build.gradle | 10 +++++-----
 java-sdk/radar-schemas-restapi/build.gradle       | 10 +++++-----
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7a158a04..ca117126 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ build/
 .gradle/
 *.java
 .gradletasknamecache
+gradle.properties
diff --git a/.travis.yml b/.travis.yml
index d6956fce..4c12c17e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,9 @@ env:
 
 deploy:
   provider: releases
-  api_key:
-    secure: ${GH_TOKEN}
+  api_key: ${GH_TOKEN}
   file_glob: true
-  file: 'java-sdk/*/build/libs/*.jar'
+  file: "${TRAVIS_BUILD_DIR}/java-sdk/build/libs/*.jar"
   skip_cleanup: true
   on:
     tags: true
diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle
index e17f3c60..908b7536 100644
--- a/java-sdk/build.gradle
+++ b/java-sdk/build.gradle
@@ -17,15 +17,15 @@ subprojects {
     // Configuration
     version = '0.1'
     group = 'org.radarcns'
-    ext.githubRepo = 'RADAR-CNS/RADAR-Schemas'
+    ext.githubRepoName = 'RADAR-CNS/RADAR-Schemas'
 
     targetCompatibility = '1.7'
     sourceCompatibility = '1.7'
 
     ext.avroVersion = '1.8.1'
 
-    ext.vcsUrl = 'https://github.com/' + githubRepo + '.git'
-    ext.issueUrl = 'https://github.com/' + githubRepo + '/issues'
+    ext.githubUrl = 'https://github.com/' + githubRepoName + '.git'
+    ext.issueUrl = 'https://github.com/' + githubRepoName + '/issues'
     ext.website = 'http://radar-cns.org'
 
     // dependencies
@@ -75,8 +75,8 @@ subprojects {
             url website
         }
         scm {
-            connection 'scm:git:' + vcsUrl
-            url vcsUrl
+            connection 'scm:git:' + githubUrl
+            url githubUrl
         }
     }
     ext.sharedManifest = manifest {
@@ -90,7 +90,7 @@ subprojects {
     // custom tasks for creating source/javadoc jars
     task sourcesJar(type: Jar, dependsOn: classes) {
         classifier = 'sources'
-        from sourceSets.main.output
+        from sourceSets.main.allSource
         manifest.from sharedManifest
     }
 
diff --git a/java-sdk/radar-schemas-commons/build.gradle b/java-sdk/radar-schemas-commons/build.gradle
index dea5b9a8..33769a25 100644
--- a/java-sdk/radar-schemas-commons/build.gradle
+++ b/java-sdk/radar-schemas-commons/build.gradle
@@ -30,7 +30,7 @@ publishing {
                 def root = asNode()
                 root.appendNode('description', description)
                 root.appendNode('name', artifactName)
-                root.appendNode('url', vcsUrl)
+                root.appendNode('url', githubUrl)
                 root.children().last() + pomConfig
             }
         }
@@ -44,13 +44,13 @@ bintray {
     publications = ['RadarCommonsPublication']
     pkg {
         repo = project.group
-        name = rootProject.name
-        userOrg = artifactName
+        name = artifactName
+        userOrg = 'radar-cns'
         licenses = ['Apache-2.0']
         websiteUrl = website
         issueTrackerUrl = issueUrl
-        vcsUrl = vcsUrl
-        githubRepo = githubRepo
+        vcsUrl = githubUrl
+        githubRepo = githubRepoName
         githubReleaseNotesFile = 'README.md'
         version {
             name = project.version
diff --git a/java-sdk/radar-schemas-questionnaire/build.gradle b/java-sdk/radar-schemas-questionnaire/build.gradle
index 58f9bcaf..f600adf8 100644
--- a/java-sdk/radar-schemas-questionnaire/build.gradle
+++ b/java-sdk/radar-schemas-questionnaire/build.gradle
@@ -30,7 +30,7 @@ publishing {
                 def root = asNode()
                 root.appendNode('description', description)
                 root.appendNode('name', artifactName)
-                root.appendNode('url', vcsUrl)
+                root.appendNode('url', githubUrl)
                 root.children().last() + pomConfig
             }
         }
@@ -44,13 +44,13 @@ bintray {
     publications = ['RadarQuestionnairePublication']
     pkg {
         repo = project.group
-        name = rootProject.name
-        userOrg = artifactName
+        name = artifactName
+        userOrg = 'radar-cns'
         licenses = ['Apache-2.0']
         websiteUrl = website
         issueTrackerUrl = issueUrl
-        vcsUrl = vcsUrl
-        githubRepo = githubRepo
+        vcsUrl = githubUrl
+        githubRepo = githubRepoName
         githubReleaseNotesFile = 'README.md'
         version {
             name = project.version
diff --git a/java-sdk/radar-schemas-restapi/build.gradle b/java-sdk/radar-schemas-restapi/build.gradle
index b640426f..3f8b9af2 100644
--- a/java-sdk/radar-schemas-restapi/build.gradle
+++ b/java-sdk/radar-schemas-restapi/build.gradle
@@ -30,7 +30,7 @@ publishing {
                 def root = asNode()
                 root.appendNode('description', description)
                 root.appendNode('name', artifactName)
-                root.appendNode('url', vcsUrl)
+                root.appendNode('url', githubUrl)
                 root.children().last() + pomConfig
             }
         }
@@ -44,13 +44,13 @@ bintray {
     publications = ['RadarRestApiPublication']
     pkg {
         repo = project.group
-        name = rootProject.name
-        userOrg = artifactName
+        name = artifactName
+        userOrg = 'radar-cns'
         licenses = ['Apache-2.0']
         websiteUrl = website
         issueTrackerUrl = issueUrl
-        vcsUrl = vcsUrl
-        githubRepo = githubRepo
+        vcsUrl = githubUrl
+        githubRepo = githubRepoName
         githubReleaseNotesFile = 'README.md'
         version {
             name = project.version