Merge pull request #1050 from watson-developer-cloud/v7.0.0

v7.0.0 release 😱 😱 😱

Author: lpatino10

.bumpversion.cfg

@@ -1,13 +1,15 @@
 [bumpversion]
 current_version = 6.14.0
 commit = True
-message = [skip ci] docs: Update version numbers from {current_version} -> {new_version}
+message = Update version numbers from {current_version} -> {new_version}
+
+[bumpversion:file:gradle.properties]
 
 [bumpversion:file:README.md]
 
 [bumpversion:file:assistant/README.md]
 
-[bumpversion:file:conversation/README.md]
+[bumpversion:file:compare-comply/README.md]
 
 [bumpversion:file:discovery/README.md]
 

.github/CONTRIBUTING.md

@@ -1,18 +1,24 @@
-# Questions
-
-If you are having difficulties using the APIs or have a question about the IBM Watson Services,
-please ask a question on [dW Answers][dw] or [Stack Overflow][stackoverflow].
-
 # Issues
 
 If you encounter an issue with the Java SDK, you are welcome to submit a [bug report](https://github.com/watson-developer-cloud/java-sdk/issues).
 Before that, please search for similar issues. It's possible somebody has encountered this issue already.
 
+# Building and testing
+This project uses [Gradle] as the build tool (> v1.x). Here are some helpful commands:
+```sh
+cd java-sdk
+gradle jar  # build jar file (build/libs/watson-developer-cloud-6.14.0.jar)
+gradle test # run tests
+gradle check # performs quality checks on source files and generates reports
+gradle testReport # run tests and generate the aggregated test report (build/reports/allTests)
+gradle codeCoverageReport # run tests and generate the code coverage report (build/reports/jacoco)
+```
+
 # Pull Requests
 
 If you want to contribute to the repository, here's a quick guide:
   1. Fork the repository
-  1. Create a `.config.properties` similar to [`config.properties`](https://github.com/watson-developer-cloud/java-sdk/blob/master/core/src/test/resources/config.properties).
+  1. Edit the [`config.properties`](../common/src/test/resources/config.properties) file to add your service credentials to the appropriate fields.
   2. develop and test your code changes, gradle: `gradle test`.
     * Run `checkstyle`: `gradle checkstyle`. 🏁
     * Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
@@ -48,24 +54,6 @@ By making a contribution to this project, I certify that:
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.
 
-## Emoji Cheatsheet
-
-When creating creating commits or updating the `CHANGELOG`, please **start** the commit message or update with one of the following applicable Emoji. Emoji should not be used at the start of issue or pull request titles.
-
-* :new: `:new:` when adding new functionality
-* :bug: `:bug:` when fixing a bug
-* :memo: `:memo:` when writing documentation
-* :art: `:art:` when improving the format/structure of the code
-* :fire: `:fire:` when removing code or files
-* :racehorse: `:racehorse:` when improving performance
-* :white_check_mark: `:white_check_mark:` when adding tests
-* :green_heart: `:green_heart:` when fixing the CI build
-* :lock: `:lock:` when dealing with security
-* :crystal_ball: `:crystal_ball:` when experimenting
-* :unamused: `:unamused:` when doing chore work (updating dependencies, etc…)
-* :boom: `:boom:` when changing in a non-backwards-compatible way current functionality
-* :shipit: `:shipit:` when creating a new release
-
 ## Additional Resources
 + [General GitHub documentation](https://help.github.com/)
 + [GitHub pull request documentation](https://help.github.com/send-pull-requests/)

.gitignore

@@ -12,16 +12,20 @@ bin/
 *.iml
 *.ipr
 *.iws
+config.properties
 .config.properties
 .checkstyle
 .gradletasknamecache
 docs
 .swagger-codegen-ignore
 .vscode/
-conversation/src/test/java/com/ibm/watson/developer_cloud/conversation/v1/ConversationTest.java
 .swagger-codegen/VERSION
 *.orig
 *.rej
 compare-comply/src/test/resources/compare_comply/cloud-object-storage-credentials-input.json
 compare-comply/src/test/resources/compare_comply/cloud-object-storage-credentials-output.json
-secrets.tar
+secrets.tar
+package-lock.json
+*.mlmodel
+.openapi-generator-ignore
+.openapi-generator/

.releaserc

@@ -0,0 +1,13 @@
+{
+  "branch": "master",
+  "tagFormat": "java-sdk-${version}",
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    "@semantic-release/git",
+    "@semantic-release/github",
+    ["@semantic-release/exec", {
+      "prepareCmd": "bumpversion --current-version ${lastRelease.version} --new-version ${nextRelease.version} --verbose --allow-dirty patch"
+    }]
+  ]
+}

.travis.yml

@@ -15,25 +15,27 @@ cache:
   - "$HOME/.m2"
   - "$HOME/.gradle/caches/"
   - "$HOME/.gradle/wrapper/"
-env:
-  global:
-  - secure: S2KIWOJX35j1FczyV7JRFrFpTftb8Hmkf6C50bJh8E03IbPu7tnX2znPKBbRWcIQndO6qd5dL7+BqtXabByOzd5Slj5/NBdXPcGffsO7B0cpFQS8ngpIMAGReCXQ12PbOiO8CIk2f/20lU3L0kqcP1TaPyZYIlSwkUg98ls8p90=
-  - secure: eLv41LVZoRCqQehOM29RLodZ6NZhrIdLWklAkMdLGlFDEiVY5f0shaPLffpUiuv/3pg+CuQk9ffBc72m8lwTsimex9unC/WVsqQJhqQEWJEaPGL0UamV/HqHMeBQEpKiCcKHaBRHFGk7QQJVtiXvVvlbwk7Jks5giUR7+s/Q6iI=
-  - secure: l0dde5NSGedD6fny5aMr1ll90FYVd7IKDsZ0Kd1GWnB+iDd3rjDBwz5q6NUwN2LTqw3jWFqmqdEnGUGO3Er0rdfdtPh3K194sTK3XuCZz8GEjFvYAEDRQ59oyK8fhw60c86cWppBQ4gluLKLstm12DLkARTUvJiIsTQTnuc2YGg=
 before_install:
-- sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g'
-  ~/.m2/settings.xml
 - |
   if [ "$TRAVIS_JDK_VERSION" == "openjdk7" ]; then
     sudo wget "https://bouncycastle.org/download/bcprov-ext-jdk15on-158.jar" -O "${JAVA_HOME}/jre/lib/ext/bcprov-ext-jdk15on-158.jar"
     sudo perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security
     echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a /etc/java-7-openjdk/security/java.security
   fi
+- npm install -g [email protected]
+- nvm install 'lts/*'
+- sudo apt-get update
+- sudo apt-get install python
 install:
 - if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then cd appscan; make asoc-tool; cd
   ../; fi
+- npm install -g [email protected]
+- npm install @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/git @semantic-release/github @semantic-release/exec -D
+- pip install --user bumpversion
 before_script:
 - if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then chmod a+x ./appscan/ASOC.sh; fi
+- env
+- echo "TRAVIS_TAG = '${TRAVIS_TAG}'"
 script:
 - '[ "${TRAVIS_PULL_REQUEST}" = "false" ]
   && openssl aes-256-cbc -K $encrypted_42d9c68e608d_key -iv $encrypted_42d9c68e608d_iv -in secrets.tar.enc -out secrets.tar -d
@@ -48,6 +50,18 @@ script:
 after_success:
 - bash <(curl -s https://codecov.io/bash)
 deploy:
+- provider: script
+  skip_cleanup: true
+  script: "./gradlew bintrayUpload"
+  on:
+    tags: true
+    jdk: openjdk7
+- provider: script
+  skip_cleanup: true
+  script: "semantic-release"
+  on:
+    branch: master
+    jdk: openjdk7
 - provider: script
   script: ".utility/push-javadoc-to-gh-pages.sh"
   skip_cleanup: true

.utility/bintray-properties.gradle

@@ -0,0 +1,8 @@
+ext {
+    packageName = PACKAGE_NAME
+    libraryName = NAME
+    artifact = ARTIFACT_ID
+    libraryDescription = DESCRIPTION
+}
+
+apply from: rootProject.file('.utility/bintray-release.gradle')

.utility/bintray-release.gradle

@@ -0,0 +1,97 @@
+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
+
+bintray {
+    user = System.getenv('BINTRAY_USER')
+    key =  System.getenv('BINTRAY_APIKEY')
+    publications = ['maven']
+    publish = 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')
+            }
+        }
+    }
+}
+
+def pomConfig = {
+    scm {
+        connection 'scm:git:[email protected]:watson-developer-cloud/java-sdk.git'
+        developerConnection 'scm:git:[email protected]: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 'german'
+            name 'German Attanasio'
+            email '[email protected]'
+        }
+        developer {
+            id 'logan'
+            name 'Logan Patino'
+            email '[email protected]'
+        }
+    }
+}
+
+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
+            }
+        }
+    }
+}

CHANGELOG.md

@@ -1,3 +1,22 @@
+# v7.0.0
+Hello! If you're reading this, you're probably upgrading to **v7.0.0** of the Watson Java SDK. If that's the case, this guide will help you transition smoothly to get on board with the latest Watson API features in your Java code. Let's get started!
+
+## **Big** things
+### New library name
+For this release, we've changed package managers and decided to change the name along with it. Be sure to change this when upgrading by looking at the installation instructions in the README: https://github.com/watson-developer-cloud/java-sdk#installation
+
+### Response formats
+For a while now, we've had three main methods to execute an API call: `execute()`, `enqueue()`, and `rx()`. In our `v5.3.0` release, we added some variations of those methods to return not only the basic response model, but some added HTTP information like response headers.
+
+In this release, we've dropped those variants and instead have modified the base methods to always return the extra information. In addition, we've replaced `rx()` with `reactiveRequest()`, which lets you leverage [RxJava](https://github.com/ReactiveX/RxJava) to do some reactive programming if that's your thing.
+
+In short, the general structure of responses is different and you can read more about that [here](https://github.com/watson-developer-cloud/java-sdk#parsing-responses). If you're looking for making asynchronous API calls, you can read the details about that and the new `reactiveRequest()` method [here](https://github.com/watson-developer-cloud/java-sdk#making-asynchronous-api-calls).
+
+## Everything else
+Along with the major changes above, there have been more detailed breaking changes across services with API changes and updates to the SDK design. You can find these nitty-gritty details in the [release notes](https://github.com/watson-developer-cloud/java-sdk/releases/tag/java-sdk-7.0.0), along with the changes that are non-breaking.
+
+---
+
 # 4.0
 
 ## Conversation