Merge pull request #695 from marklogic/dev

BillFarber · web-flow · commit 8c93337c94e2 · 2024-05-16T17:07:00.000-04:00
Merge 4.8.0 changes into master
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ First, [install Gradle](https://gradle.org/install/).
 
 Then, in an empty directory, create a file named "build.gradle" with your favorite text editor and enter the following:
 
-    plugins { id "com.marklogic.ml-gradle" version "4.7.0" }
+    plugins { id "com.marklogic.ml-gradle" version "4.8.0" }
     
 Then run:
 
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
   id "com.gradle.plugin-publish" version "1.2.1"
 	id "java-gradle-plugin"
 
-	id "net.saliman.properties" version "1.5.1"
+	id "net.saliman.properties" version "1.5.2"
 	id "io.snyk.gradle.plugin.snykplugin" version "0.4"
 }
 
@@ -17,7 +17,7 @@ if (project.hasProperty("signing.keyId")) {
 }
 
 group = "com.marklogic"
-version = "4.7.0"
+version = "4.8.0"
 
 java {
 	sourceCompatibility = 1.8
@@ -36,10 +36,10 @@ dependencies {
   implementation gradleApi()
 	implementation localGroovy()
 
-	api 'com.marklogic:ml-app-deployer:4.7.0'
+	api 'com.marklogic:ml-app-deployer:4.8.0'
 	implementation "com.marklogic:mlcp-util:1.0.1"
-	implementation "com.marklogic:marklogic-data-movement-components:2.7.0"
-	implementation "commons-io:commons-io:2.15.1"
+	implementation "com.marklogic:marklogic-data-movement-components:2.8.0"
+	implementation "commons-io:commons-io:2.16.1"
 
 	compileOnly "com.marklogic:marklogic-unit-test-client:1.4.0"
 
@@ -49,7 +49,7 @@ dependencies {
 
 	// Force spock-core to use 4.13.2 to avoid security issue in 4.11
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation('org.spockframework:spock-core:2.1-groovy-3.0') {
+	testImplementation('org.spockframework:spock-core:2.3-groovy-3.0') {
 		exclude module: 'groovy-all'
 	}
 }
diff --git a/examples/alert-project/build.gradle b/examples/alert-project/build.gradle
@@ -1,7 +1,7 @@
 plugins {
   id "java"
   id "eclipse"
-  id "com.marklogic.ml-gradle" version "4.7.0"
+  id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 repositories {
diff --git a/examples/corb2-project/build.gradle b/examples/corb2-project/build.gradle
@@ -21,7 +21,7 @@ buildscript {
 }
 
 plugins {
-    id "com.marklogic.ml-gradle" version "4.7.0"
+    id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 repositories {
diff --git a/examples/cpf-project/build.gradle b/examples/cpf-project/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
 	id "eclipse"
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 repositories {
diff --git a/examples/custom-forests-and-replicas-project/build.gradle b/examples/custom-forests-and-replicas-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/custom-rest-rewriter-project/build.gradle b/examples/custom-rest-rewriter-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 task generateCustomRewriterModules {
diff --git a/examples/data-services/build.gradle b/examples/data-services/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
-	id "net.saliman.properties" version "1.5.1"
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "net.saliman.properties" version "1.5.2"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 	id 'com.marklogic.ml-development-tools' version '6.0.0'
 }
 
diff --git a/examples/dependency-project/ml-gradle-client-project/build.gradle b/examples/dependency-project/ml-gradle-client-project/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-	id "net.saliman.properties" version "1.5.1"
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "net.saliman.properties" version "1.5.2"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 repositories {
diff --git a/examples/disconnected-project-using-plugins-and-gradlew/build.gradle b/examples/disconnected-project-using-plugins-and-gradlew/build.gradle
@@ -13,8 +13,8 @@ buildscript {
 
 plugins {
 	id 'java' //optional - delete if not needed
-	id 'net.saliman.properties' version '1.5.1'
-	id 'com.marklogic.ml-gradle' version "4.7.0"
+	id 'net.saliman.properties' version '1.5.2'
+	id 'com.marklogic.ml-gradle' version "4.8.0"
 }
 
 repositories {
diff --git a/examples/disconnected-project/gradle.properties b/examples/disconnected-project/gradle.properties
@@ -1,4 +1,4 @@
-mlGradleDependency=com.marklogic:ml-gradle:4.7.0
+mlGradleDependency=com.marklogic:ml-gradle:4.8.0
 mlSalimanDependency=net.saliman:gradle-properties-plugin:1.4.6
 
 mlHost=localhost
diff --git a/examples/docker-projects/single-node-with-nifi/build.gradle b/examples/docker-projects/single-node-with-nifi/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     // gradle -PenvironmentName=x ...
-    id 'net.saliman.properties' version '1.5.1'
-    id "com.marklogic.ml-gradle" version "4.7.0"
+    id 'net.saliman.properties' version '1.5.2'
+    id "com.marklogic.ml-gradle" version "4.8.0"
     id 'com.avast.gradle.docker-compose' version "0.6.11"
 }
 dockerCompose {
diff --git a/examples/docker-projects/single-node/build.gradle b/examples/docker-projects/single-node/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     // gradle -PenvironmentName=x ...
-    id 'net.saliman.properties' version '1.5.1'
-    id "com.marklogic.ml-gradle" version "4.7.0"
+    id 'net.saliman.properties' version '1.5.2'
+    id "com.marklogic.ml-gradle" version "4.8.0"
     id 'com.avast.gradle.docker-compose' version "0.6.11"
 }
 dockerCompose {
diff --git a/examples/docker-projects/three-node-cluster-with-ha-proxy/build.gradle b/examples/docker-projects/three-node-cluster-with-ha-proxy/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'net.saliman.properties' version '1.5.1'
-    id "com.marklogic.ml-gradle" version "4.7.0"
+    id 'net.saliman.properties' version '1.5.2'
+    id "com.marklogic.ml-gradle" version "4.8.0"
     id 'com.avast.gradle.docker-compose' version "0.6.11"
 }
 dockerCompose {
diff --git a/examples/entity-services-project/build.gradle b/examples/entity-services-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/external-security/build.gradle b/examples/external-security/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/failover-project/build.gradle b/examples/failover-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/flexrep-project/build.gradle b/examples/flexrep-project/build.gradle
@@ -11,7 +11,7 @@
  */
 
 plugins {
-  id "com.marklogic.ml-gradle" version "4.7.0"
+  id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 ext {
diff --git a/examples/flexrep-with-path-project/build.gradle b/examples/flexrep-with-path-project/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     mavenLocal()
   }
   dependencies {
-    classpath "com.marklogic:ml-gradle:4.7.0"
+    classpath "com.marklogic:ml-gradle:4.8.0"
   }
 }
 
diff --git a/examples/httpbuilder-project/build.gradle b/examples/httpbuilder-project/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 }
 
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 /*
diff --git a/examples/ignore-resources-project/build.gradle b/examples/ignore-resources-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 ext {
diff --git a/examples/jdbc-project/build.gradle b/examples/jdbc-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 	id "java"
 }
 
diff --git a/examples/local-testing-project/build.gradle b/examples/local-testing-project/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 }
 
 plugins {
-	id "net.saliman.properties" version "1.5.1"
+	id "net.saliman.properties" version "1.5.2"
 	id "java"
 }
 
diff --git a/examples/local-testing-project/gradle.properties b/examples/local-testing-project/gradle.properties
@@ -1,6 +1,6 @@
 # Set this to the version you used when running
 # "gradle -Pversion=(something) publishToMavenLocal" on your local ml-gradle repo
-mlGradleVersion=4.7.0
+mlGradleVersion=4.8.0
 
 mlHost=localhost
 mlAppName=example
diff --git a/examples/marklogic-cloud-project/build.gradle b/examples/marklogic-cloud-project/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 }
 
 plugins {
-	id "net.saliman.properties" version "1.5.1"
+	id "net.saliman.properties" version "1.5.2"
 }
 
 apply plugin: "com.marklogic.ml-gradle"
diff --git a/examples/marklogic-cloud-project/gradle.properties b/examples/marklogic-cloud-project/gradle.properties
@@ -1,6 +1,6 @@
 # Set this to the version you used when running
 # "gradle -Pversion=(something) publishToMavenLocal" on your local ml-gradle repo
-mlGradleVersion=4.7.0
+mlGradleVersion=4.8.0
 
 mlAppName=cloud-test
 
diff --git a/examples/maven-project/build.gradle b/examples/maven-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/mimetypes-project/build.gradle b/examples/mimetypes-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-  id "com.marklogic.ml-gradle" version "4.7.0"
+  id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/minimal-project/build.gradle b/examples/minimal-project/build.gradle
@@ -7,5 +7,5 @@
  */
 
 plugins {
-  id "com.marklogic.ml-gradle" version "4.7.0"
+  id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/mlcp-project/build.gradle b/examples/mlcp-project/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath "com.marklogic:ml-gradle:4.7.0"
+		classpath "com.marklogic:ml-gradle:4.8.0"
 	}
 }
 
diff --git a/examples/no-appservers-project/build.gradle b/examples/no-appservers-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-  id "com.marklogic.ml-gradle" version "4.7.0"
+  id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/partition-project/gradle.properties b/examples/partition-project/gradle.properties
@@ -1,4 +1,4 @@
-mlGradleVersion=4.7.0
+mlGradleVersion=4.8.0
 
 mlHost=localhost
 mlAppName=partition-example
diff --git a/examples/properties-project/build.gradle b/examples/properties-project/build.gradle
@@ -3,7 +3,7 @@ plugins {
 	// processing the gradle-(environmentName).properties files.
 	id "net.saliman.properties" version "1.4.6"
 
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 task printHost {
diff --git a/examples/qbv-example/build.gradle b/examples/qbv-example/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 repositories {
diff --git a/examples/redaction-ruleset-project/build.gradle b/examples/redaction-ruleset-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 repositories {
diff --git a/examples/role-project/build.gradle b/examples/role-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/roxy-project/build.gradle b/examples/roxy-project/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 		mavenLocal()
 	}
 	dependencies {
-		classpath "com.marklogic:ml-gradle:4.7.0"
+		classpath "com.marklogic:ml-gradle:4.8.0"
 	}
 }
 
diff --git a/examples/sample-project/build.gradle b/examples/sample-project/build.gradle
@@ -8,14 +8,14 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath "com.marklogic:ml-gradle:4.7.0"
+		classpath "com.marklogic:ml-gradle:4.8.0"
 	}
 }
 
 plugins {
 	// The following plugins are optional
 
-	id "net.saliman.properties" version "1.5.1"
+	id "net.saliman.properties" version "1.5.2"
 
 	// The Java plugin is used to compile and run JUnit tests
 	id "java"
diff --git a/examples/schemas-project/build.gradle b/examples/schemas-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/ssl-2way-project/build.gradle b/examples/ssl-2way-project/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-	id "net.saliman.properties" version "1.5.1"
-  id "com.marklogic.ml-gradle" version "4.7.0"
+	id "net.saliman.properties" version "1.5.2"
+  id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 
diff --git a/examples/ssl-project/build.gradle b/examples/ssl-project/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-	id "net.saliman.properties" version "1.5.1"
-  id "com.marklogic.ml-gradle" version "4.7.0"
+	id "net.saliman.properties" version "1.5.2"
+  id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 /*
diff --git a/examples/temporal-lsqt-project/build.gradle b/examples/temporal-lsqt-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/temporal-project/build.gradle b/examples/temporal-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "4.7.0"
+	id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/triggers-project/build.gradle b/examples/triggers-project/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 		mavenLocal()
 	}
 	dependencies {
-		classpath "com.marklogic:ml-gradle:4.7.0"
+		classpath "com.marklogic:ml-gradle:4.8.0"
 	}
 }
 
diff --git a/examples/uni-temporal-project/build.gradle b/examples/uni-temporal-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-  id "com.marklogic.ml-gradle" version "4.7.0"
+  id "com.marklogic.ml-gradle" version "4.8.0"
 }
diff --git a/examples/unit-test-project/gradle.properties b/examples/unit-test-project/gradle.properties
@@ -1,4 +1,4 @@
-mlGradleVersion=4.7.0
+mlGradleVersion=4.8.0
 marklogicUnitTestVersion=1.4.0
 
 mlHost=localhost
diff --git a/examples/use-modulesdb-project/build.gradle b/examples/use-modulesdb-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.marklogic.ml-gradle" version "4.7.0"
+  id "com.marklogic.ml-gradle" version "4.8.0"
 }
 
 ext {
diff --git a/pom.xml b/pom.xml
diff --git a/src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy b/src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy
diff --git a/src/main/groovy/com/marklogic/gradle/task/MlcpTask.groovy b/src/main/groovy/com/marklogic/gradle/task/MlcpTask.groovy
diff --git a/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy b/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy
diff --git a/src/main/groovy/com/marklogic/gradle/task/security/DeployCredentialsTask.groovy b/src/main/groovy/com/marklogic/gradle/task/security/DeployCredentialsTask.groovy
diff --git a/src/main/groovy/com/marklogic/gradle/task/security/UndeployCredentialsTask.groovy b/src/main/groovy/com/marklogic/gradle/task/security/UndeployCredentialsTask.groovy

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id "java"`
`3`	`3`	`id "eclipse"`
`4`		`- id "com.marklogic.ml-gradle" version "4.7.0"`
	`4`	`+ id "com.marklogic.ml-gradle" version "4.8.0"`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ buildscript {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`plugins {`
`24`		`- id "com.marklogic.ml-gradle" version "4.7.0"`
	`24`	`+ id "com.marklogic.ml-gradle" version "4.8.0"`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`plugins {`
`2`		`- id "com.marklogic.ml-gradle" version "4.7.0"`
	`2`	`+ id "com.marklogic.ml-gradle" version "4.8.0"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id "com.marklogic.ml-gradle" version "4.7.0"`
	`2`	`+ id "com.marklogic.ml-gradle" version "4.8.0"`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`task generateCustomRewriterModules {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`		`- id "net.saliman.properties" version "1.5.1"`
`3`		`- id "com.marklogic.ml-gradle" version "4.7.0"`
	`2`	`+ id "net.saliman.properties" version "1.5.2"`
	`3`	`+ id "com.marklogic.ml-gradle" version "4.8.0"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ buildscript {`
`13`	`13`
`14`	`14`	`plugins {`
`15`	`15`	`id 'java' //optional - delete if not needed`
`16`		`- id 'net.saliman.properties' version '1.5.1'`
`17`		`- id 'com.marklogic.ml-gradle' version "4.7.0"`
	`16`	`+ id 'net.saliman.properties' version '1.5.2'`
	`17`	`+ id 'com.marklogic.ml-gradle' version "4.8.0"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`repositories {`