Merge pull request #664 from marklogic/release/4.5.3

rjrudin · web-flow · commit b4aa51b2d8fc · 2023-08-24T10:45:50.000-07:00
Release/4.5.3
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1,5 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# These owners will be the default owners for everything in the repo.
+* @anu3990 @billfarber @rjrudin
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ running Gradle 7 or higher, you'll need to use ml-gradle 4.3.0 or higher.
 
 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.5.2" }
+    plugins { id "com.marklogic.ml-gradle" version "4.5.3" }
     
 Then run:
 
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ plugins {
 }
 
 group = "com.marklogic"
-version = "4.5.2"
+version = "4.5.3"
 
 java {
 	sourceCompatibility = 1.8
@@ -31,7 +31,7 @@ dependencies {
   implementation gradleApi()
 	implementation localGroovy()
 
-	api 'com.marklogic:ml-app-deployer:4.5.2'
+	api 'com.marklogic:ml-app-deployer:4.5.3'
 	implementation "com.marklogic:mlcp-util:1.0.1"
 	implementation "com.marklogic:marklogic-data-movement-components:2.6.0"
 	implementation "commons-io:commons-io:2.11.0"
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.5.2"
+  id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 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.5.2"
+    id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 	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
@@ -10,7 +10,7 @@
 
 plugins {
 	id "net.saliman.properties" version "1.5.1"
-	id "com.marklogic.ml-gradle" version "4.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 //apply plugin: "com.marklogic.ml-gradle"
diff --git a/examples/disconnected-project-using-plugins-and-gradlew/build.gradle b/examples/disconnected-project-using-plugins-and-gradlew/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 plugins {
 	id 'java' //optional - delete if not needed
 	id 'net.saliman.properties' version '1.5.1'
-	id 'com.marklogic.ml-gradle' version "4.5.2"
+	id 'com.marklogic.ml-gradle' version "4.5.3"
 }
 
 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.5.2
+mlGradleDependency=com.marklogic:ml-gradle:4.5.3
 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.5.2"
+    id "com.marklogic.ml-gradle" version "4.5.3"
     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.5.2"
+    id "com.marklogic.ml-gradle" version "4.5.3"
     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.5.2"
+    id "com.marklogic.ml-gradle" version "4.5.3"
     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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
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.5.2"
+  id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 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.5.2"
+    classpath "com.marklogic:ml-gradle:4.5.3"
   }
 }
 
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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 /*
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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 	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.5.2
+mlGradleVersion=4.5.3
 
 mlHost=localhost
 mlAppName=example
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.5.2
+mlGradleVersion=4.5.3
 
 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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
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.5.2"
+  id "com.marklogic.ml-gradle" version "4.5.3"
 }
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.5.2"
+  id "com.marklogic.ml-gradle" version "4.5.3"
 }
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.5.2"
+		classpath "com.marklogic:ml-gradle:4.5.3"
 	}
 }
 
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.5.2"
+  id "com.marklogic.ml-gradle" version "4.5.3"
 }
diff --git a/examples/partition-project/gradle.properties b/examples/partition-project/gradle.properties
@@ -1,4 +1,4 @@
-mlGradleVersion=4.5.2
+mlGradleVersion=4.5.3
 
 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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 task printHost {
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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
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.5.2"
+		classpath "com.marklogic:ml-gradle:4.5.3"
 	}
 }
 
diff --git a/examples/sample-project/build.gradle b/examples/sample-project/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath "com.marklogic:ml-gradle:4.5.2"
+		classpath "com.marklogic:ml-gradle:4.5.3"
 	}
 }
 
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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
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.5.2"
+  id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 
diff --git a/examples/ssl-project/README.md b/examples/ssl-project/README.md
@@ -1,7 +1,12 @@
-This project shows how to use a certificate template to enable SSL connections on an app server (in this case, the
-REST API server). Two things to note in this project:
+This project demonstrates how to use a certificate template to enable SSL connections on an app server. 
 
-1. The src/main/ml-config/servers/rest-api-server.json config file shows an example of referring to the ID of a 
-certificate template.
-1. The gradle.properties file shows how the mlSimpleSsl property is used to tell ml-gradle to use an SSL connection 
-when loading modules. 
+The project currently uses the `mlSimpleSsl` property to tell ml-gradle to use a "trust everything" approach for 
+communicating with the project's REST API server. This is only used for demonstration purposes and is not recommended
+for a production environment. See 
+[this guide on SSL with ml-gradle](https://github.com/marklogic/ml-gradle/wiki/Loading-modules-via-SSL) for 
+information on properly configuring SSL usage. 
+
+Note the inclusion of an `ext` block in this project's `build.gradle` file. This automates the generation of a temp 
+certificate for the certificate template. This can also be accomplished by updating the app server via the MarkLogic
+Admin UI; the Admin UI will check for a temp for the app server's certificate template and will create one if it does
+not yet exist. 
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.5.2"
+  id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 /*
diff --git a/examples/ssl-project/gradle.properties b/examples/ssl-project/gradle.properties
@@ -2,14 +2,12 @@ mlHost=localhost
 mlAppName=ssl-project
 mlRestPort=8180
 mlUsername=admin
-mlPassword=admin
+mlPassword=change in gradle-local.properties
 
 # Since the REST API server for this sample project is configured to use a certificate template for SSL, we set this
 # property to use a very simple SSLContext for communicating with the REST API server. This SSLContext is required for
 # loading modules - i.e. in order to load options/services/transforms via the REST API server, we need an SSL connection.
 #
-# You can configure a more sophisticated SSLContext by setting the restSslContext property on mlAppConfig in an ext block in build.gradle.
-#
 # Starting in 3.17.0, there are additional properties for configuring an SSL connection based on the JVM's
 # default keystore. See the Property Reference page in the ml-gradle Wiki for more information.
 mlSimpleSsl=true
diff --git a/examples/ssl-project/src/main/ml-config/servers/README.md b/examples/ssl-project/src/main/ml-config/servers/README.md
diff --git a/examples/ssl-project/src/main/ml-config/servers/rest-api-server.json b/examples/ssl-project/src/main/ml-config/servers/rest-api-server.json
@@ -1,5 +1,4 @@
 {
   "server-name": "%%NAME%%",
-  "authentication": "digestbasic",
-  "ssl-certificate-template": "%%certificate-templates-id-ssl-project-template%%"
+  "ssl-certificate-template": "ssl-project-template"
 }
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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
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.5.2"
+	id "com.marklogic.ml-gradle" version "4.5.3"
 }
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.5.2"
+		classpath "com.marklogic:ml-gradle:4.5.3"
 	}
 }
 
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.5.2"
+  id "com.marklogic.ml-gradle" version "4.5.3"
 }
diff --git a/examples/unit-test-project/gradle.properties b/examples/unit-test-project/gradle.properties
@@ -1,4 +1,4 @@
-mlGradleVersion=4.5.2
+mlGradleVersion=4.5.3
 marklogicUnitTestVersion=1.3.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.5.2"
+  id "com.marklogic.ml-gradle" version "4.5.3"
 }
 
 ext {
diff --git a/pom.xml b/pom.xml
diff --git a/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy b/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.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.5.2"`
	`4`	`+ id "com.marklogic.ml-gradle" version "4.5.3"`
`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.5.2"`
	`24`	`+ id "com.marklogic.ml-gradle" version "4.5.3"`
`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.5.2"`
	`2`	`+ id "com.marklogic.ml-gradle" version "4.5.3"`
`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.5.2"`
	`2`	`+ id "com.marklogic.ml-gradle" version "4.5.3"`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`task generateCustomRewriterModules {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`plugins {`
`12`	`12`	`id "net.saliman.properties" version "1.5.1"`
`13`		`- id "com.marklogic.ml-gradle" version "4.5.2"`
	`13`	`+ id "com.marklogic.ml-gradle" version "4.5.3"`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`//apply plugin: "com.marklogic.ml-gradle"`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ buildscript {`
`14`	`14`	`plugins {`
`15`	`15`	`id 'java' //optional - delete if not needed`
`16`	`16`	`id 'net.saliman.properties' version '1.5.1'`
`17`		`- id 'com.marklogic.ml-gradle' version "4.5.2"`
	`17`	`+ id 'com.marklogic.ml-gradle' version "4.5.3"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-mlGradleDependency=com.marklogic:ml-gradle:4.5.2`
	`1`	`+mlGradleDependency=com.marklogic:ml-gradle:4.5.3`
`2`	`2`	`mlSalimanDependency=net.saliman:gradle-properties-plugin:1.4.6`
`3`	`3`
`4`	`4`	`mlHost=localhost`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`// gradle -PenvironmentName=x ...`
`3`	`3`	`id 'net.saliman.properties' version '1.5.1'`
`4`		`- id "com.marklogic.ml-gradle" version "4.5.2"`
	`4`	`+ id "com.marklogic.ml-gradle" version "4.5.3"`
`5`	`5`	`id 'com.avast.gradle.docker-compose' version "0.6.11"`
`6`	`6`	`}`
`7`	`7`	`dockerCompose {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'net.saliman.properties' version '1.5.1'`
`3`		`- id "com.marklogic.ml-gradle" version "4.5.2"`
	`3`	`+ id "com.marklogic.ml-gradle" version "4.5.3"`
`4`	`4`	`id 'com.avast.gradle.docker-compose' version "0.6.11"`
`5`	`5`	`}`
`6`	`6`	`dockerCompose {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*/`
`12`	`12`
`13`	`13`	`plugins {`
`14`		`- id "com.marklogic.ml-gradle" version "4.5.2"`
	`14`	`+ id "com.marklogic.ml-gradle" version "4.5.3"`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`ext {`