Skip to content

Bumping Jackson dependencies to latest #1594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6370,7 +6370,7 @@ License Text (http://spdx.org/licenses/Apache-2.0)
Made available under the Apache License 2.0. See Appendix for full text.

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

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

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

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

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
api 'com.squareup.okhttp3:okhttp:4.11.0'
api 'io.github.rburgst:okhttp-digest:2.7'
api 'org.slf4j:slf4j-api:1.7.36'
api 'com.fasterxml.jackson.core:jackson-databind:2.14.3'
api 'com.fasterxml.jackson.core:jackson-databind:2.15.2'

// hsqldb < 2.7 has a High CVE - https://nvd.nist.gov/vuln/detail/CVE-2022-41853 .
// And hsqldb 2.6+ requires Java 11+. So this is ignored, along with the associated test,
Expand Down
4 changes: 2 additions & 2 deletions marklogic-client-api-functionaltests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ dependencies {
implementation 'commons-io:commons-io:2.11.0'
implementation 'com.squareup.okio:okio:3.4.0'
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
implementation 'com.fasterxml.jackson.core:jackson-core:2.14.3'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.3'
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
implementation "org.jdom:jdom2:2.0.6.1"
implementation "com.marklogic:ml-app-deployer:4.5.2"

Expand Down
12 changes: 6 additions & 6 deletions marklogic-client-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0'
implementation 'io.github.rburgst:okhttp-digest:2.7'

implementation 'com.sun.mail:javax.mail:1.6.2'
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
implementation 'org.slf4j:slf4j-api:1.7.36'
implementation 'com.fasterxml.jackson.core:jackson-core:2.14.3'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.14.3'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.3'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.14.3'
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.2'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.2'

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

testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.3'
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2'
testImplementation 'ch.qos.logback:logback-classic:1.3.5'
// schema validation issue with testImplementation 'xerces:xercesImpl:2.12.0'
testImplementation 'org.opengis.cite.xerces:xercesImpl-xsd11:2.12-beta-r1667115'
Expand Down
2 changes: 1 addition & 1 deletion ml-development-tools/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
compileOnly gradleApi()
implementation project(':marklogic-client-api')
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.20'
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.1'
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2'
implementation 'com.networknt:json-schema-validator:1.0.76'

// Not yet migrating this project to JUnit 5. Will reconsider it once we have a reason to enhance
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,25 +70,25 @@ It is not intended to be used to build this project.
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.14.3</version>
<version>2.15.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.14.3</version>
<version>2.15.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.3</version>
<version>2.15.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
<version>2.14.3</version>
<version>2.15.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion test-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
implementation "com.marklogic:ml-javaclient-util:4.5.1"
implementation 'org.slf4j:slf4j-api:1.7.36'
implementation 'ch.qos.logback:logback-classic:1.3.5'
implementation "com.fasterxml.jackson.core:jackson-databind:2.14.3"
implementation "com.fasterxml.jackson.core:jackson-databind:2.15.2"
implementation 'com.squareup.okio:okio:3.4.0'
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
}
Expand Down