Skip to content

Commit 86f9223

Browse files
committed
MLE-27841 Bumping dependencies before 8.1 release
Added a few "since" annotations as well.
1 parent 61f6540 commit 86f9223

File tree

9 files changed

+27
-25
lines changed

9 files changed

+27
-25
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ subprojects {
1717
all {
1818
resolutionStrategy {
1919
// Forcing the latest commons-lang3 version to eliminate CVEs.
20-
force "org.apache.commons:commons-lang3:3.19.0"
20+
force "org.apache.commons:commons-lang3:3.20.0"
2121
}
2222
}
2323
}

examples/build.gradle

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
/*
2-
* Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
3-
*/
4-
51
dependencies {
62
implementation project(':marklogic-client-api')
7-
implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4"
3+
implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.5"
84

95
// The 'api' configuration is used so that the test configuration in marklogic-client-api doesn't have to declare
106
// all of these dependencies. This library project won't otherwise be depended on by anything else as it's not
@@ -23,5 +19,5 @@ dependencies {
2319
// passes without this on the classpath.
2420
exclude module: "commons-beanutils"
2521
}
26-
api 'org.apache.commons:commons-lang3:3.19.0'
22+
api 'org.apache.commons:commons-lang3:3.20.0'
2723
}

gradle.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ publishUrl=file:../marklogic-java/releases
55
okhttpVersion=5.3.2
66

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

10-
junitVersion=6.0.1
10+
junitVersion=6.0.3
11+
logbackVersion=1.5.32
1112

1213
# Defined at this level so that they can be set as system properties and used by the marklogic-client-api and test-app
1314
# project

marklogic-client-api-functionaltests/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

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

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

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

marklogic-client-api/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
// This is now an implementation dependency as opposed to an api dependency in 7.x and earlier.
1818
// The only time it appears in the public API is when a user uses JAXBHandle.
1919
// But in that scenario, the user would already be using JAXB in their application.
20-
implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4"
20+
implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.5"
2121
implementation "org.glassfish.jaxb:jaxb-runtime:4.0.6"
2222

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

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

50-
testImplementation "com.marklogic:marklogic-junit5:2.0-SNAPSHOT"
50+
testImplementation "com.marklogic:marklogic-junit5:2.0.0"
5151

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

60-
testImplementation "org.mockito:mockito-core:5.21.0"
61-
testImplementation "org.mockito:mockito-inline:5.2.0"
60+
testImplementation "org.mockito:mockito-core:5.22.0"
61+
// testImplementation "org.mockito:mockito-inline:5.2.0"
6262

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

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

6868
// Using this to avoid a schema validation issue with the regular xercesImpl
6969
testImplementation 'org.opengis.cite.xerces:xercesImpl-xsd11:2.12-beta-r1667115'

marklogic-client-api/src/main/java/com/marklogic/client/expression/VecExpr.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public interface VecExpr {
151151
* 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.
152152
*
153153
* <a name="ml-server-type-precision"></a>
154-
154+
155155
* <p>
156156
* Provides a client interface to the <a href="http://docs.marklogic.com/vec:precision" target="mlserverdoc">vec:precision</a> server function.
157157
* @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>)
@@ -207,7 +207,7 @@ public interface VecExpr {
207207
* Returns a new vector which is a copy of the input vector with each element truncated to a specific number of digits.
208208
*
209209
* <a name="ml-server-type-trunc"></a>
210-
210+
211211
* <p>
212212
* Provides a client interface to the <a href="http://docs.marklogic.com/vec:trunc" target="mlserverdoc">vec:trunc</a> server function.
213213
* @param vector The input vector to truncate. (of <a href="{@docRoot}/doc-files/types/vec_vector.html">vec:vector</a>)
@@ -253,6 +253,8 @@ public interface VecExpr {
253253
* @param score The cts:score of the matching document. (of <a href="{@docRoot}/doc-files/types/xs_unsignedInt.html">xs:unsignedInt</a>)
254254
* @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>)
255255
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_unsignedLong.html">xs:unsignedLong</a> server data type
256+
*
257+
* @since 8.1.0, requires MarkLogic 12.1
256258
*/
257259
public ServerExpression vectorScore(ServerExpression score, double distance);
258260
/**
@@ -262,6 +264,7 @@ public interface VecExpr {
262264
* @param score The cts:score of the matching document. (of <a href="{@docRoot}/doc-files/types/xs_unsignedInt.html">xs:unsignedInt</a>)
263265
* @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>)
264266
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_unsignedLong.html">xs:unsignedLong</a> server data type
267+
* @since 8.1.0, requires MarkLogic 12.1
265268
*/
266269
public ServerExpression vectorScore(ServerExpression score, ServerExpression distance);
267270
/**

marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTransitiveClosureOptions.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
/**
99
* Options for controlling transitive closure operations, including minimum and maximum
1010
* path lengths.
11+
*
12+
* @since 8.1.0
1113
*/
1214
public interface PlanTransitiveClosureOptions {
1315
XsLongVal getMinLength();

ml-development-tools/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ plugins {
99
id 'maven-publish'
1010
id "com.gradle.plugin-publish" version "1.2.1"
1111
id "java-gradle-plugin"
12-
id 'org.jetbrains.kotlin.jvm' version '2.1.0'
12+
id 'org.jetbrains.kotlin.jvm' version '2.2.21'
1313
}
1414

1515
dependencies {
1616
compileOnly gradleApi()
1717

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

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

26-
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.20'
26+
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.21'
2727
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:${jacksonVersion}"
2828

2929
// Sticking with this older version for now as the latest 1.x version introduces breaking changes.

test-app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ mlWaitTillReady {
3131
}
3232

3333
dependencies {
34-
implementation "io.undertow:undertow-core:2.3.20.Final"
35-
implementation "io.undertow:undertow-servlet:2.3.20.Final"
34+
implementation "io.undertow:undertow-core:2.3.23.Final"
35+
implementation "io.undertow:undertow-servlet:2.3.23.Final"
3636
implementation 'org.slf4j:slf4j-api:2.0.17'
37-
implementation 'ch.qos.logback:logback-classic:1.5.23'
37+
implementation "ch.qos.logback:logback-classic:${logbackVersion}"
3838
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
3939
implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
4040
}

0 commit comments

Comments
 (0)