Merge branch 'master' of github.com:rosette-api/java

Author: Li Xu

json/src/test/java/com/basistech/rosette/apimodel/ModelTest.java

@@ -24,6 +24,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -58,7 +59,7 @@ public ModelTest(Boolean inputStreams) {
 
     @Parameterized.Parameters(name = "inputStreamContent: {0}")
     public static Collection<Object[]> data() {
-        return Lists.newArrayList(new Object[] {Boolean.FALSE}, new Object[] {Boolean.TRUE});
+        return Arrays.asList(new Object[] {Boolean.FALSE}, new Object[] {Boolean.TRUE});
     }
 
 

pom.xml

@@ -69,17 +69,22 @@
             <dependency>
                 <groupId>com.basistech</groupId>
                 <artifactId>common-api</artifactId>
-                <version>36.1.3</version>
+                <version>36.1.4</version>
             </dependency>
             <dependency>
                 <groupId>com.basistech</groupId>
                 <artifactId>adm-model</artifactId>
-                <version>2.4.0</version>
+                <version>2.4.3</version>
             </dependency>
             <dependency>
                 <groupId>com.basistech</groupId>
                 <artifactId>adm-json</artifactId>
-                <version>2.4.0</version>
+                <version>2.4.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>18.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>