Merge pull request #1096 from watson-developer-cloud/core-dependency-update

Update core package

Author: lpatino10

.releaserc

@@ -1,17 +1,19 @@
 {
   "branch": "master",
   "tagFormat": "java-sdk-${version}",
+  "debug": true,
   "plugins": [
+    "@semantic-release/changelog",
     "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",
-    "@semantic-release/git",
     ["@semantic-release/github", {
       "assets": [
         {"path": "ibm-watson/build/libs/ibm-watson-${nextRelease.version}-jar-with-dependencies.jar"}
       ]
     }],
     ["@semantic-release/exec", {
       "prepareCmd": "bumpversion --current-version ${lastRelease.version} --new-version ${nextRelease.version} --verbose --allow-dirty patch"
-    }]
+    }],
+    "@semantic-release/git"
   ]
-}
+}

.travis.yml

@@ -23,14 +23,11 @@ before_install:
     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
 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
 before_script:
 - if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then chmod a+x ./appscan/ASOC.sh; fi
@@ -50,10 +47,15 @@ script:
 - "./gradlew docs > /dev/null"
 after_success:
 - bash <(curl -s https://codecov.io/bash)
+before deploy:
+- nvm install 12
+- npm install @semantic-release/changelog
+- npm install @semantic-release/exec
+- npm install @semantic-release/git
 deploy:
 - provider: script
   skip_cleanup: true
-  script: "semantic-release"
+  script: npx semantic-release
   on:
     branch: master
     jdk: openjdk7

assistant/build.gradle

@@ -60,7 +60,7 @@ checkstyle {
 dependencies {
     compile project(':common')
     testCompile project(':common').sourceSets.test.output
-    compile 'com.ibm.cloud:sdk-core:7.0.0'
+    compile 'com.ibm.cloud:sdk-core:7.1.0'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

common/build.gradle

@@ -58,7 +58,7 @@ checkstyle {
 }
 
 dependencies {
-    compile 'com.ibm.cloud:sdk-core:7.0.0'
+    compile 'com.ibm.cloud:sdk-core:7.1.0'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

compare-comply/build.gradle

@@ -60,7 +60,7 @@ checkstyle {
 dependencies {
     compile project(':common')
     testCompile project(':common').sourceSets.test.output
-    compile 'com.ibm.cloud:sdk-core:7.0.0'
+    compile 'com.ibm.cloud:sdk-core:7.1.0'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

discovery/build.gradle

@@ -64,7 +64,7 @@ checkstyle {
 dependencies {
     compile project(':common')
     testCompile project(':common').sourceSets.test.output
-    compile 'com.ibm.cloud:sdk-core:7.0.0'
+    compile 'com.ibm.cloud:sdk-core:7.1.0'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java

@@ -22,7 +22,6 @@
 import com.ibm.cloud.sdk.core.security.BearerTokenAuthenticator;
 import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.cloud.sdk.core.service.exception.BadRequestException;
-import com.ibm.cloud.sdk.core.service.exception.ForbiddenException;
 import com.ibm.cloud.sdk.core.service.exception.InternalServerErrorException;
 import com.ibm.cloud.sdk.core.service.exception.NotFoundException;
 import com.ibm.cloud.sdk.core.service.exception.UnauthorizedException;
@@ -421,7 +420,7 @@ public void badCredentialsThrowsException() {
     badService.listEnvironments(null).execute().getResult();
   }
 
-  @Test(expected = ForbiddenException.class)
+  @Test(expected = NotFoundException.class)
   public void pingBadUrlThrowsException() {
     discovery.setServiceUrl("https://gateway.watsonplatform.net/discovery-foo/api");
     ping();
@@ -1828,8 +1827,8 @@ public void tokenizationDictionaryOperationsAreSuccessful() throws InterruptedEx
       TokenDictRule tokenDictRule = new TokenDictRule.Builder()
           .text("token")
           .partOfSpeech("noun")
-          .readings(Arrays.asList("reading 1", "reading 2"))
-          .tokens(Arrays.asList("token 1", "token 2"))
+          .readings(Arrays.asList("reading_1", "reading_2"))
+          .tokens(Arrays.asList("token_1", "token_2"))
           .build();
 
       // the service doesn't seem to like when we try and move too fast

language-translator/build.gradle

@@ -60,7 +60,7 @@ checkstyle {
 dependencies {
     compile project(':common')
     testCompile project(':common').sourceSets.test.output
-    compile 'com.ibm.cloud:sdk-core:7.0.0'
+    compile 'com.ibm.cloud:sdk-core:7.1.0'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

natural-language-classifier/build.gradle

@@ -64,7 +64,7 @@ checkstyle {
 dependencies {
     compile project(':common')
     testCompile project(':common').sourceSets.test.output
-    compile 'com.ibm.cloud:sdk-core:7.0.0'
+    compile 'com.ibm.cloud:sdk-core:7.1.0'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

natural-language-understanding/build.gradle

@@ -60,7 +60,7 @@ checkstyle {
 dependencies {
     compile project(':common')
     testCompile project(':common').sourceSets.test.output
-    compile 'com.ibm.cloud:sdk-core:7.0.0'
+    compile 'com.ibm.cloud:sdk-core:7.1.0'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }