Skip to content

Commit a04fd99

Browse files
committed
MLE-24402 Spark 4 requires Jackson 2.18.2, not 2.17.2
This is good! Commenting out the Caddy config as it's causing Jenkins to complain, and it's optional.
1 parent 00eea7d commit a04fd99

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

NOTICE.txt

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

1111
Third Party Notices
1212

13-
jackson-dataformat-xml 2.17.2 (Apache-2.0)
13+
jackson-dataformat-xml 2.18.2 (Apache-2.0)
1414
jdom2 2.0.6.1 (Apache-2.0)
1515
jena-arq 5.5.0 (Apache-2.0)
1616
langchain4j 1.5.0 (Apache-2.0)
@@ -24,7 +24,7 @@ Third-Party Components
2424

2525
The following is a list of the third-party components used by the MarkLogic® Spark connector 2.7.0 (last updated July 31, 2025):
2626

27-
jackson-dataformat-xml 2.17.2 (Apache-2.0)
27+
jackson-dataformat-xml 2.18.2 (Apache-2.0)
2828
https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/
2929
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
3030

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ subprojects {
4747
details.because "Using 3.4.2 to minimize CVEs and because Flux is doing the same thing. This only affects the connector tests."
4848
}
4949
if (details.requested.group.startsWith('com.fasterxml.jackson')) {
50-
details.useVersion '2.17.2'
51-
details.because 'Need to match the version used by Spark.'
50+
details.useVersion '2.18.2'
51+
details.because 'Need to match the version used by Spark 4.0.1.'
5252
}
5353
if (details.requested.group.equals("org.slf4j")) {
5454
details.useVersion "2.0.17"

docker-compose.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ services:
44

55
# See https://caddyserver.com/docs/quick-starts/reverse-proxy for more information on using Caddy as a reverse proxy
66
# and load balancer.
7-
caddy-load-balancer:
8-
image: caddy:2-alpine
9-
# The NET_RAW capability allows a process to create raw sockets. Polaris does not like that.
10-
# This setting removes the NET_RAW capability from the container.
11-
cap_drop:
12-
- NET_RAW
13-
volumes:
14-
# Not mapping the Caddy data directory, as that causes issues for Jenkins.
15-
- ./docker/caddy/config/Caddyfile:/etc/caddy/Caddyfile
16-
ports:
17-
# Expand this range as needed. See Caddyfile for which ports are used for reverse proxies.
18-
- "8115:8115"
19-
- "8116:8116"
7+
# caddy-load-balancer:
8+
# image: caddy:2-alpine
9+
# # The NET_RAW capability allows a process to create raw sockets. Polaris does not like that.
10+
# # This setting removes the NET_RAW capability from the container.
11+
# cap_drop:
12+
# - NET_RAW
13+
# volumes:
14+
# # Not mapping the Caddy data directory, as that causes issues for Jenkins.
15+
# - ./docker/caddy/config/Caddyfile:/etc/caddy/Caddyfile
16+
# ports:
17+
# # Expand this range as needed. See Caddyfile for which ports are used for reverse proxies.
18+
# - "8115:8115"
19+
# - "8116:8116"
2020

2121
marklogic:
2222
image: "${MARKLOGIC_IMAGE}"

marklogic-spark-connector/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
compileOnly "org.apache.spark:spark-sql_2.13:${sparkVersion}"
2121

2222
// This is compileOnly as Spark will provide its own copy at runtime.
23-
compileOnly "com.fasterxml.jackson.core:jackson-databind:2.17.2"
23+
compileOnly "com.fasterxml.jackson.core:jackson-databind:2.18.2"
2424

2525
shadowDependencies("com.marklogic:marklogic-client-api:7.2.0") {
2626
// Need to use the versions of Jackson preferred by Spark.
@@ -47,7 +47,7 @@ dependencies {
4747
shadowDependencies "org.apache.tika:tika-core:${tikaVersion}"
4848

4949
// Needed for using XmlMapper.
50-
shadowDependencies("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.2") {
50+
shadowDependencies("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.18.2") {
5151
// Not needed, as the modules in this group that this dependency depends on are all provided by Spark.
5252
exclude group: "com.fasterxml.jackson.core"
5353
}

0 commit comments

Comments
 (0)