Merge branch 'master' into dev

Author: rjrudin

build.gradle

@@ -15,12 +15,12 @@ repositories {
 
 dependencies {
   compile 'com.marklogic:java-client-api:3.0.5'
-  compile 'com.marklogic:marklogic-xcc:8.0.4'
+  compile 'com.marklogic:marklogic-xcc:8.0.5'
   compile 'org.jdom:jdom2:2.0.5'
-  compile 'org.springframework:spring-context:4.1.5.RELEASE'
+  compile 'org.springframework:spring-context:4.3.4.RELEASE'
 
   testCompile 'junit:junit:4+'
-  testCompile 'org.springframework:spring-test:4.1.5.RELEASE'
+  testCompile 'org.springframework:spring-test:4.3.4.RELEASE'
 
   // Used for testing loading modules from the classpath
   testRuntime files("lib/modules.jar")

src/test/java/com/marklogic/client/modulesloader/impl/LoadModulesTest.java

@@ -77,7 +77,6 @@ public void staticCheckAndCheckLibraryModules() {
 			fail("The load should have failed because of the bad library module");
 		} catch (RuntimeException ex) {
 			System.out.println(ex.getMessage());
-			assertTrue(ex.getMessage().contains("Static check failed for module at URI: /ext/bad-lib.xqy"));
 			assertTrue(ex.getMessage().contains("in /ext/bad-lib.xqy, on line 7"));
 		}
 	}
@@ -110,7 +109,6 @@ public void bulkLoadAndStaticCheckAndCheckLibraryModules() {
 			modulesLoader.loadModules(dir, new DefaultModulesFinder(), client);
 			fail("The load should have failed because of the bad library module");
 		} catch (Exception ex) {
-			assertTrue(ex.getMessage().contains("Bulk static check failure"));
 			assertTrue(ex.getMessage().contains("in /ext/bad-lib.xqy, on line 7"));
 		}
 	}