Merge pull request #829 from watson-developer-cloud/develop

4.1.0

Author: germanattanasio

.bumpversion.cfg

@@ -0,0 +1,20 @@
+[bumpversion]
+current_version = 4.0.0
+
+[bumpversion:file:README.md]
+[bumpversion:file:alchemy/README.md]
+[bumpversion:file:conversation/README.md]
+[bumpversion:file:discovery/README.md]
+[bumpversion:file:document-conversion/README.md]
+[bumpversion:file:language-translator/README.md]
+[bumpversion:file:natural-language-classifier/README.md]
+[bumpversion:file:natural-language-understanding/README.md]
+[bumpversion:file:personality-insights/README.md]
+[bumpversion:file:retrieve-and-rank/README.md]
+[bumpversion:file:speech-to-text/README.md]
+[bumpversion:file:text-to-speech/README.md]
+[bumpversion:file:tone-analyzer/README.md]
+[bumpversion:file:tradeoff-analytics/README.md]
+[bumpversion:file:visual-recognition/README.md]
+search = {current_version}
+replace = {new_version}

.config.properties.enc

@@ -30,7 +30,7 @@ before_install:
   - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
 
 script:
-  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_3faf32fc672a_key -iv $encrypted_3faf32fc672a_iv -in .config.properties.enc -out core/src/test/resources/.config.properties -d || true'
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_b248e84a4806_key -iv $encrypted_b248e84a4806_iv -in config.properties.enc -out core/src/test/resources/config.properties -d || true'
   - ./gradlew install -x check
   - ./gradlew checkstyleMain
   - ./gradlew checkstyleTest

.travis.yml

@@ -4,7 +4,7 @@ if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" ]; then
 
   git config --global user.email "[email protected]"
   git config --global user.name "Watson Github Bot"
-  git clone --quiet --branch=gh-pages https://${GITHUB_TOKEN_DOCS}@github.com/watson-developer-cloud/java-sdk gh-pages > /dev/null
+  git clone --quiet --branch=gh-pages https://${GITHUB_TOKEN_DOCS}@github.com/watson-developer-cloud/java-sdk.git gh-pages > /dev/null
 
   pushd gh-pages
     # on tagged builds, $TRAVIS_BRANCH is the tag (e.g. v1.2.3), otherwise it's the branch name (e.g. master)

.utility/push-javadoc-to-gh-pages.sh

@@ -17,9 +17,26 @@ If you are not familiar with Sonatype and/or the maven release process please re
 
 ### Release steps
 
-  1. Update `README.md` to include the new version number
+  1. Update all READMEs to include the new version number
+
+     This can be done using [bumpversion]. If necessary, it can be installed with the following command:
+
+     ```bash
+     pip install bumpversion
+     ```
+
+     To then update all version numbers, simply run:
+
+     ```bash
+     bumpversion major|minor|patch
+     ```
+
   1. Perform a release deployment to OSSRH (Staging) with:
 
-    `gradle release`
+     ```bash
+     `gradle release`
+     ```
+
+     You will have to answer prompts for versions and tags. That will tag and commit a new version into your repository automatically.
 
-    You will have to answer prompts for versions and tags. That will tag and commit a new version into your repository automatically.
+[bumpversion]: https://pypi.python.org/pypi/bumpversion

RELEASE.md

@@ -84,6 +84,7 @@ public void testGetImageFromURL() {
   /**
    * Test get image with HTML.
    */
+  @Ignore
   @Test
   public void testGetImageWithHTML() {
     final ImageLink image = service.getImageLink(htmlExample).execute();

alchemy/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyVisionIT.java

@@ -19,28 +19,31 @@
 import com.ibm.watson.developer_cloud.util.GsonSerializationHelper;
 
 /**
-* Context information for the message. Include the context from the previous response to maintain state for the
+ * Context information for the message. Include the context from the previous response to maintain state for the
  * conversation.
-*/
+ */
 public class Context extends DynamicModel {
-  private Type conversationIdType = new TypeToken<String>() { } .getType();
-  private Type systemType = new TypeToken<SystemResponse>() { } .getType();
+  private Type conversationIdType = new TypeToken<String>() {
+  }.getType();
+  private Type systemType = new TypeToken<SystemResponse>() {
+  }.getType();
 
   /**
    * Gets the conversationId.
    *
    * @return the conversationId
    */
   public String getConversationId() {
-      return GsonSerializationHelper.serializeDynamicModelProperty(this.get("conversationId"), conversationIdType);
+    return GsonSerializationHelper.serializeDynamicModelProperty(this.get("conversation_id"), conversationIdType);
   }
+
   /**
    * Gets the system.
    *
    * @return the system
    */
   public SystemResponse getSystem() {
-      return GsonSerializationHelper.serializeDynamicModelProperty(this.get("system"), systemType);
+    return GsonSerializationHelper.serializeDynamicModelProperty(this.get("system"), systemType);
   }
 
   /**
@@ -49,7 +52,7 @@ public SystemResponse getSystem() {
    * @param conversationId the new conversationId
    */
   public void setConversationId(final String conversationId) {
-    this.put("conversationId", conversationId);
+    this.put("conversation_id", conversationId);
   }
 
   /**
@@ -61,4 +64,3 @@ public void setSystem(final SystemResponse system) {
     this.put("system", system);
   }
 }
-