Skip to content

Commit 1aee82a

Browse files
authored
Merge pull request #1594 from marklogic/feature/jackson-bump
Bumping Jackson dependencies to latest
2 parents 69be3f7 + 5162e40 commit 1aee82a

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

NOTICE.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6370,7 +6370,7 @@ License Text (http://spdx.org/licenses/Apache-2.0)
63706370
Made available under the Apache License 2.0. See Appendix for full text.
63716371

63726372
Source materials are available for download at: https://github.com/FasterXML/jackson-annotations
6373-
Jackson Annotations 2.14.1
6373+
Jackson Annotations 2.15.2
63746374
Attribution Statements
63756375
http://wiki.fasterxml.com/JacksonHome
63766376

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

64056405
Source materials are available for download at: https://github.com/FasterXML/jackson-core
6406-
Jackson Core 2.14.1
6406+
Jackson Core 2.15.2
64076407
Attribution Statements
64086408
http://wiki.fasterxml.com/JacksonHome
64096409

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

64526452
Source materials are available for download at: https://github.com/FasterXML/jackson-databind
6453-
Jackson Databind 2.14.1
6453+
Jackson Databind 2.15.2
64546454
Attribution Statements
64556455
http://wiki.fasterxml.com/JacksonHome
64566456

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

64706470
Source materials are available for download at: https://github.com/FasterXML/jackson-databind
6471-
Jackson Dataformat CSV 2.10.3
6471+
Jackson Dataformat CSV 2.15.2
64726472
Attribution Statements
64736473
https://github.com/FasterXML/jackson-dataformat-csv
64746474

examples/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
api 'com.squareup.okhttp3:okhttp:4.11.0'
2222
api 'io.github.rburgst:okhttp-digest:2.7'
2323
api 'org.slf4j:slf4j-api:1.7.36'
24-
api 'com.fasterxml.jackson.core:jackson-databind:2.14.3'
24+
api 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
2525

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

marklogic-client-api-functionaltests/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ dependencies {
2525
implementation 'commons-io:commons-io:2.11.0'
2626
implementation 'com.squareup.okio:okio:3.4.0'
2727
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
28-
implementation 'com.fasterxml.jackson.core:jackson-core:2.14.3'
29-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.3'
28+
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2'
29+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
3030
implementation "org.jdom:jdom2:2.0.6.1"
3131
implementation "com.marklogic:ml-app-deployer:4.5.2"
3232

marklogic-client-api/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ dependencies {
2121
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
2222
implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0'
2323
implementation 'io.github.rburgst:okhttp-digest:2.7'
24-
24+
2525
implementation 'com.sun.mail:javax.mail:1.6.2'
2626
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
2727
implementation 'org.slf4j:slf4j-api:1.7.36'
28-
implementation 'com.fasterxml.jackson.core:jackson-core:2.14.3'
29-
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.14.3'
30-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.3'
31-
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.14.3'
28+
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2'
29+
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.2'
30+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
31+
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.2'
3232

3333
// Only used by extras (which some examples then depend on)
3434
// Forcing codec version to avoid vulnerability with older version in httpclient
@@ -54,7 +54,7 @@ dependencies {
5454
testImplementation 'com.squareup.okio:okio:3.4.0'
5555
testImplementation "com.squareup.okhttp3:mockwebserver:4.11.0"
5656

57-
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.3'
57+
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2'
5858
testImplementation 'ch.qos.logback:logback-classic:1.3.5'
5959
// schema validation issue with testImplementation 'xerces:xercesImpl:2.12.0'
6060
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.6.20'
15-
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.1'
15+
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2'
1616
implementation 'com.networknt:json-schema-validator:1.0.76'
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.14.3</version>
73+
<version>2.15.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.14.3</version>
79+
<version>2.15.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.14.3</version>
85+
<version>2.15.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.14.3</version>
91+
<version>2.15.2</version>
9292
<scope>runtime</scope>
9393
</dependency>
9494
</dependencies>

test-app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
implementation "com.marklogic:ml-javaclient-util:4.5.1"
1111
implementation 'org.slf4j:slf4j-api:1.7.36'
1212
implementation 'ch.qos.logback:logback-classic:1.3.5'
13-
implementation "com.fasterxml.jackson.core:jackson-databind:2.14.3"
13+
implementation "com.fasterxml.jackson.core:jackson-databind:2.15.2"
1414
implementation 'com.squareup.okio:okio:3.4.0'
1515
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
1616
}

0 commit comments

Comments
 (0)