Skip to content

MLE-27841 Bumping dependencies before 8.1 release #1917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjrudin merged 1 commit into from
Mar 4, 2026
Merged

MLE-27841 Bumping dependencies before 8.1 release #1917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ subprojects {
all {
resolutionStrategy {
// Forcing the latest commons-lang3 version to eliminate CVEs.
force "org.apache.commons:commons-lang3:3.19.0"
force "org.apache.commons:commons-lang3:3.20.0"
}
}
}
Expand Down
8 changes: 2 additions & 6 deletions examples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
/*
* Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/

dependencies {
implementation project(':marklogic-client-api')
Comment on lines 1 to 2
Copy link

Copilot AI Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The examples build file no longer includes the standard copyright header that is present in other Gradle build files in this repo (e.g., root build.gradle, marklogic-client-api/build.gradle). If this wasn’t intentional, please restore the header for consistency and to avoid potential licensing/compliance problems.

Copilot uses AI. Check for mistakes.
implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4"
implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.5"

// 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
Expand All @@ -23,5 +19,5 @@ dependencies {
// passes without this on the classpath.
exclude module: "commons-beanutils"
}
api 'org.apache.commons:commons-lang3:3.19.0'
api 'org.apache.commons:commons-lang3:3.20.0'
Copy link

Copilot AI Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This module now declares commons-lang3 3.20.0, but the root build.gradle forces commons-lang3 to 3.19.0 via resolutionStrategy.force. As a result, this version bump likely won’t take effect; consider updating/removing the forced version so the intended dependency version is actually used.

Suggested change
api 'org.apache.commons:commons-lang3:3.20.0'
api 'org.apache.commons:commons-lang3:3.19.0'

Copilot uses AI. Check for mistakes.
}
5 changes: 3 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ publishUrl=file:../marklogic-java/releases
okhttpVersion=5.3.2

# See https://github.com/FasterXML/jackson for more information on the Jackson libraries.
jacksonVersion=2.20.1
jacksonVersion=2.21.1

junitVersion=6.0.1
junitVersion=6.0.3
logbackVersion=1.5.32

# Defined at this level so that they can be set as system properties and used by the marklogic-client-api and test-app
# project
Expand Down
4 changes: 2 additions & 2 deletions marklogic-client-api-functionaltests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

dependencies {
testImplementation project(':marklogic-client-api')
testImplementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4"
testImplementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.5"
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
testImplementation 'org.slf4j:slf4j-api:2.0.17'
testImplementation 'commons-io:commons-io:2.21.0'
Expand All @@ -17,7 +17,7 @@ dependencies {

testImplementation "com.marklogic:ml-app-deployer:6.2-SNAPSHOT"

testImplementation 'ch.qos.logback:logback-classic:1.5.19'
testImplementation "ch.qos.logback:logback-classic:${logbackVersion}"
testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
testImplementation 'org.xmlunit:xmlunit-legacy:2.11.0'

Expand Down
12 changes: 6 additions & 6 deletions marklogic-client-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
// This is now an implementation dependency as opposed to an api dependency in 7.x and earlier.
// The only time it appears in the public API is when a user uses JAXBHandle.
// But in that scenario, the user would already be using JAXB in their application.
implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4"
implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.5"
implementation "org.glassfish.jaxb:jaxb-runtime:4.0.6"

implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
Expand All @@ -40,14 +40,14 @@ dependencies {
// Dependencies for hash generation. Can be safely omitted if not using the incremental write feature. But neither
// has any transitive dependencies, and thus their impact on the dependency tree is minimal.
implementation "io.github.erdtman:java-json-canonicalization:1.1"
implementation "net.openhft:zero-allocation-hashing:0.27ea1"
implementation "net.openhft:zero-allocation-hashing:2026.0"

// Only used by extras (which some examples then depend on)
compileOnly 'org.jdom:jdom2:2.0.6.1'
compileOnly 'org.dom4j:dom4j:2.2.0'
compileOnly 'com.google.code.gson:gson:2.13.2'

testImplementation "com.marklogic:marklogic-junit5:2.0-SNAPSHOT"
testImplementation "com.marklogic:marklogic-junit5:2.0.0"

testImplementation 'org.xmlunit:xmlunit-legacy:2.11.0'
testImplementation project(':examples')
Expand All @@ -57,13 +57,13 @@ dependencies {
// Allows talking to the Manage API.
testImplementation "com.marklogic:ml-app-deployer:6.2-SNAPSHOT"

testImplementation "org.mockito:mockito-core:5.21.0"
testImplementation "org.mockito:mockito-inline:5.2.0"
testImplementation "org.mockito:mockito-core:5.22.0"
// testImplementation "org.mockito:mockito-inline:5.2.0"
Copy link

Copilot AI Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mockito-inline was commented out but left in the dependencies block (and it’s pinned to 5.2.0 while mockito-core is 5.22.0). This is easy to miss and can cause confusion or accidental re-enablement with incompatible versions; either remove it entirely or re-enable it with a matching version and an explanatory comment for why it’s needed.

Suggested change
// testImplementation "org.mockito:mockito-inline:5.2.0"

Copilot uses AI. Check for mistakes.

testImplementation "com.squareup.okhttp3:mockwebserver3:${okhttpVersion}"

testImplementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jacksonVersion}"
testImplementation 'ch.qos.logback:logback-classic:1.5.23'
testImplementation "ch.qos.logback:logback-classic:${logbackVersion}"

// Using this to avoid a schema validation issue with the regular xercesImpl
testImplementation 'org.opengis.cite.xerces:xercesImpl-xsd11:2.12-beta-r1667115'
Expand Down
7 changes: 5 additions & 2 deletions marklogic-client-api/src/main/java/com/marklogic/client/expression/VecExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public interface VecExpr {
* Returns a new vector which is a copy of the input vector with reduced precision. The precision reduction is achieved by clearing the bottom (32 - precision) bits of the mantissa for each dimension's float value. This can be useful for reducing storage requirements or for creating approximate vector representations.
*
* <a name="ml-server-type-precision"></a>

* <p>
* Provides a client interface to the <a href="http://docs.marklogic.com/vec:precision" target="mlserverdoc">vec:precision</a> server function.
* @param vector The input vector to reduce precision. Can be a vector or an empty sequence. (of <a href="{@docRoot}/doc-files/types/vec_vector.html">vec:vector</a>)
Expand Down Expand Up @@ -207,7 +207,7 @@ public interface VecExpr {
* Returns a new vector which is a copy of the input vector with each element truncated to a specific number of digits.
*
* <a name="ml-server-type-trunc"></a>

* <p>
* Provides a client interface to the <a href="http://docs.marklogic.com/vec:trunc" target="mlserverdoc">vec:trunc</a> server function.
* @param vector The input vector to truncate. (of <a href="{@docRoot}/doc-files/types/vec_vector.html">vec:vector</a>)
Expand Down Expand Up @@ -253,6 +253,8 @@ public interface VecExpr {
* @param score The cts:score of the matching document. (of <a href="{@docRoot}/doc-files/types/xs_unsignedInt.html">xs:unsignedInt</a>)
* @param distance The distance between the vector in the matching document and the query vector. Examples, the result of a call to ovec:cosine-distance() or ovec:euclidean-distance(). (of <a href="{@docRoot}/doc-files/types/xs_double.html">xs:double</a>)
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_unsignedLong.html">xs:unsignedLong</a> server data type
*
* @since 8.1.0, requires MarkLogic 12.1
*/
public ServerExpression vectorScore(ServerExpression score, double distance);
/**
Expand All @@ -262,6 +264,7 @@ public interface VecExpr {
* @param score The cts:score of the matching document. (of <a href="{@docRoot}/doc-files/types/xs_unsignedInt.html">xs:unsignedInt</a>)
* @param distance The distance between the vector in the matching document and the query vector. Examples, the result of a call to ovec:cosine-distance() or ovec:euclidean-distance(). (of <a href="{@docRoot}/doc-files/types/xs_double.html">xs:double</a>)
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_unsignedLong.html">xs:unsignedLong</a> server data type
* @since 8.1.0, requires MarkLogic 12.1
*/
public ServerExpression vectorScore(ServerExpression score, ServerExpression distance);
/**
Expand Down
2 changes: 2 additions & 0 deletions ...ogic-client-api/src/main/java/com/marklogic/client/type/PlanTransitiveClosureOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
/**
* Options for controlling transitive closure operations, including minimum and maximum
* path lengths.
*
* @since 8.1.0
*/
public interface PlanTransitiveClosureOptions {
XsLongVal getMinLength();
Expand Down
6 changes: 3 additions & 3 deletions ml-development-tools/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ plugins {
id 'maven-publish'
id "com.gradle.plugin-publish" version "1.2.1"
id "java-gradle-plugin"
id 'org.jetbrains.kotlin.jvm' version '2.1.0'
id 'org.jetbrains.kotlin.jvm' version '2.2.21'
}

dependencies {
compileOnly gradleApi()

// This is a runtime dependency of marklogic-client-api but is needed for compiling.
compileOnly "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4"
compileOnly "jakarta.xml.bind:jakarta.xml.bind-api:4.0.5"

// Gradle 9 does not like for a plugin to have a project dependency; trying to publish it results in a
// NoSuchMethodError pertaining to getProjectDependency. So treating this as a 3rd party dependency. This creates
// additional work during development, though we rarely modify the code in this plugin anymore.
implementation "com.marklogic:marklogic-client-api:${version}"

implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.20'
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.21'
Copy link

Copilot AI Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kotlin-stdlib is bumped to 2.2.21 while the applied Kotlin Gradle plugin is 2.1.0. Mixing Kotlin plugin and stdlib major/minor versions can cause ABI/runtime issues; consider aligning the stdlib version with the plugin version (or removing the explicit stdlib dependency and letting the plugin manage it).

Suggested change
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.21'
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.1.0'

Copilot uses AI. Check for mistakes.
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:${jacksonVersion}"

// Sticking with this older version for now as the latest 1.x version introduces breaking changes.
Expand Down
6 changes: 3 additions & 3 deletions test-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ mlWaitTillReady {
}

dependencies {
implementation "io.undertow:undertow-core:2.3.20.Final"
implementation "io.undertow:undertow-servlet:2.3.20.Final"
implementation "io.undertow:undertow-core:2.3.23.Final"
implementation "io.undertow:undertow-servlet:2.3.23.Final"
implementation 'org.slf4j:slf4j-api:2.0.17'
implementation 'ch.qos.logback:logback-classic:1.5.23'
implementation "ch.qos.logback:logback-classic:${logbackVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
}
Expand Down