Merge pull request #797 from marklogic/release/6.0.1

MLE-23593 Merge release/6.0.1 into master

Author: rjrudin

.copyrightconfig

@@ -0,0 +1,14 @@
+# COPYRIGHT VALIDATION CONFIG
+# ---------------------------------
+# Required start year (keep fixed; end year auto-updates in check output)
+startyear: 2015
+
+# Optional exclusions list (comma-separated). Leave commented if none.
+# Rules:
+#   - Relative paths (no leading ./)
+#   - Simple * wildcard only (no recursive **)
+#   - Use sparingly (third_party, generated, binary assets)
+#   - 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

.github/workflows/pr-workflow.yaml

@@ -1,4 +1,4 @@
-name: 🏷️ JIRA ID Validator
+name: PR Workflow
 
 on:
   # Using pull_request_target instead of pull_request to handle PRs from forks
@@ -14,3 +14,10 @@ jobs:
     with:
       # Pass the PR title from the event context
       pr-title: ${{ github.event.pull_request.title }}
+  copyright-validation:
+    name: © Validate Copyright Headers
+    uses: marklogic/pr-workflows/.github/workflows/copyright-check.yml@main
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: write

Jenkinsfile

@@ -78,11 +78,13 @@ pipeline {
       }
       steps{
       	sh label:'publish', script: '''#!/bin/bash
-        	export JAVA_HOME=$JAVA_HOME_DIR
-          export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
-          export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
-          cp ~/.gradle/gradle.properties $GRADLE_USER_HOME;
-          cd ml-gradle
+        	export JAVA_HOME=$JAVA_HOME_DIR;
+          export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR;
+          export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH;
+          rm -rf $GRADLE_USER_HOME || true;
+          cd ml-gradle;
+          ./gradlew clean;
+          cp ~/.gradle/gradle.properties $GRADLE_USER_HOME/;
           ./gradlew publish
         '''
       }

NOTICE.txt

@@ -19,12 +19,12 @@ marklogic-client-api 7.2.0 (Apache-2.0)
 marklogic-xcc 12.0.0 (Apache-2.0)
 okhttp 4.12.0 (Apache-2.0)
 slf4j-api 2.0.17 (MIT)
-spring-web 5.3.39 (Apache-2.0)
+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.0 (last updated July 31, 2025):
+The following is a list of the third-party components used by Progress® MarkLogic® Ml-gradle 6.0.1 (last updated September 22nd, 2025):
 
 commons-io 2.20.0 (Apache-2.0)
 https://repo1.maven.org/maven2/commons-io/commons-io/
@@ -62,7 +62,7 @@ slf4j-api 2.0.17 (MIT)
 https://repo1.maven.org/maven2/org/slf4j/slf4j-api/
 For the full text of the MIT license, see MIT license (MIT)
 
-spring-web 5.3.39 (Apache-2.0)
+spring-web 6.2.11 (Apache-2.0)
 https://repo1.maven.org/maven2/org/springframework/spring-web/
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
@@ -72,7 +72,7 @@ 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.0 (last updated July 31, 2025):
+The following is a list of the common licenses used by Progress® MarkLogic® Ml-gradle 6.0.1 (last updated September 22nd, 2025):
 
 Apache License 2.0 (Apache-2.0)
 https://spdx.org/licenses/Apache-2.0.html

build.gradle

@@ -1,10 +1,11 @@
+// Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+
 // Defines common configuration for each of the 3 subprojects.
 subprojects {
 	apply plugin: "java-library"
 	apply plugin: "maven-publish"
 
 	group = "com.marklogic"
-	version = "6.0.0"
 
 	java {
 		sourceCompatibility = 17
@@ -15,7 +16,7 @@ subprojects {
 		mavenCentral()
 		mavenLocal()
 		maven {
-			url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
+			url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
 		}
 	}
 
@@ -33,15 +34,25 @@ subprojects {
 		testImplementation 'org.slf4j:slf4j-api:2.0.17'
 	}
 
-	javadoc.failOnError = false
+	// Allows for quickly identifying compiler warnings and treating them as errors.
+	tasks.withType(JavaCompile) {
+		options.compilerArgs += ["-Xlint:unchecked", "-Xlint:deprecation", "-Werror"]
+		options.deprecation = true
+		options.warnings = true
+	}
+
+	javadoc {
+		failOnError = false
+	}
+
 	// Ignores warnings on params that don't have descriptions, which is a little too noisy
 	javadoc.options.addStringOption('Xdoclint:none', '-quiet')
 
 	test {
 		useJUnitPlatform()
 		testLogging {
 			events 'started','passed', 'skipped', 'failed'
-			exceptionFormat 'full'
+			exceptionFormat = 'full'
 		}
 	}
 
@@ -90,17 +101,17 @@ subprojects {
 			maven {
 				if (project.hasProperty("mavenUser")) {
 					credentials {
-						username mavenUser
-						password mavenPassword
+						username = mavenUser
+						password = mavenPassword
 					}
 					url publishUrl
 					allowInsecureProtocol = true
 				} else {
 					name = "central"
 					url = mavenCentralUrl
 					credentials {
-						username mavenCentralUsername
-						password mavenCentralPassword
+						username = mavenCentralUsername
+						password = mavenCentralPassword
 					}
 				}
 			}

docker-compose.yaml

@@ -1,10 +1,16 @@
+# Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+
 name: docker-tests-ml-gradle
 
 services:
 
   marklogic:
     image: "${MARKLOGIC_IMAGE}"
     platform: linux/amd64
+    # The NET_RAW capability allows a process to create raw sockets. Polaris does not like that.
+    # This setting removes the NET_RAW capability from the container.
+    cap_drop:
+      - NET_RAW
     environment:
       - MARKLOGIC_INIT=true
       - MARKLOGIC_ADMIN_USERNAME=admin

examples/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

examples/jdbc-project/build.gradle

@@ -8,8 +8,8 @@ repositories {
 }
 
 dependencies {
-	implementation "org.springframework:spring-jdbc:6.2.9"
-	implementation "org.postgresql:postgresql:42.7.7"
+	implementation "org.springframework:spring-jdbc:6.2.11"
+	implementation "org.postgresql:postgresql:42.7.8"
 }
 
 task selectFromSysTables(type: JavaExec) {

examples/local-testing-project/build.gradle

@@ -1,8 +1,10 @@
+// Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+
 buildscript {
   repositories {
 	  mavenLocal()
 		maven {
-			url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
+			url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
 		}
 		mavenCentral()
   }

examples/marklogic-cloud-project/build.gradle

@@ -1,8 +1,10 @@
+// Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+
 buildscript {
   repositories {
 	  mavenLocal()
 		maven {
-			url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
+			url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
 		}
 		mavenCentral()
   }