Skip to content

Commit f666ef4

Browse files
committed
Bumped Jackson dependencies to 2.17.2
This is the latest version. We'll still ignore them in the Spark connector so we defer to whatever version Spark uses. Not expecting any issues, assuming no breaking changes from Jackson 2.15 to 2.17.
1 parent 3853f33 commit f666ef4

File tree

8 files changed

+29
-24
lines changed

8 files changed

+29
-24
lines changed

NOTICE.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Made available under the Apache License 2.0. See Appendix for full text.
7676

7777
Source materials are available for download at: https://github.com/apache/commons-lang
7878

79-
Jackson Annotations 2.15.3
79+
Jackson Annotations 2.17.2
8080
Attribution Statements
8181
http://wiki.fasterxml.com/JacksonHome
8282

@@ -86,7 +86,7 @@ Copyright ©2009 FasterXML, LLC
8686
License Text (http://spdx.org/licenses/Apache-2.0)
8787
Made available under the Apache License 2.0. See Appendix for full text.
8888

89-
Jackson Core 2.15.3
89+
Jackson Core 2.17.2
9090
Attribution Statements
9191
http://wiki.fasterxml.com/JacksonHome
9292

@@ -98,7 +98,7 @@ Made available under the Apache License 2.0. See Appendix for full text.
9898

9999
Source materials are available for download at: https://github.com/FasterXML/jackson-core
100100

101-
Jackson Databind 2.15.3
101+
Jackson Databind 2.17.2
102102
Attribution Statements
103103
http://wiki.fasterxml.com/JacksonHome
104104

@@ -116,7 +116,7 @@ License Text (http://www.apache.org/licenses/LICENSE-2.0.txt)
116116
Made available under the Apache License 2.0. See Appendix for full text.
117117

118118
Source materials are available for download at: https://github.com/FasterXML/jackson-databind
119-
Jackson Dataformat CSV 2.15.3
119+
Jackson Dataformat CSV 2.17.2
120120
Attribution Statements
121121
https://github.com/FasterXML/jackson-dataformat-csv
122122

examples/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
api 'com.squareup.okhttp3:okhttp:4.11.0'
1717
api 'io.github.rburgst:okhttp-digest:2.7'
1818
api 'org.slf4j:slf4j-api:1.7.36'
19-
api 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
19+
api "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
2020

2121
// hsqldb < 2.7 has a High CVE - https://nvd.nist.gov/vuln/detail/CVE-2022-41853 .
2222
// And hsqldb 2.6+ requires Java 11+. So this is ignored, along with the associated test,

gradle.properties

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

6+
jacksonVersion=2.17.2
7+
68
# Defined at this level so that they can be set as system properties and used by the marklogic-client-api and test-app
79
# project
810
mlHost=localhost

marklogic-client-api-functionaltests/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ dependencies {
2424
implementation 'org.slf4j:slf4j-api:1.7.36'
2525
implementation 'commons-io:commons-io:2.11.0'
2626
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
27-
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.3'
28-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.3'
27+
implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
28+
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
2929
implementation "org.jdom:jdom2:2.0.6.1"
30-
implementation "com.marklogic:ml-app-deployer:4.7.0"
30+
implementation ("com.marklogic:ml-app-deployer:4.8.0") {
31+
exclude module: "marklogic-client-api"
32+
}
3133

3234
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
3335
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'

marklogic-client-api/build.gradle

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ dependencies {
2727

2828
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
2929
implementation 'org.slf4j:slf4j-api:1.7.36'
30-
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.3'
31-
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.3'
32-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.3'
33-
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.3'
30+
implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
31+
implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
32+
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
33+
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:${jacksonVersion}"
3434

3535
// Only used by extras (which some examples then depend on)
3636
// Forcing codec version to avoid vulnerability with older version in httpclient
@@ -46,16 +46,17 @@ dependencies {
4646
testImplementation 'org.xmlunit:xmlunit-legacy:2.9.1'
4747
testImplementation project(':examples')
4848

49-
// Allows talking to the Manage API. It depends on the Java Client itself, which will usually be a slightly older
50-
// version, but that should not have any impact on the tests.
51-
testImplementation "com.marklogic:ml-app-deployer:4.7.0"
49+
// Allows talking to the Manage API.
50+
testImplementation ("com.marklogic:ml-app-deployer:4.8.0") {
51+
exclude module: "marklogic-client-api"
52+
}
5253

5354
// Starting with mockito 5.x, Java 11 is required, so sticking with 4.x as we have to support Java 8.
5455
testImplementation "org.mockito:mockito-core:4.11.0"
5556
testImplementation "org.mockito:mockito-inline:4.11.0"
5657
testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
5758

58-
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.3'
59+
testImplementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jacksonVersion}"
5960
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
6061
// schema validation issue with testImplementation 'xerces:xercesImpl:2.12.0'
6162
testImplementation 'org.opengis.cite.xerces:xercesImpl-xsd11:2.12-beta-r1667115'

ml-development-tools/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
compileOnly gradleApi()
1313
implementation project(':marklogic-client-api')
1414
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.22'
15-
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.3'
15+
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:${jacksonVersion}"
1616
implementation 'com.networknt:json-schema-validator:1.0.88'
1717

1818
// 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
@@ -70,25 +70,25 @@ It is not intended to be used to build this project.
7070
<dependency>
7171
<groupId>com.fasterxml.jackson.core</groupId>
7272
<artifactId>jackson-core</artifactId>
73-
<version>2.15.2</version>
73+
<version>2.17.2</version>
7474
<scope>runtime</scope>
7575
</dependency>
7676
<dependency>
7777
<groupId>com.fasterxml.jackson.core</groupId>
7878
<artifactId>jackson-annotations</artifactId>
79-
<version>2.15.2</version>
79+
<version>2.17.2</version>
8080
<scope>runtime</scope>
8181
</dependency>
8282
<dependency>
8383
<groupId>com.fasterxml.jackson.core</groupId>
8484
<artifactId>jackson-databind</artifactId>
85-
<version>2.15.2</version>
85+
<version>2.17.2</version>
8686
<scope>runtime</scope>
8787
</dependency>
8888
<dependency>
8989
<groupId>com.fasterxml.jackson.dataformat</groupId>
9090
<artifactId>jackson-dataformat-csv</artifactId>
91-
<version>2.15.2</version>
91+
<version>2.17.2</version>
9292
<scope>runtime</scope>
9393
</dependency>
9494
</dependencies>

test-app/build.gradle

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

77
dependencies {
88
implementation "io.undertow:undertow-core:2.2.24.Final"
99
implementation "io.undertow:undertow-servlet:2.2.24.Final"
10-
implementation "com.marklogic:ml-javaclient-util:4.6.0"
10+
implementation "com.marklogic:ml-javaclient-util:4.8.0"
1111
implementation 'org.slf4j:slf4j-api:1.7.36'
1212
implementation 'ch.qos.logback:logback-classic:1.3.14'
13-
implementation "com.fasterxml.jackson.core:jackson-databind:2.15.3"
13+
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
1414
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
1515
}
1616

0 commit comments

Comments
 (0)