Merge pull request #252 from watson-developer-cloud/update-to-okhttp3

v3.0.0

Author: germanattanasio

.travis.yml

@@ -2,21 +2,29 @@ sudo: false
 language: java
 install: /bin/true
 script: ./.utility/travis.sh
+
 jdk:
 - oraclejdk8
 - oraclejdk7
+
 cache:
   directories:
   - $HOME/.m2/repository
-before_install:
-- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_a973fe4f8e79_key -iv $encrypted_a973fe4f8e79_iv -in config.properties.enc -out src/test/resources/config.properties -d || true'
-- pip install --user codecov
-notifications:
-  email: false
+
 env:
   global:
   - secure: VvKBWj1OCu7SH+utwqe7kdli0N7jTYQ7D/citdFIV0cDjpcX3MwxfPcIeMvOuWLgJKaOSD4xnG9pOgMoLMMCGcsCHa2bqx78clA8t4sV7I0sx8pSN2Iuj/wQJvNV3/uEETC84+P9hKIt+o8JZqhgC1GEpz5fbyKyUIlRkspW1WQ=
+  - secure: oU2JnPAV8BSQurUpleD2QwPtF+/WTAeRokYBdTA2lrhp4XtExZ33PMjIdAyMCORtuPNYLWl/St7HpJNN0f63FlB7hWmZUq4UIHpMPhHR/H/32AwqZ9A99wNt873IPortlbxM2tKJRSCyIMzFSyoWXY1rVU0FE64Rrku6/lifQSQ=
+  - secure: eeYXzeW1kMU9Wbg6B6tjpzGq9rGliKlFtk+4zit3QxZsxsBver28YJVnpIhyaZlD3bZ4Pq5MmANV+zR/enRxQ3HaGMhDJO0fsyIpoA6D/qw7N/meMS7iBF66l/XH+XoMw8t/rxKyCyRy0FivNR2IGHBGlOOIM9GuIQyxXXPL0oI=
+
+before_install:
+- pip install --user codecov
+
 after_success:
 - codecov
 - mvn javadoc:javadoc
 - .utility/push-javadoc-to-gh-pages.sh
+- .utility/deploy_snapshot.sh
+
+notifications:
+  email: false

.utility/deploy_snapshot.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Deploy a jar, source jar, and javadoc jar to Sonatype's snapshot repo.
+#
+# Adapted from https://coderwall.com/p/9b_lfq and
+# http://benlimmer.com/2013/12/26/automatically-publish-javadoc-to-gh-pages-with-travis-ci/
+
+
+set -e -u
+
+if [ "$TRAVIS_REPO_SLUG" == "watson-developer-cloud/java-sdk" ] && \
+   [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && \
+   [ "$TRAVIS_PULL_REQUEST" == "false" ] && \
+   [ "$TRAVIS_BRANCH" == "master" ]; then
+  echo "Publishing Maven snapshot..."
+
+  mvn clean source:jar javadoc:jar deploy --settings=".utility/settings.xml" -DskipTests=true
+
+  echo "Maven snapshot published."
+fi

.utility/settings.xml

@@ -0,0 +1,9 @@
+<settings>
+  <servers>
+    <server>
+      <id>sonatype-nexus-snapshots</id>
+      <username>${env.CI_DEPLOY_USERNAME}</username>
+      <password>${env.CI_DEPLOY_PASSWORD}</password>
+    </server>
+  </servers>
+</settings>

.utility/travis.sh

@@ -2,7 +2,8 @@
 
 if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
 	echo '$TRAVIS_PULL_REQUEST is false, running all tests'
-	mvn clean cobertura:cobertura-integration-test
+  openssl aes-256-cbc -K $encrypted_a973fe4f8e79_key -iv $encrypted_a973fe4f8e79_iv -in config.properties.enc -out src/test/resources/config.properties -d
+  mvn clean cobertura:cobertura-integration-test
 else
 	echo '$TRAVIS_PULL_REQUEST is not false ($TRAVIS_PULL_REQUEST), running unit tests'
 	mvn clean test

CHANGELOG.md

@@ -0,0 +1,24 @@
+Change Log
+==========
+
+## Version 3.0.0-RC1
+
+_2016-04-22_
+
+The SDK 3.0 is designed around a new API that offers asynchronous callbacks
+in addition to synchronous blocking calls. It uses modern Java patterns like
+immutability and chained builders.
+
+ * New: Deprecated methods were removed
+ * Fix: Websockets issues during a recognition using Speech to Text
+ * New: Automatic snapshot deployments to Sonatype
+ * New: Chained builders for Speech to text and Tradeoff Analytics
+
+
+## Version 2.10.0
+
+_2016-04-18_
+
+ * Fix: Switch from String to Integer in AlchemyVision face recognition
+ * New: Enumerations for Languages in Language Translation
+ * Fix: Error in AlchemyLanguage when language wasn't specified