Merge pull request #1813 from marklogic/feature/release-7.2.0-take-2

MLE-22953 Merging release/7.2.0 into master but without copyright updates

Author: rjrudin

test-app/.env renamed to .env

@@ -4,4 +4,4 @@ MARKLOGIC_IMAGE=progressofficial/marklogic-db:latest
 MARKLOGIC_LOGS_VOLUME=./docker/marklogic/logs
 
 # This image should be used instead of the above image when testing functions that only work with MarkLogic 12.
-# MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12
+#MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12

.github/workflows/pr-workflow.yaml

@@ -0,0 +1,16 @@
+name: 🏷️ JIRA ID Validator
+
+on:
+  # Using pull_request_target instead of pull_request to handle PRs from forks
+  pull_request_target:
+    types: [opened, edited, reopened, synchronize]
+    # No branch filtering - will run on all PRs
+
+jobs:
+  jira-pr-check:
+    name: 🏷️ Validate JIRA ticket ID
+    # Use the reusable workflow from the central repository
+    uses: marklogic/pr-workflows/.github/workflows/jira-id-check.yml@main
+    with:
+      # Pass the PR title from the event context
+      pr-title: ${{ github.event.pull_request.title }}

CODEOWNERS

@@ -2,4 +2,4 @@
 # 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
+* @anu3990 @billfarber @rjrudin @stevebio

CONTRIBUTING.md

@@ -33,9 +33,7 @@ be a local instance or it may be running in a Docker container. If you would lik
 instance, you may create the container with the following commands (starting in the project root directory):
 
 ```
-cd test-app
 docker-compose up -d --build
-cd ..
 ```
 
 Once you have a MarkLogic instance ready, the application is then deployed via the following command:

Jenkinsfile

@@ -13,21 +13,19 @@ def getJava(){
 }
 
 def setupDockerMarkLogic(String image){
+	cleanupDocker()
 	sh label:'mlsetup', script: '''#!/bin/bash
 	echo "Removing any running MarkLogic server and clean up MarkLogic data directory"
     sudo /usr/local/sbin/mladmin remove
     sudo /usr/local/sbin/mladmin cleandata
-    cd java-client-api/test-app
+    cd java-client-api
     docker compose down -v || true
     docker volume prune -f
     echo "Using image: "'''+image+'''
     docker pull '''+image+'''
     MARKLOGIC_IMAGE='''+image+''' MARKLOGIC_LOGS_VOLUME=marklogicLogs docker compose up -d --build
-	  echo "mlPassword=admin" > gradle-local.properties
     echo "Waiting for MarkLogic server to initialize."
     sleep 60s
-    cd ..
-	  echo "mlPassword=admin" > gradle-local.properties
 		export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
 		export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
 		./gradlew mlTestConnections
@@ -135,10 +133,11 @@ def postProcessTestResults() {
 
 def tearDownDocker() {
 	sh label:'tearDownDocker', script: '''#!/bin/bash
-		cd java-client-api/test-app
+		cd java-client-api
 		docker compose down -v || true
 		docker volume prune -f
 	'''
+	cleanupDocker()
 }
 
 pipeline{
@@ -170,7 +169,7 @@ pipeline{
         }
       }
       steps {
-	      setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
+	      setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:12.0.0-ubi-rootless-2.2.0")
         sh label:'run marklogic-client-api tests', script: '''#!/bin/bash
           export JAVA_HOME=$JAVA_HOME_DIR
           export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
@@ -183,6 +182,7 @@ pipeline{
       }
 			post {
 				always {
+					updateWorkspacePermissions()
 					tearDownDocker()
 				}
 			}
@@ -206,24 +206,6 @@ pipeline{
       }
     }
 
-		stage('regressions-11.2.0') {
-			when {
-				allOf {
-					branch 'develop'
-					expression {return params.regressions}
-				}
-			}
-			steps {
-				runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:11.2.0-ubi")
-				junit '**/build/**/TEST*.xml'
-			}
-			post {
-				always {
-					tearDownDocker()
-				}
-			}
-		}
-
 		stage('regressions-11') {
 			when {
 				allOf {
@@ -237,6 +219,7 @@ pipeline{
 			}
 			post {
 				always {
+					updateWorkspacePermissions()
 					tearDownDocker()
 				}
 			}
@@ -255,6 +238,7 @@ pipeline{
 			}
 			post {
 				always {
+					updateWorkspacePermissions()
 					tearDownDocker()
 				}
 			}
@@ -268,11 +252,12 @@ pipeline{
 				}
 			}
 			steps {
-				runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
+				runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:12.0.0-ubi-rootless-2.2.0")
 				junit '**/build/**/TEST*.xml'
 			}
 			post {
 				always {
+					updateWorkspacePermissions()
 					tearDownDocker()
 				}
 			}
@@ -291,6 +276,7 @@ pipeline{
 			}
 			post {
 				always {
+					updateWorkspacePermissions()
 					tearDownDocker()
 				}
 			}

NOTICE.txt

@@ -1,6 +1,6 @@
 MarkLogic® for Java Client
 
-Copyright © 2025 MarkLogic Corporation. All Rights Reserved.
+Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 
 To the extent required by the applicable open-source license, a complete machine-readable copy of the source code
 corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and
@@ -10,32 +10,32 @@ product and version for which you are requesting source code.
 
 Third Party Notices
 
-jackson-databind 2.17.2 (Apache-2.0)
-jackson-dataformat-csv 2.17.2 (Apache-2.0)
+jackson-databind 2.19.0 (Apache-2.0)
+jackson-dataformat-csv 2.19.0 (Apache-2.0)
 okhttp 4.12.0 (Apache-2.0)
 logging-interceptor 4.12.0 (Apache-2.0)
 jakarta.mail 2.0.1 (EPL-1.0)
 okhttp-digest 2.7 (Apache-2.0)
 jakarta.xml.bind-api 3.0.1 (EPL-1.0)
 javax.ws.rs-api 2.1.1 (CDDL-1.1)
 jaxb-runtime 3.0.2 (CDDL-1.1)
-slf4j-api 2.0.16 (Apache-2.0)
+slf4j-api 2.0.17 (Apache-2.0)
 
 Common Licenses
 
 Apache License 2.0 (Apache-2.0)
-Common Development and Distribution License 1.1  (CDDL-1.1)
-Eclipse Public License 1.0  (EPL-1.0)
+Common Development and Distribution License 1.1 (CDDL-1.1)
+Eclipse Public License 1.0 (EPL-1.0)
 
 Third-Party Components
 
-The following is a list of the third-party components used by the MarkLogic® for Java Client 7.1.0 (last updated January 6, 2025):
+The following is a list of the third-party components used by the MarkLogic® for Java Client 7.2.0 (last updated July 21, 2025):
 
-jackson-databind 2.17.2 (Apache-2.0)
+jackson-databind 2.19.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)
 
-jackson-dataformat-csv 2.17.2 (Apache-2.0)
+jackson-dataformat-csv 2.19.0 (Apache-2.0)
 https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-csv/
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
@@ -67,13 +67,13 @@ jaxb-runtime 3.0.2 (Apache-2.0)
 https://repo1.maven.org/maven2/org/glassfish/jaxb/jaxb-runtime/
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-slf4j-api 2.0.16 (Apache-2.0)
+slf4j-api 2.0.17 (Apache-2.0)
 https://repo1.maven.org/maven2/org/slf4j/slf4j-api/
 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 third-party components used by the MarkLogic® for Java Client 7.1.0 (last updated January 6, 2025):
+The following is a list of the third-party components used by the MarkLogic® for Java Client 7.2.0 (last updated July 21, 2025):
 
 Apache License 2.0 (Apache-2.0)
 https://spdx.org/licenses/Apache-2.0.html

README.md

@@ -33,13 +33,13 @@ To use the client in your [Maven](https://maven.apache.org/) project, include th
     <dependency>
         <groupId>com.marklogic</groupId>
         <artifactId>marklogic-client-api</artifactId>
-        <version>7.1.0</version>
+        <version>7.2.0</version>
     </dependency>
 
 To use the client in your [Gradle](https://gradle.org/) project, include the following in your `build.gradle` file:
 
     dependencies {
-        implementation "com.marklogic:marklogic-client-api:7.1.0"
+        implementation "com.marklogic:marklogic-client-api:7.2.0"
     }
 
 Next, read [The Java API in Five Minutes](http://developer.marklogic.com/try/java/index) to get started.

build.gradle

@@ -4,51 +4,50 @@
 // used for that. So we have to add the properties plugin to the buildscript classpath and then apply the properties
 // plugin via subprojects below.
 buildscript {
-    repositories {
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-    dependencies {
-        classpath "net.saliman:gradle-properties-plugin:1.5.2"
-    }
+	repositories {
+		maven {
+			url = "https://plugins.gradle.org/m2/"
+		}
+	}
+	dependencies {
+		classpath "net.saliman:gradle-properties-plugin:1.5.2"
+	}
 }
 
 subprojects {
-    apply plugin: "net.saliman.properties"
-    apply plugin: 'java'
-
- 	tasks.withType(JavaCompile) {
-    	options.encoding = 'UTF-8'
-  	}
-
-    // To ensure that the Java Client continues to support Java 8, both source and target compatibility are set to 1.8.
-    // May adjust this for src/test/java so that tests can take advantage of more expressive functions in Java 9+, such
-    // as Map.of().
-    java {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
-    }
-
-    configurations {
-        testImplementation.extendsFrom compileOnly
-    }
-
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
+	apply plugin: "net.saliman.properties"
+	apply plugin: 'java'
+
+	tasks.withType(JavaCompile) {
+		options.encoding = 'UTF-8'
+		options.compilerArgs += ["-Xlint:unchecked", "-Xlint:deprecation"]
+	}
+
+	// To ensure that the Java Client continues to support Java 8, both source and target compatibility are set to 1.8.
+	java {
+		sourceCompatibility = 1.8
+		targetCompatibility = 1.8
+	}
+
+	configurations {
+		testImplementation.extendsFrom compileOnly
+	}
+
+	repositories {
+		mavenLocal()
+		mavenCentral()
+	}
 
 	test {
 		systemProperty "file.encoding", "UTF-8"
 		systemProperty "javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"
 	}
 
 	// Until we do a cleanup of javadoc errors, the build (and specifically the javadoc task) fails on Java 11
-    // and higher. Preventing that until the cleanup can occur.
-    javadoc.failOnError = false
+	// and higher. Preventing that until the cleanup can occur.
+	javadoc.failOnError = false
 
-    // Ignores warnings on param tags with no descriptions. Will remove this once javadoc errors are addressed.
-    // Until then, it's just a lot of noise.
-    javadoc.options.addStringOption('Xdoclint:none', '-quiet')
+	// Ignores warnings on param tags with no descriptions. Will remove this once javadoc errors are addressed.
+	// Until then, it's just a lot of noise.
+	javadoc.options.addStringOption('Xdoclint:none', '-quiet')
 }

test-app/docker-compose.yaml renamed to docker-compose.yaml

@@ -1,4 +1,4 @@
-name: marklogic-javaclient-test-app
+name: docker-tests-java-client
 
 services:
 

examples/build.gradle

@@ -1,4 +1,4 @@
-// Copyright © 2024 MarkLogic Corporation. All Rights Reserved.
+// Copyright © 2025 MarkLogic Corporation. All Rights Reserved.
 
 plugins {
 	id "java-library"
@@ -7,27 +7,22 @@ plugins {
 dependencies {
 	implementation project(':marklogic-client-api')
 
-	// 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'
-
 	// The 'api' configuration is used so that the test configuration in marklogic-client-api doesn't have to declare
 	// all of these dependencies. This library project won't otherwise be depended on by anything else as it's not
 	// setup for publishing.
 	api 'com.squareup.okhttp3:okhttp:4.12.0'
 	api 'io.github.rburgst:okhttp-digest:2.7'
-	api 'org.slf4j:slf4j-api:2.0.16'
-	api "com.fasterxml.jackson.core:jackson-databind:2.17.2"
-
-	// hsqldb < 2.7 has a High CVE - https://nvd.nist.gov/vuln/detail/CVE-2022-41853 .
-	// And hsqldb 2.6+ requires Java 11+. So this is ignored, along with the associated test,
-	// until the Java Client can drop Java 8 support.
-	// api 'org.hsqldb:hsqldb:2.7.1'
+	api 'org.slf4j:slf4j-api:2.0.17'
+	api "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
 
 	api 'org.jdom:jdom2:2.0.6.1'
 	api 'org.dom4j:dom4j:2.1.4'
 	api 'com.google.code.gson:gson:2.10.1'
 	api 'net.sourceforge.htmlcleaner:htmlcleaner:2.29'
-	api 'com.opencsv:opencsv:4.6'
-	api 'org.springframework:spring-jdbc:5.3.39'
-	api 'org.apache.commons:commons-lang3:3.12.0'
+	api ('com.opencsv:opencsv:5.11.2') {
+		// Excluding this due to a security vulnerability, and the test for the example that uses this library
+		// passes without this on the classpath.
+		exclude module: "commons-beanutils"
+	}
+	api 'org.apache.commons:commons-lang3:3.18.0'
 }