ci: fix release process

Author: Alan Scherger

.gitignore

@@ -129,4 +129,6 @@ gradle-app.setting
 # gradle/wrapper/gradle-wrapper.properties
 
 
-# End of https://www.gitignore.io/api/java,linux,macos,gradle,intellij+all
+# End of https://www.gitignore.io/api/java,linux,macos,gradle,intellij+all
+
+generated/

artifactory.gradle

@@ -15,24 +15,22 @@
  */
 
 if (project.hasProperty('netifiArtifactoryUsername') && project.hasProperty('netifiArtifactoryPassword')) {
+    apply plugin: 'com.jfrog.artifactory'
+    plugins.withId('com.jfrog.artifactory') {
+        artifactory {
+            publish {
+                contextUrl = 'https://artifactory.netifiinc.com/artifactory'
 
-    subprojects {
-        plugins.withId('com.jfrog.artifactory') {
-            artifactory {
-                publish {
-                    contextUrl = 'https://artifactory.netifiinc.com/artifactory'
+                repository {
+                    repoKey = version.contains('SNAPSHOT') ? 'libs-snapshot-local' : 'libs-release-local'
 
-                    repository {
-                        repoKey = version.contains('SNAPSHOT') ? 'libs-snapshot-local' : 'libs-release-local'
-
-                        // Credentials for oss.jfrog.org are a user's Bintray credentials
-                        username = project.property('netifiArtifactoryUsername')
-                        password = project.property('netifiArtifactoryPassword')
-                    }
+                    // Credentials for oss.jfrog.org are a user's Bintray credentials
+                    username = project.property('netifiArtifactoryUsername')
+                    password = project.property('netifiArtifactoryPassword')
+                }
 
-                    defaults {
-                        publications('mavenJava')
-                    }
+                defaults {
+                    publications('mavenJava')
                 }
             }
         }

bintray.gradle

@@ -15,34 +15,32 @@
  */
 
 if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey')) {
+    apply plugin: 'com.jfrog.bintray'
+    plugins.withId('com.jfrog.bintray') {
+        bintray {
+            user = project.property('bintrayUser')
+            key = project.property('bintrayKey')
 
-    subprojects {
-        plugins.withId('com.jfrog.bintray') {
-            bintray {
-                user = project.property('bintrayUser')
-                key = project.property('bintrayKey')
+            publications = ['mavenJava']
 
-                publications = ['mavenJava']
+            //dryRun = true
+            publish = (osdetector.os == 'osx')
+            override = true
 
-                //dryRun = true
-                publish = (osdetector.os == 'osx')
-                override = true
+            pkg {
+                repo = 'netifi-oss'
+                name = project.name
+                userOrg = 'netifi'
+                desc = "${project.description}"
+                websiteUrl = 'https://github.com/netifi-proteus/proteus-httpgateway'
+                issueTrackerUrl = 'https://github.com/netifi-proteus/proteus-httpgateway/issues'
+                vcsUrl = 'https://github.com/netifi-proteus/proteus-httpgateway.git'
+                licenses = ['Apache-2.0']
+                githubRepo = 'netifi-proteus/proteus-httpgateway'
+                githubReleaseNotesFile = 'CHANGELOG.md'
 
-                pkg {
-                    repo = 'netifi-oss'
-                    name = project.name
-                    userOrg = 'netifi'
-                    desc = "${project.description}"
-                    websiteUrl = 'https://github.com/netifi-proteus/proteus-httpgateway'
-                    issueTrackerUrl = 'https://github.com/netifi-proteus/proteus-httpgateway/issues'
-                    vcsUrl = 'https://github.com/netifi-proteus/proteus-httpgateway.git'
-                    licenses = ['Apache-2.0']
-                    githubRepo = 'netifi-proteus/proteus-httpgateway'
-                    githubReleaseNotesFile = 'CHANGELOG.md'
-
-                    version {
-                        name = "$project.version".toString()
-                    }
+                version {
+                    name = "$project.version".toString()
                 }
             }
         }

build.gradle

@@ -56,14 +56,14 @@ allprojects {
 
     repositories {
         maven {
-            url 'https://sonatype.netifiinc.com/repository/maven-central/'
+            url 'https://sonatype.netifiinc.com/repository/jcenter/'
             credentials {
                 username = "${netifiReadOnlyUsername}"
                 password = "${netifiReadOnlyPassword}"
             }
         }
         maven {
-            url 'https://sonatype.netifiinc.com/repository/jcenter/'
+            url 'https://sonatype.netifiinc.com/repository/maven-central/'
             credentials {
                 username = "${netifiReadOnlyUsername}"
                 password = "${netifiReadOnlyPassword}"
@@ -96,8 +96,6 @@ allprojects {
 subprojects {
     apply plugin: 'idea'
     apply plugin: 'java'
-    apply plugin: 'com.jfrog.bintray'
-    apply plugin: 'com.jfrog.artifactory'
     apply plugin: 'maven'
     apply plugin: 'maven-publish'
     apply plugin: 'com.google.osdetector'
@@ -138,17 +136,4 @@ subprojects {
         archives sourcesJar
         archives javadocJar
     }
-
-    publishing {
-        publications {
-            mavenJava(MavenPublication) {
-                from components.java
-                artifact sourcesJar
-                artifact javadocJar
-            }
-        }
-    }
 }
-
-apply from: "artifactory.gradle"
-apply from: "bintray.gradle"

proteus-httpgateway-idl/build.gradle

@@ -49,3 +49,16 @@ idea {
 clean {
     delete 'src/generated/main'
 }
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifact sourcesJar
+            artifact javadocJar
+        }
+    }
+}
+
+apply from: "../artifactory.gradle"
+apply from: "../bintray.gradle"

proteus-httpgateway/build.gradle

@@ -39,20 +39,6 @@ jar {
     }
 }
 
-
-// Artifact Publishing
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact distZip
-            artifact sourcesJar
-            artifact javadocJar
-        }
-    }
-}
-
-
-
 mainClassName = 'com.netifi.proteus.httpgateway.Main'
 
 // Properties
@@ -181,12 +167,12 @@ docker {
         if (version.endsWith('SNAPSHOT') || version.endsWith('RC')) {
             // Private Docker Repo
             url = 'https://netifi.azurecr.io'
-            username = project.findProperty('netifiPrivateDockerRegistryUsername') ?: System.getenv("DOCKER_NETIFI_USERNAME")
-            password = project.findProperty('netifiPrivateDockerRegistryPassword') ?: System.getenv("DOCKER_NETIFI_PASSWORD")
+            username = "${netifiPrivateDockerRegistryUsername}"
+            password = "${netifiPrivateDockerRegistryPassword}"
         } else {
             // Public Docker Repo
-            username = project.findProperty('netifiDockerHubUsername') ?: System.getenv("DOCKER_HUB_USERNAME")
-            password = project.findProperty('netifiDockerHubPassword') ?: System.getenv("DOCKER_HUB_PASSWORD")
+            username = "${netifiDockerHubUsername}"
+            password = "${netifiDockerHubPassword}"
         }
     }
 }