Merge pull request #495 from marklogic/release/4.6.0

Merging release/4.6.0 to master

build.gradle

@@ -8,28 +8,33 @@ plugins {
 }
 
 group = "com.marklogic"
-version = "4.5.3"
+version = "4.6.0"
 
 java {
 	sourceCompatibility = 1.8
 	targetCompatibility = 1.8
 }
 
 repositories {
+	mavenLocal()
 	mavenCentral()
 	maven {
 		url "https://nexus.marklogic.com/repository/maven-snapshots/"
 	}
 }
 
 dependencies {
-	api 'com.marklogic:ml-javaclient-util:4.5.1'
-	api 'org.springframework:spring-web:5.3.27'
-	api 'com.fasterxml.jackson.core:jackson-databind:2.14.1'
+	api 'com.marklogic:ml-javaclient-util:4.6.0'
+	api 'org.springframework:spring-web:5.3.29'
+	api 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
 
 	implementation 'jaxen:jaxen:1.2.0'
-	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+
+	// Forcing usage of 3.4.0 instead of 3.2.0 to address vulnerability - https://security.snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKIO-5820002
+	implementation 'com.squareup.okio:okio:3.4.0'
+	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
 	implementation 'io.github.rburgst:okhttp-digest:2.7'
+
 	implementation 'org.apache.httpcomponents:httpclient:4.5.14'
 	implementation 'org.jdom:jdom2:2.0.6.1'
 
@@ -54,8 +59,8 @@ dependencies {
 	compileOnly "com.beust:jcommander:1.82"
 	compileOnly "ch.qos.logback:logback-classic:1.3.5"
 
-	testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
-	testImplementation 'org.springframework:spring-test:5.3.27'
+	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+	testImplementation 'org.springframework:spring-test:5.3.29'
 	testImplementation 'commons-io:commons-io:2.11.0'
 	testImplementation 'xmlunit:xmlunit:1.6'
 

pom.xml

@@ -12,7 +12,7 @@ It is not intended to be used to build this project.
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.marklogic</groupId>
   <artifactId>ml-app-deployer</artifactId>
-  <version>4.5.3</version>
+  <version>4.6.0</version>
   <name>com.marklogic:ml-app-deployer</name>
   <description>Java client for the MarkLogic REST Management API and for deploying applications to MarkLogic</description>
   <url>https://github.com/marklogic/ml-app-deployer</url>
@@ -40,19 +40,19 @@ It is not intended to be used to build this project.
     <dependency>
       <groupId>com.marklogic</groupId>
       <artifactId>ml-javaclient-util</artifactId>
-      <version>4.5.1</version>
+      <version>4.6.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>5.3.27</version>
+      <version>5.3.29</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.14.1</version>
+      <version>2.15.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

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

@@ -155,6 +155,11 @@ public class AppConfig {
 	private String cpfDatabaseName;
 	private String schemasDatabaseName;
 
+	// Since 4.6.0; affects loading of modules, schemas, and data.
+	// Disabled by default for backwards compatibility; will likely default to true in 5.0.0 release.
+	private boolean cascadeCollections;
+	private boolean cascadePermissions;
+
 	private List<String> modulePaths;
 	private boolean staticCheckAssets = false;
 	private boolean staticCheckLibraryAssets = false;
@@ -1535,4 +1540,20 @@ public String getAppServicesSamlToken() {
 	public void setAppServicesSamlToken(String appServicesSamlToken) {
 		this.appServicesSamlToken = appServicesSamlToken;
 	}
+
+	public boolean isCascadeCollections() {
+		return cascadeCollections;
+	}
+
+	public void setCascadeCollections(boolean cascadeCollections) {
+		this.cascadeCollections = cascadeCollections;
+	}
+
+	public boolean isCascadePermissions() {
+		return cascadePermissions;
+	}
+
+	public void setCascadePermissions(boolean cascadePermissions) {
+		this.cascadePermissions = cascadePermissions;
+	}
 }

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

@@ -791,6 +791,16 @@ public void initialize() {
 			config.setModulesLoaderBatchSize(Integer.parseInt(prop));
 		});
 
+		propertyConsumerMap.put("mlCascadeCollections", (config, prop) -> {
+			logger.info("Cascade collections.properties configuration when loading data, modules, and schemas: " + prop);
+			config.setCascadeCollections(Boolean.parseBoolean(prop));
+		});
+
+		propertyConsumerMap.put("mlCascadePermissions", (config, prop) -> {
+			logger.info("Cascade permissions.properties configuration when loading data, modules, and schemas: " + prop);
+			config.setCascadePermissions(Boolean.parseBoolean(prop));
+		});
+
 		/**
 		 * The following properties are all for generating Entity Services artifacts.
 		 */

src/main/java/com/marklogic/appdeployer/command/CommandContext.java

@@ -120,6 +120,11 @@ public Map<String, Object> getContextMap() {
 		return contextMap;
 	}
 
+	/**
+	 * @param contextMap
+	 * @deprecated since 4.6.0, will be removed in 5.0.0; the contextMap is not intended to be replaced.
+	 */
+	@Deprecated
 	public void setContextMap(Map<String, Object> contextMap) {
 		this.contextMap = contextMap;
 	}