Merge branch 'master' into assistant-update

Author: kevinkowa

.gitignore

@@ -35,3 +35,4 @@ package-lock.json
 *.test-metadata.txt
 *.py
 fix-copyrights.sh
+/.utility/secring.gpg

.travis.yml

@@ -7,7 +7,7 @@ stages:
   - Build and test
   - Semantic release
   - Publish javadoc
-  - Release to bintray
+  - Upload Archives
 
 jobs:
   include:
@@ -44,7 +44,7 @@ jobs:
         - ./gradlew docs
         - .utility/push-javadoc-to-gh-pages.sh
 
-    - stage: Release to bintray
+    - stage: Upload Archives
       jdk: openjdk8
       language: java
       if: tag IS present

.utility/bintray-release.gradle

@@ -1,98 +1,62 @@
-apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'java'
 apply plugin: 'java-library'
 apply plugin: 'maven'
-apply plugin: 'maven-publish'
 
-bintrayUpload.dependsOn assemble
-bintrayUpload.dependsOn sourcesJar
-bintrayUpload.dependsOn javadocJar
+uploadArchives.dependsOn assemble
+uploadArchives.dependsOn sourcesJar
+uploadArchives.dependsOn javadocJar
 
-bintray {
-    user = System.getenv('BINTRAY_USER')
-    key =  System.getenv('BINTRAY_APIKEY')
-    publications = ['maven']
-    publish = true
-    override = true
-    pkg {
-        repo = 'ibm-cloud-sdk-repo'
-        name = packageName
-        userOrg = 'ibm-cloud-sdks'
-        licenses = ['Apache-2.0']
-        vcsUrl = 'https://github.com/watson-developer-cloud/java-sdk.git'
-        version {
-            name = project.property('version')
-            vcsTag = project.property('version')
-            released  = new Date()
-            gpg {
-                sign = true
-            }
-            mavenCentralSync {
-                sync = true
-                user = System.getenv('SONATYPE_USER')
-                password = System.getenv('SONATYPE_PASSWORD') //pragma: whitelist secret
-            }
-        }
-    }
-}
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-def pomConfig = {
-    scm {
-        connection 'scm:git:git@github.com:watson-developer-cloud/java-sdk.git'
-        developerConnection 'scm:git:git@github.com:watson-developer-cloud/java-sdk.git'
-        url 'https://github.com/watson-developer-cloud/java-sdk'
-    }
-
-    issueManagement {
-        system 'GitHub'
-        url 'https://github.com/watson-developer-cloud/java-sdk/issues'
-
-    }
-
-    ciManagement {
-        system 'Travis CI'
-        url 'https://travis-ci.org/watson-developer-cloud/java-sdk'
-    }
-
-    licenses {
-        license {
-            name 'The Apache License, Version 2.0'
-            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-        }
-    }
+            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                authentication(userName: System.getenv('SONATYPE_USER'), password: System.getenv('SONATYPE_PASSWORD'))
+            }
 
-    developers {
-        developer {
-            id 'german'
-            name 'German Attanasio'
-            email 'germanatt@us.ibm.com'
-        }
-        developer {
-            id 'logan'
-            name 'Logan Patino'
-            email 'loganpatino10@ibm.com'
-        }
-    }
-}
+            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+                authentication(userName: System.getenv('SONATYPE_USER'), password: System.getenv('SONATYPE_PASSWORD'))
+            }
 
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-            artifact sourcesJar
-            artifact javadocJar
-            artifact shadowJar
-            groupId 'com.ibm.watson'
-            artifactId artifact
-            version project.property('version')
-            pom.withXml {
-                def root = asNode()
-                root.appendNode('description', libraryDescription)
-                root.appendNode('name', libraryName)
-                root.appendNode('url', 'https://cloud.ibm.com/developer/watson/dashboard')
-                root.children().last() + pomConfig
+            pom.project {
+                name libraryName
+                packaging 'jar'
+                description libraryDescription
+                url 'https://cloud.ibm.com/developer/watson/dashboard'
+                scm {
+                    connection 'scm:git:git@github.com:watson-developer-cloud/java-sdk.git'
+                    developerConnection 'scm:git:git@github.com:watson-developer-cloud/java-sdk.git'
+                    url 'https://github.com/watson-developer-cloud/java-sdk'
+                }
+
+                issueManagement {
+                    system 'GitHub'
+                    url 'https://github.com/watson-developer-cloud/java-sdk/issues'
+
+                }
+
+                ciManagement {
+                    system 'Travis CI'
+                    url 'https://travis-ci.org/watson-developer-cloud/java-sdk'
+                }
+
+                licenses {
+                    license {
+                        name 'The Apache License, Version 2.0'
+                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+
+                developers {
+                    developer {
+                        id 'watdevex'
+                        name 'Watson Developer Experience'
+                        email 'watdevex@us.ibm.com'
+                    }
+                }
             }
         }
     }
-}
+}

.utility/deploy-travis-wrapper.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 set -o pipefail
 
-./gradlew bintrayUpload &
+openssl aes-256-cbc -K $encrypted_6afd0fc9428e_key -iv $encrypted_6afd0fc9428e_iv -in .utility/secring.gpg.enc -out .utility/secring.gpg -d
+./gradlew uploadArchives -Psigning.keyId=$SIGNING_KEY -Psigning.password=$SIGNING_PASSWORD -Psigning.secretKeyRingFile=../.utility/secring.gpg &
 
 # output every 9 min to prevent a Travis timeout
 PID=$!

.utility/secring.gpg.enc

@@ -14,6 +14,7 @@ apply plugin: 'java'
 apply plugin: 'checkstyle'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
+apply plugin: 'signing'
 
 archivesBaseName = 'ibm-watson'
 

build.gradle

@@ -1906,42 +1906,42 @@ public void createEventIsSuccessful() {
   }
 
   /** Query log is successful. */
-  @Test
+  //@Test
   public void queryLogIsSuccessful() {
     LogQueryResponse response = discovery.queryLog().execute().getResult();
     assertNotNull(response);
   }
 
   /** Gets the metrics event rate is successful. */
-  @Test
+  //@Test
   public void getMetricsEventRateIsSuccessful() {
     MetricResponse response = discovery.getMetricsEventRate().execute().getResult();
     assertNotNull(response);
   }
 
   /** Gets the metrics query is successful. */
-  @Test
+  //@Test
   public void getMetricsQueryIsSuccessful() {
     MetricResponse response = discovery.getMetricsQuery().execute().getResult();
     assertNotNull(response);
   }
 
   /** Gets the metrics query event is successful. */
-  @Test
+  //@Test
   public void getMetricsQueryEventIsSuccessful() {
     MetricResponse response = discovery.getMetricsQueryEvent().execute().getResult();
     assertNotNull(response);
   }
 
   /** Gets the metrics query no results is successful. */
-  @Test
+  //@Test
   public void getMetricsQueryNoResultsIsSuccessful() {
     MetricResponse response = discovery.getMetricsQueryNoResults().execute().getResult();
     assertNotNull(response);
   }
 
   /** Gets the metrics query token event is successful. */
-  @Test
+  //@Test
   public void getMetricsQueryTokenEventIsSuccessful() {
     MetricTokenResponse response = discovery.getMetricsQueryTokenEvent().execute().getResult();
     assertNotNull(response);