MLE-12345 Merge release/6.1.0 to master #806
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Introduced in 6.0.0 during refactor, due to missing test on the LSQT document being created.
MLE-24511 Fixing bug with updating LSQT properties
Will likely bump to a snapshot build of marklogic-junit5 until that has 2.0 released.
Also bumped Gradle wrapper from 8.14.2 to 8.14.3
This is just to verify the ml-app-deployer tests run fine using marklogic-junit5 2.x. This has no impact on users.
Not bumping "version" yet as that makes Jenkins unhappy when it tries to publish. Getting everything else ready first.
rjrudin
requested review from
BillFarber,
anu3990 and
stevebio
as code owners
|
Copyright Validation Results ⏭️ Skipped (Excluded) Files
✅ Valid Files
✅ All files have valid copyright headers! |
There was a problem hiding this comment.
Pull Request Overview
This PR merges release branch 6.1.0 into master, bumping the version from 6.0.x to 6.1.0 and updating dependencies. The release focuses on dependency upgrades, deprecating a conflicting property, and improving temporal collection handling.
Key changes:
- Version updates across the project (6.0.x → 6.1.0)
- Dependency upgrades including marklogic-client-api (7.2.0 → 8.0.0), Jackson (2.19.0 → 2.20.0), and OkHttp (4.12.0 → 5.2.0)
- Deprecated
groupproperty in favor ofgroupNamein CopySearchOptionsTask to avoid conflicts - Enhanced temporal collection LSQT configuration support with XML format and improved test coverage
Reviewed Changes
Copilot reviewed 59 out of 61 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| gradle.properties | Updates project version to 6.1.0 and Jackson to 2.20.0 |
| ml-javaclient-util/build.gradle | Upgrades marklogic-client-api to 8.0.0 and adds JAXB compile dependency |
| ml-gradle/build.gradle | Updates comment about marklogic-unit-test-client compilation version |
| ml-app-deployer/build.gradle | Upgrades OkHttp to 5.2.0, commons-lang3 to 3.19.0, marklogic-junit5 to 2.0-SNAPSHOT, and adds JAXB dependencies |
| ml-gradle/src/main/groovy/com/marklogic/gradle/task/client/CopySearchOptionsTask.groovy | Deprecates group property in favor of groupName with backward compatibility |
| ml-gradle/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy | Updates version string to 6.1.0 in generated build.gradle |
| ml-app-deployer/src/main/java/com/marklogic/mgmt/util/ObjectMapperFactory.java | Replaces deprecated setSerializationInclusion with setDefaultPropertyInclusion |
| ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/temporal/DeployTemporalCollectionsLSQTCommand.java | Improves filename parsing to use lastIndexOf for extracting collection names |
| ml-app-deployer/src/test/resources/sample-app/temporal-config-with-lsqt/databases/other-sample-app-content/temporal/collections/lsqt/ | Replaces JSON LSQT config with XML format including lag property |
| ml-app-deployer/src/test/java/com/marklogic/appdeployer/command/temporal/DeployTemporalTest.java | Adds verification that LSQT properties are correctly deployed to content database |
| ml-app-deployer/src/test/java/com/marklogic/appdeployer/AbstractAppDeployerTest.java | Adds overloaded newDatabaseClient method accepting custom port |
| ml-app-deployer/src/test/java/com/marklogic/rest/util/TestConfig.java | Replaces local RetryInterceptor with RetryIOExceptionInterceptor from client API |
| ml-app-deployer/src/test/java/com/marklogic/rest/util/RetryInterceptor.java | Removes local retry interceptor implementation |
| gradlew, gradlew.bat | Updates Gradle wrapper scripts to latest version |
| gradle/wrapper/gradle-wrapper.properties | Updates Gradle distribution to 8.14.3 with additional validation properties |
| examples/**/build.gradle | Updates ml-gradle plugin version to 6.1.0 across all example projects |
| NOTICE.txt | Updates dependency versions and license information including corrected Jaxen license |
| .copyrightconfig | Expands excluded files pattern to include test resources and markdown files |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
BillFarber
approved these changes
Oct 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Verifying the tests succeed, but will release from this branch first.