MLE-12345 Merge release/6.1.0 to master

Author: rjrudin

.copyrightconfig

@@ -11,4 +11,4 @@ startyear: 2015
 #   - Dotfiles already skipped automatically
 # Enable by removing the leading '# ' from the next line and editing values.
 # filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
-filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat
+filesexcluded: .github/*, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **test/resources/**, *.md

NOTICE.txt

@@ -11,50 +11,50 @@ product and version for which you are requesting source code.
 Third Party Notices
 
 commons-io 2.20.0 (Apache-2.0)
-commons-lang3 3.18.0 (Apache-2.0)
-jackson-databind 2.19.0 (Apache-2.0)
-jaxen 2.0.0 (Apache-2.0)
+commons-lang3 3.19.0 (Apache-2.0)
+jackson-databind 2.20.0 (Apache-2.0)
+jaxen 2.0.0 (Jaxen Custom BSD-like License)
 jdom2 2.0.6.1 (Apache-2.0)
-marklogic-client-api 7.2.0 (Apache-2.0)
+marklogic-client-api 8.0.0 (Apache-2.0)
 marklogic-xcc 12.0.0 (Apache-2.0)
-okhttp 4.12.0 (Apache-2.0)
+okhttp 5.2.0 (Apache-2.0)
 slf4j-api 2.0.17 (MIT)
 spring-web 6.2.11 (Apache-2.0)
 zjsonpatch 0.4.16 (Apache-2.0)
 
 Third-Party Components
 
-The following is a list of the third-party components used by Progress® MarkLogic® Ml-gradle 6.0.1 (last updated September 22nd, 2025):
+The following is a list of the third-party components used by Progress® MarkLogic® Ml-gradle 6.1.0 (last updated October 15th, 2025):
 
 commons-io 2.20.0 (Apache-2.0)
 https://repo1.maven.org/maven2/commons-io/commons-io/
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-commons-lang3 3.18.0 (Apache-2.0)
+commons-lang3 3.19.0 (Apache-2.0)
 https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-jackson-databind 2.19.0 (Apache-2.0)
+jackson-databind 2.20.0 (Apache-2.0)
 https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-jaxen 2.0.0 (Apache-2.0)
+jaxen 2.0.0 (Jaxen custom BSD-like license)
 https://repo1.maven.org/maven2/jaxen/jaxen/
-For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
+For the full text of the Jaxen Custom BSD-like License, see Jaxen Custom BSD-like License
 
 jdom2 2.0.6.1 (Apache-2.0)
 https://repo1.maven.org/maven2/org/jdom/jdom2/
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-marklogic-client-api 7.2.0 (Apache-2.0)
+marklogic-client-api 8.0.0 (Apache-2.0)
 https://repo1.maven.org/maven2/com/marklogic/marklogic-client-api/
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
 marklogic-xcc 12.0.0 (Apache-2.0)
 https://repo1.maven.org/maven2/com/marklogic/marklogic-xcc/
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-okhttp 4.12.0 (Apache-2.0)
+okhttp 5.2.0 (Apache-2.0)
 https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
@@ -72,11 +72,18 @@ For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
 Common Licenses
 
-The following is a list of the common licenses used by Progress® MarkLogic® Ml-gradle 6.0.1 (last updated September 22nd, 2025):
+The following is a list of the common licenses used by Progress® MarkLogic® Ml-gradle 6.1.0 (last updated October 15th, 2025):
 
 Apache License 2.0 (Apache-2.0)
 https://spdx.org/licenses/Apache-2.0.html
 
+Jaxen custom permissive license
+https://github.com/jaxen-xpath/jaxen/blob/master/LICENSE.txt
+
+MIT License (MIT) for slf4j
+https://www.slf4j.org/license.html
+
+
 Apache License
 Version 2.0, January 2004
 http://www.apache.org/licenses/
@@ -151,10 +158,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-The MIT License
-https://opensource.org/licenses/MIT
+The MIT License for slf4j
+https://www.slf4j.org/license.html
 
-Copyright (c) 2011 Dominic Tarr
+Copyright (c) 2004-2025 QOS.ch
 
 Permission is hereby granted, free of charge,
 to any person obtaining a copy of this software and
@@ -177,3 +184,35 @@ ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+
+Jaxen Custom BSD-like License
+https://github.com/jaxen-xpath/jaxen/blob/master/LICENSE.txt
+
+Copyright 2003-2006 The Werken Company. All Rights Reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of the Jaxen Project nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

build.gradle

@@ -14,7 +14,8 @@ subprojects {
 
 	repositories {
 		mavenCentral()
-		mavenLocal()
+
+		// Temporarily using to depend on marklogic-junit5 snapshot until it's released.
 		maven {
 			url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
 		}
@@ -23,13 +24,13 @@ subprojects {
 	dependencies {
 		// Without this, once using JUnit 5.12 or higher, Gradle will not find any tests and report an error of:
 		// org.junit.platform.commons.JUnitException: TestEngine with ID 'junit-jupiter' failed to discover tests
-		testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4"
+		testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.14.0"
 
-		testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+		testImplementation 'org.junit.jupiter:junit-jupiter:5.14.0'
 		testImplementation "org.springframework:spring-test:${springVersion}"
 
 		// Forcing Spring to use logback instead of commons-logging
-		testImplementation "ch.qos.logback:logback-classic:1.5.18"
+		testImplementation "ch.qos.logback:logback-classic:1.5.19"
 		testImplementation 'org.slf4j:jcl-over-slf4j:2.0.17'
 		testImplementation 'org.slf4j:slf4j-api:2.0.17'
 	}

examples/alert-project/build.gradle

@@ -1,7 +1,7 @@
 plugins {
   id "java"
   id "eclipse"
-  id "com.marklogic.ml-gradle" version "6.0.0"
+  id "com.marklogic.ml-gradle" version "6.1.0"
 }
 
 repositories {

examples/corb2-project/build.gradle

@@ -21,7 +21,7 @@ buildscript {
 }
 
 plugins {
-    id "com.marklogic.ml-gradle" version "6.0.0"
+    id "com.marklogic.ml-gradle" version "6.1.0"
 }
 
 repositories {

examples/cpf-project/build.gradle

@@ -1,7 +1,7 @@
 plugins {
 	id "java"
 	id "eclipse"
-	id "com.marklogic.ml-gradle" version "6.0.0"
+	id "com.marklogic.ml-gradle" version "6.1.0"
 }
 
 repositories {

examples/custom-forests-and-replicas-project/build.gradle

@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "6.0.0"
+	id "com.marklogic.ml-gradle" version "6.1.0"
 }

examples/custom-rest-rewriter-project/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "6.0.0"
+	id "com.marklogic.ml-gradle" version "6.1.0"
 }
 
 task generateCustomRewriterModules {

examples/data-services/build.gradle

@@ -1,8 +1,8 @@
 plugins {
 	id "java"
 	id "net.saliman.properties" version "1.5.2"
-	id "com.marklogic.ml-gradle" version "6.0.0"
-	id 'com.marklogic.ml-development-tools' version '7.2.0'
+	id "com.marklogic.ml-gradle" version "6.1.0"
+	id 'com.marklogic.ml-development-tools' version '8.0.0'
 }
 
 task generateHelloWorld(type: com.marklogic.client.tools.gradle.EndpointProxiesGenTask) {
@@ -20,12 +20,12 @@ test {
 
 dependencies {
 	implementation 'org.slf4j:slf4j-api:2.0.17'
-	implementation 'com.marklogic:marklogic-client-api:7.2.0'
+	implementation 'com.marklogic:marklogic-client-api:8.0.0'
 
 	testImplementation "org.junit.jupiter:junit-jupiter:5.12.2"
 
 	// Force usage of logback for logging
-	testImplementation "ch.qos.logback:logback-classic:1.5.18"
+	testImplementation "ch.qos.logback:logback-classic:1.5.19"
 	testImplementation "org.slf4j:jcl-over-slf4j:2.0.17"
 	testImplementation "org.slf4j:slf4j-api:2.0.17"
 }

examples/dependency-project/ml-gradle-client-project/build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id "net.saliman.properties" version "1.5.2"
-	id "com.marklogic.ml-gradle" version "6.0.0"
+	id "com.marklogic.ml-gradle" version "6.1.0"
 }
 
 repositories {