jaymicrocode
diff --git a/‎.travis.yml‎
Lines changed: 61 additions & 69 deletions b/‎.travis.yml‎
Lines changed: 61 additions & 69 deletions
diff --git a/‎.utility/decrypt-service-instance-apikeys.sh‎
Lines changed: 8 additions & 0 deletions b/‎.utility/decrypt-service-instance-apikeys.sh‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎.utility/deploy-travis-wrapper.sh‎
Lines changed: 1 addition & 0 deletions b/‎.utility/deploy-travis-wrapper.sh‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.utility/patch-openjdk7.sh‎
Lines changed: 7 additions & 0 deletions b/‎.utility/patch-openjdk7.sh‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎.utility/push-javadoc-to-gh-pages.sh‎
Lines changed: 1 addition & 0 deletions b/‎.utility/push-javadoc-to-gh-pages.sh‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.utility/travis-run-tests.sh‎
Lines changed: 8 additions & 0 deletions b/‎.utility/travis-run-tests.sh‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceIT.java‎
Lines changed: 2 additions & 2 deletions b/‎assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceIT.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎build.gradle‎
Lines changed: 2 additions & 2 deletions b/‎build.gradle‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java‎
Lines changed: 2 additions & 2 deletions b/‎discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎gradle.properties‎
Lines changed: 1 addition & 1 deletion b/‎gradle.properties‎
Lines changed: 1 addition & 1 deletion
@@ -1,75 +1,67 @@
-language: java
 dist: trusty
 os: linux
-jdk:
-- openjdk7
-- oraclejdk8
 branches:
   except:
-  - gh-pages
-before_cache:
-- rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-cache:
-  directories:
-  - "$HOME/.m2"
-  - "$HOME/.gradle/caches/"
-  - "$HOME/.gradle/wrapper/"
-before_install:
-- |
-  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
-- sudo apt-get update
-- sudo apt-get install python
-install:
-- if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then cd appscan; make asoc-tool; cd
-  ../; fi
-- 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
-  && tar xvf secrets.tar
-  || true'
-- if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then ./appscan/ASOC.sh; fi
-- "./gradlew install -x check"
-- "./gradlew checkstyleMain"
-- "./gradlew checkstyleTest"
-- "./gradlew shadowJar"
-- if [ "${TRAVIS_EVENT_TYPE}" == "push"  ] && [ "${TRAVIS_BRANCH}" != "master" ] && [ "${TRAVIS_TAG}" != "${TRAVIS_BRANCH}" ]; then ./gradlew codeCoverageReport --continue; fi
-- "./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: npx semantic-release
-  on:
-    branch: master
-    jdk: openjdk7
-- provider: script
-  script: ".utility/push-javadoc-to-gh-pages.sh"
-  skip_cleanup: true
-  on:
-    repo: watson-developer-cloud/java-sdk
-    jdk: openjdk7
-    tags: true
-- provider: script
-  skip_cleanup: true
-  script: ".utility/deploy-travis-wrapper.sh"
-  on:
-    tags: true
-    jdk: openjdk7
+    - gh-pages
+stages:
+  - Build and test
+  - Semantic release
+  - Publish javadoc
+  - Release to bintray
+
+jobs:
+  include:
+    - stage: Build and test
+      jdk: oraclejdk8
+      language: java
+      before_install:
+        - .utility/decrypt-service-instance-apikeys.sh
+      script:
+        - ./gradlew checkstyleMain
+        - ./gradlew checkstyleTest
+        - travis_retry .utility/travis-run-tests.sh
+      after_success:
+        - bash <(curl -s https://codecov.io/bash)
+    - jdk: openjdk7
+      language: java
+      before_install:
+        - .utility/patch-openjdk7.sh
+        - .utility/decrypt-service-instance-apikeys.sh
+      script:
+        - ./gradlew checkstyleMain
+        - ./gradlew checkstyleTest
+        - travis_retry .utility/travis-run-tests.sh
+      after_success:
+        - bash <(curl -s https://codecov.io/bash)
+
+    - stage: Semantic release
+      jdk: openjdk7
+      language: java
+      if: branch = master AND type = push AND fork = false
+      before_install:
+        - pip install --user bumpversion
+        - nvm install 12
+        - npm install @semantic-release/changelog
+        - npm install @semantic-release/exec
+        - npm install @semantic-release/git
+      script:
+        - ./gradlew shadowJar
+        - npx semantic-release
+
+    - stage: Publish javadoc
+      jdk: openjdk7
+      language: java
+      if: type = push AND fork = false
+      script:
+        - ./gradlew docs
+        - .utility/push-javadoc-to-gh-pages.sh
+
+    - stage: Release to bintray
+      jdk: openjdk7
+      language: java
+      if: tag IS present
+      script:
+        - .utility/deploy-travis-wrapper.sh
+
 notifications:
   email: true
@@ -0,0 +1,8 @@
+#!/bin/bash
+if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+  echo -e "Decrypt service instance apikeys for branch $TRAVIS_BRANCH.\n"
+  openssl aes-256-cbc -K $encrypted_42d9c68e608d_key -iv $encrypted_42d9c68e608d_iv -in secrets.tar.enc -out secrets.tar -d
+  tar xvf secrets.tar
+else
+  echo -e "Not Decrypt service instance apikeys for branch $TRAVIS_BRANCH.\n"
+fi
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -o pipefail
 
 ./gradlew bintrayUpload &
 
 
@@ -0,0 +1,7 @@
+set -o pipefail
+
+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
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -o pipefail
 
 if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" ]; then
 
 
@@ -0,0 +1,8 @@
+set -o pipefail
+
+if [ "${TRAVIS_EVENT_TYPE}" == "push"  ] && [ "${TRAVIS_BRANCH}" != "master" ] && [ "${TRAVIS_TAG}" != "${TRAVIS_BRANCH}" ]; then
+  if test -f "common/src/test/resources/config.properties"; then
+    echo "Running integration tests"
+  fi
+  ./gradlew codeCoverageReport --continue
+fi
@@ -16,7 +16,7 @@
 import com.ibm.cloud.sdk.core.http.ServiceCallback;
 import com.ibm.cloud.sdk.core.security.BasicAuthenticator;
 import com.ibm.cloud.sdk.core.service.exception.NotFoundException;
-import com.ibm.cloud.sdk.core.service.exception.UnauthorizedException;
+import com.ibm.cloud.sdk.core.service.exception.ForbiddenException;
 import com.ibm.watson.assistant.v1.model.Context;
 import com.ibm.watson.assistant.v1.model.Counterexample;
 import com.ibm.watson.assistant.v1.model.CounterexampleCollection;
@@ -166,7 +166,7 @@ public void accept(Response<MessageResponse> response) throws Exception {
     Thread.sleep(5000);
   }
 
-  @Test(expected = UnauthorizedException.class)
+  @Test(expected = ForbiddenException.class)
   public void pingBadCredentialsThrowsException() {
     Assistant badService = new Assistant("2019-02-28", new BasicAuthenticator("foo", "bar"));
     MessageOptions options = new MessageOptions.Builder(workspaceId).build();
 
@@ -120,9 +120,9 @@ task codeCoverageReport(type: JacocoReport) {
 
   reports {
     xml.enabled true
-    xml.destination "${buildDir}/reports/jacoco/report.xml"
+    xml.destination file("$buildDir/reports/jacoco/report.xml")
     html.enabled true
-    html.destination "${buildDir}/reports/jacoco"
+    html.destination file("$buildDir/reports/jacoco")
     csv.enabled false
   }
 }
 
@@ -24,7 +24,7 @@
 import com.ibm.cloud.sdk.core.service.exception.BadRequestException;
 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;
+import com.ibm.cloud.sdk.core.service.exception.ForbiddenException;
 import com.ibm.cloud.sdk.core.util.GsonSingleton;
 import com.ibm.watson.common.RetryRunner;
 import com.ibm.watson.common.WaitFor;
@@ -414,7 +414,7 @@ public void pingIsSuccessful() {
     assertTrue(ping());
   }
 
-  @Test(expected = UnauthorizedException.class)
+  @Test(expected = ForbiddenException.class)
   public void badCredentialsThrowsException() {
     Discovery badService = new Discovery("2019-04-30", new BasicAuthenticator("foo", "bar"));
     badService.listEnvironments(null).execute().getResult();
 
@@ -1,3 +1,3 @@
 version=8.3.1
 group=com.ibm.watson
-
+org.gradle.parallel=true
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#!/bin/bash`
	`2`	`+set -o pipefail`
`2`	`3`
`3`	`4`	`./gradlew bintrayUpload &`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,9 @@ task codeCoverageReport(type: JacocoReport) {`
`120`	`120`
`121`	`121`	`reports {`
`122`	`122`	`xml.enabled true`
`123`		`- xml.destination "${buildDir}/reports/jacoco/report.xml"`
	`123`	`+ xml.destination file("$buildDir/reports/jacoco/report.xml")`
`124`	`124`	`html.enabled true`
`125`		`- html.destination "${buildDir}/reports/jacoco"`
	`125`	`+ html.destination file("$buildDir/reports/jacoco")`
`126`	`126`	`csv.enabled false`
`127`	`127`	`}`
`128`	`128`	`}`