feat: Make a bunch of changes to prep for the major release

BREAKING CHANGE: a lot

Author: lpatino10

.bumpversion.cfg

@@ -9,6 +9,8 @@ message = Update version numbers from {current_version} -> {new_version}
 
 [bumpversion:file:assistant/README.md]
 
+[bumpversion:file:compare-comply/README.md]
+
 [bumpversion:file:discovery/README.md]
 
 [bumpversion:file:language-translator/README.md]

.releaserc

@@ -1,5 +1,5 @@
 {
-  "branch": "bintray-deploy",
+  "branch": "master",
   "tagFormat": "java-sdk-${version}",
   "plugins": [
     "@semantic-release/commit-analyzer",

.travis.yml

@@ -22,16 +22,16 @@ before_install:
     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 npm@6.x
-#- nvm install 'lts/*'
-#- sudo apt-get update
-#- sudo apt-get install python
+- npm install -g npm@6.x
+- 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 semantic-release@15.13.4
-#- 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
+- npm install -g semantic-release@15.13.4
+- 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
@@ -54,14 +54,14 @@ deploy:
   skip_cleanup: true
   script: "./gradlew bintrayUpload"
   on:
-    branch: bintray-deploy
+    tags: true
+    jdk: openjdk7
+- provider: script
+  skip_cleanup: true
+  script: "semantic-release"
+  on:
+    branch: master
     jdk: openjdk7
-#- provider: script
-#  skip_cleanup: true
-#  script: "semantic-release"
-#  on:
-#    branch: bintray-deploy
-#    jdk: openjdk7
 - provider: script
   script: ".utility/push-javadoc-to-gh-pages.sh"
   skip_cleanup: true

.utility/bintray-release.gradle

@@ -13,7 +13,6 @@ bintray {
     user = System.getenv('BINTRAY_USER')
     key =  System.getenv('BINTRAY_APIKEY')
     publications = ['maven']
-    dryRun = true
     publish = true
     pkg {
         repo = 'ibm-cloud-sdk-repo'

README.md

@@ -66,7 +66,7 @@ All the services:
 <dependency>
 	<groupId>com.ibm.watson</groupId>
 	<artifactId>ibm-watson</artifactId>
-	<version>7.0.0</version>
+	<version>6.14.0</version>
 </dependency>
 ```
 
@@ -76,7 +76,7 @@ Only Discovery:
 <dependency>
 	<groupId>com.ibm.watson</groupId>
 	<artifactId>discovery</artifactId>
-	<version>7.0.0</version>
+	<version>6.14.0</version>
 </dependency>
 ```
 
@@ -85,13 +85,13 @@ Only Discovery:
 All the services:
 
 ```gradle
-'com.ibm.watson:ibm-watson:7.0.0'
+'com.ibm.watson:ibm-watson:6.14.0'
 ```
 
 Only Assistant:
 
 ```gradle
-'com.ibm.watson:assistant:7.0.0'
+'com.ibm.watson:assistant:6.14.0'
 ```
 
 ##### JAR

assistant/README.md

@@ -5,15 +5,15 @@
 ##### Maven
 ```xml
 <dependency>
-  <groupId>com.ibm.watson.developer_cloud</groupId>
+  <groupId>com.ibm.watson</groupId>
   <artifactId>assistant</artifactId>
   <version>6.14.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.14.0'
+'com.ibm.watson:assistant:6.14.0'
 ```
 
 ## Usage
@@ -22,15 +22,16 @@ Use the [Assistant][assistant] service to identify intents, entities, and conduc
 ### Using Assistant v1
 ```java
 // make sure to use the Assistant v1 import!
-import com.ibm.watson.developer_cloud.assistant.v1.Assistant;
+import com.ibm.watson.assistant.v1.Assistant;
 
 Assistant service = new Assistant("2018-02-16");
 IamOptions options = new IamOptions.Builder()
   .apiKey("<iam_api_key>")
   .build();
 service.setIamCredentials(options);
 
-InputData input = new InputData.Builder("Hi").build();
+MessageInput input = new MessageInput();
+input.setText("Hi");
 MessageOptions options = new MessageOptions.Builder(workspaceId)
   .input(input)
   .build();
@@ -41,24 +42,27 @@ System.out.println(response);
 Maintaining context across messages:
 ```java
 // make sure to use the Assistant v1 import!
-import com.ibm.watson.developer_cloud.assistant.v1.Assistant;
+import com.ibm.watson.assistant.v1.Assistant;
 
 Context context = null;
+MessageInput input = new MessageInput();
 
 // first message
+input.setText("First message");
 MessageOptions newMessageOptions = new MessageOptions.Builder()
   .workspaceId("<workspace-id>")
-  .input(new InputData.Builder("First message").build())
+  .input(input)
   .context(context)
   .build();
 
 MessageResponse response = service.message(newMessageOptions).execute().getResult();
 context = response.getContext();
 
 // second message
+input.setText("Second message");
 newMessageOptions = new MessageOptions.Builder()
   .workspaceId("<workspace-id>")
-  .input(new InputData.Builder("Second message").build())
+  .input(input)
   .context(context) // using context from the first message
   .build();
 
@@ -72,7 +76,7 @@ System.out.println(response);
 ### Using Assistant v2
 ```java
 // make sure to use the Assistant v2 import!
-import com.ibm.watson.developer_cloud.assistant.v2.Assistant;
+import com.ibm.watson.assistant.v2.Assistant;
 
 Assistant service = new Assistant("2018-09-20");
 IamOptions options = new IamOptions.Builder()
@@ -96,7 +100,7 @@ System.out.println(messageResponse);
 Maintaining context across messages:
 ```java
 // make sure to use the Assistant v2 import!
-import com.ibm.watson.developer_cloud.assistant.v2.Assistant;
+import com.ibm.watson.assistant.v2.Assistant;
 
 MessageContext context = new MessageContext();
 

compare-comply/README.md

@@ -5,15 +5,15 @@
 ##### Maven
 ```xml
 <dependency>
-  <groupId>com.ibm.watson.developer_cloud</groupId>
+  <groupId>com.ibm.watson</groupId>
   <artifactId>compare-comply</artifactId>
-  <version>6.11.0</version>
+  <version>6.14.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:compare-comply:6.11.0'
+'com.ibm.watson.developer_cloud:compare-comply:6.14.0'
 ```
 
 ## Usage

discovery/README.md

@@ -5,15 +5,15 @@
 ##### Maven
 ```xml
 <dependency>
-  <groupId>com.ibm.watson.developer_cloud</groupId>
+  <groupId>com.ibm.watson</groupId>
   <artifactId>discovery</artifactId>
   <version>6.14.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:discovery:6.14.0'
+'com.ibm.watson:discovery:6.14.0'
 ```
 
 ## Usage

gradle.properties

@@ -1,3 +1,3 @@
-version=6.14.2
+version=6.14.0
 group=com.ibm.watson
 

language-translator/README.md

@@ -5,15 +5,15 @@
 ##### Maven
 ```xml
 <dependency>
-  <groupId>com.ibm.watson.developer_cloud</groupId>
+  <groupId>com.ibm.watson</groupId>
   <artifactId>language-translator</artifactId>
   <version>6.14.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:language-translator:6.14.0'
+'com.ibm.watson:language-translator:6.14.0'
 ```
 
 ## Usage