Now using 2.5 of ml-javaclient-util and ml-junit

Author: rjrudin

CHANGELOG.mdown

@@ -1,8 +1,9 @@
 # ml-app-deployer releases
 
 
-## 2.0rc2 - TBD
+## 2.0rc2 - 2016-01-03
 
+* Depends on 2.5 of ml-javaclient-util and ml-junit
 * [#73](https://github.com/rjrudin/ml-app-deployer/issues/73) Added support for setting a FileFilter on AppConfig for controlling what assets are loaded
 
 ## 2.0rc1 - 2015-12-23

build.gradle

@@ -11,14 +11,15 @@ targetCompatibility = "1.7"
 
 repositories {
   jcenter()
+  maven {url "http://developer.marklogic.com/maven2/"}
 }
 
 dependencies {
-  compile 'com.marklogic:ml-javaclient-util:2.4'
+  compile 'com.marklogic:ml-javaclient-util:2.5'
   compile 'jaxen:jaxen:1.1.6'
   compile 'org.apache.httpcomponents:httpclient:4.3.5'
   compile 'org.springframework:spring-web:4.1.5.RELEASE'
-  testCompile 'com.marklogic:ml-junit:2.4'
+  testCompile 'com.marklogic:ml-junit:2.5'
 }
 
 // This ensures that Gradle includes in the published jar any non-java files under src/main/java
@@ -59,7 +60,7 @@ if (project.hasProperty("myBintrayUser")) {
       licenses = ['Apache-2.0']
       vcsUrl = 'https://github.com/rjrudin/' + project.name + '.git'
       version {
-        name = "2.0rc1"
+        name = "2.0rc2"
         released = new Date()
       }
     }

gradle.properties

@@ -1,7 +1,7 @@
 group=com.marklogic
 publishUrl=file:../gh-pages-marklogic-java/releases
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=2.0rc1
+version=2.0rc2
 
 
 # Old CHANGELOG

src/main/java/com/marklogic/mgmt/api/API.java

@@ -360,7 +360,7 @@ protected <T extends Resource> T getResource(String resourceNameOrId, ResourceMa
 
     protected <T extends Resource> T buildFromJson(String json, Class<T> clazz) {
         try {
-            T resource = getObjectMapper().readerFor(clazz).readValue(json);
+            T resource = getObjectMapper().reader(clazz).readValue(json);
             resource.setApi(this);
             resource.setObjectMapper(getObjectMapper());
             return resource;