Merge pull request #140 from rosette-api/rosapi-18.12

Rosapi 18.12

Author: seth-mg

.travis.yml

@@ -1,9 +1,7 @@
 language: java
-# Javadoc exclusions don't work with JDK 1.7.
-script: mvn -Dmaven.javadoc.skip=true clean verify
+script: mvn clean verify
 jdk:
 - oraclejdk8
-- openjdk7
 - openjdk8
 
 # suggested by travis support.

annotations/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.11.103-SNAPSHOT</version>
+        <version>1.11.104-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-annotations</artifactId>
     <name>rosette-api-annotations</name>

api/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
          <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.11.103-SNAPSHOT</version>
+        <version>1.11.104-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api</artifactId>
     <name>rosette-api</name>
@@ -61,11 +61,6 @@
             <artifactId>httpmime</artifactId>
             <version>${http-components-version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

api/src/main/java/com/basistech/rosette/api/HttpRosetteAPI.java

@@ -35,7 +35,6 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import com.google.common.io.ByteStreams;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHeaders;
@@ -61,6 +60,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -159,7 +159,18 @@ private static String getVersion() {
      * @throws IOException
      */
     private static byte[] getBytes(InputStream is) throws IOException {
-        return ByteStreams.toByteArray(is);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        byte[] buf = new byte[4096];
+
+        while (true) {
+            int r = is.read(buf);
+            if (r == -1) {
+                out.flush();
+                return out.toByteArray();
+            }
+            out.write(buf, 0, r);
+        }
     }
 
     private void initClient(String key, List<Header> additionalHeaders) {

common/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.11.103-SNAPSHOT</version>
+        <version>1.11.104-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-common</artifactId>
     <name>rosette-api-common</name>

examples/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.11.103-SNAPSHOT</version>
+        <version>1.11.104-SNAPSHOT</version>
     </parent>
     <groupId>com.basistech.rosette</groupId>
     <artifactId>rosette-api-examples</artifactId>

json/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.11.103-SNAPSHOT</version>
+        <version>1.11.104-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-json</artifactId>
     <name>rosette-api-json</name>

model/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.11.103-SNAPSHOT</version>
+        <version>1.11.104-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-model</artifactId>
     <name>rosette-api-model</name>

pom.xml

@@ -18,11 +18,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.basistech.rosette</groupId>
     <artifactId>rosette-api-java-binding</artifactId>
-    <version>1.11.103-SNAPSHOT</version>
+    <version>1.11.104-SNAPSHOT</version>
     <parent>
         <artifactId>open-source-parent</artifactId>
         <groupId>com.basistech</groupId>
-        <version>1.1.10</version>
+        <version>2.0.0</version>
         <relativePath />
     </parent>
     <packaging>pom</packaging>
@@ -69,17 +69,17 @@
             <dependency>
                 <groupId>com.basistech</groupId>
                 <artifactId>common-api</artifactId>
-                <version>36.2.0</version>
+                <version>37.0.0</version>
             </dependency>
             <dependency>
                 <groupId>com.basistech</groupId>
                 <artifactId>adm-model</artifactId>
-                <version>2.4.4</version>
+                <version>2.4.6</version>
             </dependency>
             <dependency>
                 <groupId>com.basistech</groupId>
                 <artifactId>adm-json</artifactId>
-                <version>2.4.4</version>
+                <version>2.4.6</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

release/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.11.103-SNAPSHOT</version>
+        <version>1.11.104-SNAPSHOT</version>
     </parent>
     <groupId>com.basistech.rosette</groupId>
     <artifactId>rosette-api-release</artifactId>