Merge branch 'dev'

Author: rjrudin

gradle.properties

@@ -1,6 +1,6 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=3.3.0
-mlJavaclientUtilVersion=3.3.0
+version=3.3.1
+mlJavaclientUtilVersion=3.3.1
 mlJunitVersion=3.1.0
 

src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java

@@ -514,8 +514,13 @@ public AppConfig newAppConfig() {
 
 		prop = getProperty("mlModuleTimestampsPath");
 		if (prop != null) {
-			logger.info("Module timestamps path: " + prop);
-			c.setModuleTimestampsPath(prop);
+			if (prop.trim().length() == 0) {
+				logger.info("Disabling use of module timestamps file");
+				c.setModuleTimestampsPath(null);
+			} else {
+				logger.info("Module timestamps path: " + prop);
+				c.setModuleTimestampsPath(prop);
+			}
 		}
 
 		prop = getProperty("mlModulesRegex");

src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java

@@ -33,6 +33,14 @@ public void springStyleProperties() {
         assertEquals("springuser", config.getRestAdminUsername());
     }
 
+    @Test
+    public void moduleTimestampsPath() {
+	    Properties p = new Properties();
+	    p.setProperty("mlModuleTimestampsPath", "");
+	    AppConfig config = new DefaultAppConfigFactory(new SimplePropertySource(p)).newAppConfig();
+	    assertNull(config.getModuleTimestampsPath());
+    }
+    
     @Test
     public void unrecognizedProperties() {
         sut = new DefaultAppConfigFactory(new SimplePropertySource("foo.mlHost", "host", "foo.mlUsername", "user"));