Merge branch 'develop' into discovery-patch

watson-developer-cloud · Dec 14, 2017 · ba7b146 · ba7b146
2 parents 7dbf0dc + ca526cf
commit ba7b146
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,7 +1,5 @@
 [bumpversion]
 current_version = 4.1.0
-commit = True
-tag = True
 
 [bumpversion:file:README.md]
 
@@ -34,4 +32,3 @@ tag = True
 [bumpversion:file:visual-recognition/README.md]
 search = {current_version}
 replace = {new_version}
-
diff --git a/.travis.yml b/.travis.yml
@@ -56,5 +56,13 @@ deploy:
       repo: watson-developer-cloud/java-sdk
       jdk: oraclejdk7
 
+  - provider: releases
+    api_key: ${GITHUB_TOKEN_RELEASES}
+    file: java-sdk/build/libs/jar-with-dependencies-${TRAVIS_BRANCH}.jar
+    skip_cleanup: true
+    on:
+      repo: watson-developer-cloud/java-sdk
+      jdk: oraclejdk7
+      tags: true
 notifications:
   email: true
diff --git a/core/build.gradle b/core/build.gradle
@@ -75,6 +75,7 @@ dependencies {
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
     compile group: 'org.glassfish.jersey.bundles.repackaged', name: 'jersey-jsr166e', version: '2.25.1'
+    testCompile group: 'simple-jndi', name: 'simple-jndi', version: '0.11.4.1'
 
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 

diff --git a/core/src/test/java/com/ibm/watson/developer_cloud/util/CredentialUtilsTest.java b/core/src/test/java/com/ibm/watson/developer_cloud/util/CredentialUtilsTest.java
@@ -15,7 +15,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
 
 import java.io.InputStream;
 import java.util.Hashtable;
@@ -131,7 +130,6 @@ public void testGetUserCredentialsWithPlan() {
    */
   @Test
   public void testGetAPIUrlFromJDNI() {
-    assumeTrue(!System.getenv().containsKey("TRAVIS"));
     assertEquals(CredentialUtils.getAPIUrlTest(SERVICE_NAME), PERSONALITY_INSIGHTS_URL);
   }
 }
diff --git a/.../java/com/ibm/watson/developer_cloud/personality_insights/v3/PersonalityInsightsTest.java b/.../java/com/ibm/watson/developer_cloud/personality_insights/v3/PersonalityInsightsTest.java
@@ -218,13 +218,11 @@ public void testProfileBuilders() {
         .html(text)
         .contentLanguage(ProfileOptions.ContentLanguage.ES)
         .acceptLanguage(ProfileOptions.AcceptLanguage.EN)
-        .csvHeaders(true)
         .build();
     final ProfileOptions newOptions = options.newBuilder().build();
     assertEquals(newOptions.body(), text);
     assertEquals(newOptions.contentLanguage(), ProfileOptions.ContentLanguage.ES);
     assertEquals(newOptions.acceptLanguage(), ProfileOptions.AcceptLanguage.EN);
-    assertEquals(newOptions.csvHeaders(), true);
   }
 
   /**