Skip to content

Commit 5eaa965

Browse files
committed
MLE-24504 Bumping all dependencies
Should make Black Duck happy as well. Not touching the Jakarta APIs yet, going to take care of that in a follow up PR as that needs more testing.
1 parent 9ee3b91 commit 5eaa965

File tree

8 files changed

+34
-37
lines changed

8 files changed

+34
-37
lines changed

.copyrightconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ startyear: 2010
1111
# - Dotfiles already skipped automatically
1212
# Enable by removing the leading '# ' from the next line and editing values.
1313
# filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
14-
filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat
14+
filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, *.md

CONTRIBUTING.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ To build the client locally, complete the following steps:
77

88
1. Clone this repository on your machine.
99
2. Choose the appropriate branch (usually develop)
10-
3. Ensure you are using Java 8 or Java 11 or Java 17 (the JVM version used to compile should not matter as compiler flags
11-
are set to ensure the compiled code will run on Java 8; Jenkins pipelines also exist to ensure that the tests pass on
12-
Java 8, 11, and 17, and thus they should for you locally as well; note that if you load the project into an IDE, you
13-
should use Java 8 in case your IDE does not process the build.gradle config that conditionally brings in JAXB dependencies
14-
required by Java 9+.)
10+
3. Ensure you are using Java 17.
1511
4. Verify that you can build the client by running `./gradlew build -x test`
1612

1713
"Running the tests" in the context of developing and submitting a pull request refers to running the tests found

examples/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ dependencies {
1010
// The 'api' configuration is used so that the test configuration in marklogic-client-api doesn't have to declare
1111
// all of these dependencies. This library project won't otherwise be depended on by anything else as it's not
1212
// setup for publishing.
13-
api 'com.squareup.okhttp3:okhttp:4.12.0'
14-
api 'io.github.rburgst:okhttp-digest:2.7'
13+
api "com.squareup.okhttp3:okhttp:${okhttpVersion}"
14+
api 'io.github.rburgst:okhttp-digest:3.1.1'
1515
api 'org.slf4j:slf4j-api:2.0.17'
1616
api "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
1717

1818
api 'org.jdom:jdom2:2.0.6.1'
19-
api 'org.dom4j:dom4j:2.1.4'
20-
api 'com.google.code.gson:gson:2.10.1'
19+
api 'org.dom4j:dom4j:2.2.0'
20+
api 'com.google.code.gson:gson:2.13.2'
2121
api 'net.sourceforge.htmlcleaner:htmlcleaner:2.29'
22-
api ('com.opencsv:opencsv:5.11.2') {
22+
api ('com.opencsv:opencsv:5.12.0') {
2323
// Excluding this due to a security vulnerability, and the test for the example that uses this library
2424
// passes without this on the classpath.
2525
exclude module: "commons-beanutils"
2626
}
27-
api 'org.apache.commons:commons-lang3:3.18.0'
27+
api 'org.apache.commons:commons-lang3:3.19.0'
2828
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ version=8.0-SNAPSHOT
33
describedName=MarkLogic Java Client API
44
publishUrl=file:../marklogic-java/releases
55

6+
okhttpVersion=5.1.0
7+
68
# See https://github.com/FasterXML/jackson for more information on the Jackson libraries.
79
jacksonVersion=2.19.0
810

marklogic-client-api-functionaltests/build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,22 @@ dependencies {
1818
testImplementation project(':marklogic-client-api')
1919
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
2020
testImplementation 'org.slf4j:slf4j-api:2.0.17'
21-
testImplementation 'commons-io:commons-io:2.17.0'
22-
testImplementation 'com.squareup.okhttp3:okhttp:5.1.0'
21+
testImplementation 'commons-io:commons-io:2.20.0'
22+
testImplementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
2323
testImplementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
2424
testImplementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
2525
testImplementation "org.jdom:jdom2:2.0.6.1"
2626

27-
testImplementation 'org.apache.commons:commons-lang3:3.18.0'
27+
testImplementation 'org.apache.commons:commons-lang3:3.19.0'
28+
2829
// Allows talking to the Manage API.
29-
testImplementation("com.marklogic:ml-app-deployer:5.0.0") {
30+
testImplementation("com.marklogic:ml-app-deployer:6.0.1") {
3031
exclude module: "marklogic-client-api"
31-
// Use the commons-lang3 declared above to keep Black Duck happy.
32-
exclude module: "commons-lang3"
3332
}
3433

3534
testImplementation 'ch.qos.logback:logback-classic:1.5.18'
3635
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
37-
testImplementation 'org.xmlunit:xmlunit-legacy:2.10.0'
36+
testImplementation 'org.xmlunit:xmlunit-legacy:2.10.4'
3837

3938
// Without this, once using JUnit 5.12 or higher, Gradle will not find any tests and report an error of:
4039
// org.junit.platform.commons.JUnitException: TestEngine with ID 'junit-jupiter' failed to discover tests

marklogic-client-api/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ dependencies {
1818
api "jakarta.xml.bind:jakarta.xml.bind-api:3.0.1"
1919
implementation "org.glassfish.jaxb:jaxb-runtime:3.0.2"
2020

21-
implementation 'com.squareup.okhttp3:okhttp:5.1.0'
22-
implementation 'com.squareup.okhttp3:logging-interceptor:5.1.0'
21+
implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
22+
implementation "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"
2323
implementation 'io.github.rburgst:okhttp-digest:3.1.1'
2424

2525
// We tried upgrading to the org.eclipse.angus:angus-mail dependency, but we ran into significant performance issues
2626
// with using the Java Client eval call in our Spark connector. Example - an eval() call for getting 50k URIs would
2727
// take 50s instead of 2 to 3s. Haven't dug into the details, but seems like the call isn't lazy and the entire set
2828
// of URIs is being retrieved. This implementation - in the old "com.sun.mail" package but still adhering to the new
2929
// jakarta.mail API - works fine and performs well for eval calls.
30-
implementation "com.sun.mail:jakarta.mail:2.0.1"
30+
implementation "com.sun.mail:jakarta.mail:2.0.2"
3131

3232
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
3333
implementation 'org.slf4j:slf4j-api:2.0.17'
@@ -36,22 +36,21 @@ dependencies {
3636

3737
// Only used by extras (which some examples then depend on)
3838
compileOnly 'org.jdom:jdom2:2.0.6.1'
39-
compileOnly 'org.dom4j:dom4j:2.1.4'
40-
compileOnly 'com.google.code.gson:gson:2.10.1'
39+
compileOnly 'org.dom4j:dom4j:2.2.0'
40+
compileOnly 'com.google.code.gson:gson:2.13.2'
4141

4242
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
4343

4444
// Forcing junit version to avoid vulnerability with older version in xmlunit
4545
testImplementation 'junit:junit:4.13.2'
46-
testImplementation 'org.xmlunit:xmlunit-legacy:2.10.0'
46+
testImplementation 'org.xmlunit:xmlunit-legacy:2.10.4'
4747
testImplementation project(':examples')
4848

49-
testImplementation 'org.apache.commons:commons-lang3:3.18.0'
49+
testImplementation 'org.apache.commons:commons-lang3:3.19.0'
50+
5051
// Allows talking to the Manage API.
51-
testImplementation ("com.marklogic:ml-app-deployer:5.0.0") {
52+
testImplementation ("com.marklogic:ml-app-deployer:6.0.1") {
5253
exclude module: "marklogic-client-api"
53-
// Use the commons-lang3 declared above to keep Black Duck happy.
54-
exclude module: "commons-lang3"
5554
}
5655

5756
// Starting with mockito 5.x, Java 11 is required, so sticking with 4.x as we have to support Java 8.
@@ -65,11 +64,12 @@ dependencies {
6564
// Using this to avoid a schema validation issue with the regular xercesImpl
6665
testImplementation 'org.opengis.cite.xerces:xercesImpl-xsd11:2.12-beta-r1667115'
6766

68-
testImplementation('com.opencsv:opencsv:5.11.2') {
67+
testImplementation('com.opencsv:opencsv:5.12.0') {
6968
// Excluding this due to a security vulnerability, and the test for the example that uses this library
7069
// passes without this on the classpath.
7170
exclude module: "commons-beanutils"
7271
}
72+
7373
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
7474

7575
// Automatic loading of test framework implementation dependencies is deprecated.
@@ -101,7 +101,7 @@ javadoc {
101101
options.overview = "src/main/javadoc/overview.html"
102102
options.windowTitle = "$rootProject.describedName $rootProject.version"
103103
options.docTitle = "$rootProject.describedName $rootProject.version"
104-
options.bottom = "Copyright © 2024 MarkLogic Corporation. All Rights Reserved."
104+
options.bottom = "Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved."
105105
options.links = [ 'http://docs.oracle.com/javase/8/docs/api/' ]
106106
options.use = true
107107
if (JavaVersion.current().isJava9Compatible()) {

ml-development-tools/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
testImplementation 'xmlunit:xmlunit:1.6'
2424
testCompileOnly gradleTestKit()
2525

26-
testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
26+
testImplementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
2727
}
2828

2929
// Added to avoid problem where processResources fails because - somehow - the plugin properties file is getting

test-app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
plugins {
2-
id 'com.marklogic.ml-gradle' version '5.0.0'
2+
id 'com.marklogic.ml-gradle' version '6.0.1'
33
id 'java'
44
id "com.github.psxpaul.execfork" version "0.2.2"
55
}
66

77
dependencies {
8-
implementation "io.undertow:undertow-core:2.2.37.Final"
9-
implementation "io.undertow:undertow-servlet:2.2.37.Final"
8+
implementation "io.undertow:undertow-core:2.3.19.Final"
9+
implementation "io.undertow:undertow-servlet:2.3.19.Final"
1010
implementation 'org.slf4j:slf4j-api:2.0.17'
11-
implementation 'ch.qos.logback:logback-classic:1.3.15'
11+
implementation 'ch.qos.logback:logback-classic:1.5.18'
1212
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
13-
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
13+
implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
1414
}
1515

1616
// See https://github.com/psxpaul/gradle-execfork-plugin for docs.

0 commit comments

Comments
 (0)