diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 346de06b7e0..80940870e3a 100644 --- 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 index 404a58eac3a..7fbae78676e 100644 --- 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 index 135b8d0780d..35f3d5f52e2 100644 --- 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 index 20cd17ec7c0..445d344d1b4 100644 --- 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/personality-insights/src/test/java/com/ibm/watson/developer_cloud/personality_insights/v3/PersonalityInsightsTest.java b/personality-insights/src/test/java/com/ibm/watson/developer_cloud/personality_insights/v3/PersonalityInsightsTest.java index 9d97168fb2f..86fe85d0f6c 100644 --- a/personality-insights/src/test/java/com/ibm/watson/developer_cloud/personality_insights/v3/PersonalityInsightsTest.java +++ b/personality-insights/src/test/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); } /**