Skip to content

Commit 5818b49

Browse files
committed
MLE-24523 Bumped OkHttp and Jackson to latest
Bumped Kotlin in ml-development-tools to be consistent with the Kotlin used by OkHttp 5.2.0
1 parent ec509dd commit 5818b49

File tree

4 files changed

+25
-28
lines changed

4 files changed

+25
-28
lines changed

NOTICE.txt

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@ product and version for which you are requesting source code.
1010

1111
Third Party Notices
1212

13-
jackson-databind 2.19.0 (Apache-2.0)
14-
jackson-dataformat-csv 2.19.0 (Apache-2.0)
15-
okhttp 4.12.0 (Apache-2.0)
16-
logging-interceptor 4.12.0 (Apache-2.0)
17-
jakarta.mail 2.0.1 (EPL-1.0)
18-
okhttp-digest 2.7 (Apache-2.0)
19-
jakarta.xml.bind-api 3.0.1 (EPL-1.0)
20-
javax.ws.rs-api 2.1.1 (CDDL-1.1)
21-
jaxb-runtime 3.0.2 (CDDL-1.1)
13+
jackson-databind 2.20.0 (Apache-2.0)
14+
jackson-dataformat-csv 2.20.0 (Apache-2.0)
15+
okhttp 5.2.0 (Apache-2.0)
16+
logging-interceptor 5.2.0 (Apache-2.0)
17+
jakarta.mail 2.0.2 (EPL-1.0)
18+
okhttp-digest 3.1.1 (Apache-2.0)
19+
jakarta.xml.bind-api 4.0.4 (EPL-1.0)
20+
jaxb-runtime 4.0.6 (CDDL-1.1)
2221
slf4j-api 2.0.17 (Apache-2.0)
2322

2423
Common Licenses
@@ -31,39 +30,35 @@ Third-Party Components
3130

3231
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):
3332

34-
jackson-databind 2.19.0 (Apache-2.0)
33+
jackson-databind 2.20.0 (Apache-2.0)
3534
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/
3635
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
3736

38-
jackson-dataformat-csv 2.19.0 (Apache-2.0)
37+
jackson-dataformat-csv 2.20.0 (Apache-2.0)
3938
https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-csv/
4039
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
4140

42-
okhttp 4.12.0 (Apache-2.0)
41+
okhttp 5.2.0 (Apache-2.0)
4342
https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/
4443
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
4544

46-
logging-interceptor 4.12.0 (Apache-2.0)
45+
logging-interceptor 5.2.0 (Apache-2.0)
4746
https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor/
4847
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
4948

50-
jakarta.mail 2.0.1 (Apache-2.0)
49+
jakarta.mail 2.0.2 (Apache-2.0)
5150
https://repo1.maven.org/maven2/com/sun/mail/jakarta.mail/
5251
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
5352

54-
okhttp-digest 2.7 (Apache-2.0)
53+
okhttp-digest 3.1.1 (Apache-2.0)
5554
https://repo1.maven.org/maven2/io/github/rburgst/okhttp-digest/
5655
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
5756

58-
jakarta.xml.bind-api 3.0.1 (Apache-2.0)
57+
jakarta.xml.bind-api 4.0.4 (Apache-2.0)
5958
https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/
6059
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
6160

62-
javax.ws.rs-api 2.1.1 (Apache-2.0)
63-
https://repo1.maven.org/maven2/javax/ws/rs/javax.ws.rs-api/
64-
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
65-
66-
jaxb-runtime 3.0.2 (Apache-2.0)
61+
jaxb-runtime 4.0.6 (Apache-2.0)
6762
https://repo1.maven.org/maven2/org/glassfish/jaxb/jaxb-runtime/
6863
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
6964

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ group=com.marklogic
22
version=8.0-SNAPSHOT
33
publishUrl=file:../marklogic-java/releases
44

5-
okhttpVersion=5.1.0
5+
okhttpVersion=5.2.0
66

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

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

ml-development-tools/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ dependencies {
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.1.0'
26+
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.20'
2727
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:${jacksonVersion}"
28+
29+
// Sticking with this older version for now as the latest 1.x version introduces breaking changes.
2830
implementation 'com.networknt:json-schema-validator:1.0.88'
2931

3032
// Not yet migrating this project to JUnit 5. Will reconsider it once we have a reason to enhance

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ It is not intended to be used to build this project.
2828
<dependency>
2929
<groupId>com.squareup.okhttp3</groupId>
3030
<artifactId>okhttp</artifactId>
31-
<version>5.1.0</version>
31+
<version>5.2.0</version>
3232
<scope>runtime</scope>
3333
</dependency>
3434
<dependency>
3535
<groupId>com.squareup.okhttp3</groupId>
3636
<artifactId>logging-interceptor</artifactId>
37-
<version>5.1.0</version>
37+
<version>5.2.0</version>
3838
<scope>runtime</scope>
3939
</dependency>
4040
<dependency>
@@ -58,13 +58,13 @@ It is not intended to be used to build this project.
5858
<dependency>
5959
<groupId>com.fasterxml.jackson.core</groupId>
6060
<artifactId>jackson-databind</artifactId>
61-
<version>2.19.0</version>
61+
<version>2.20.0</version>
6262
<scope>runtime</scope>
6363
</dependency>
6464
<dependency>
6565
<groupId>com.fasterxml.jackson.dataformat</groupId>
6666
<artifactId>jackson-dataformat-csv</artifactId>
67-
<version>2.19.0</version>
67+
<version>2.20.0</version>
6868
<scope>runtime</scope>
6969
</dependency>
7070
</dependencies>

0 commit comments

Comments
 (0)