Skip to content

Bump jackson to 2.18.4 and fabric8 to 7.2.0 #18013

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.

Sign up for GitHub

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
kgyrtkirk merged 13 commits into from
Jun 19, 2025
Merged

Bump jackson to 2.18.4 and fabric8 to 7.2.0 #18013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
353c7d4
Bump jackson to 2.18.4 and fabric8 to 7.2.0
capistrant May 16, 2025
c1e6e79
Update licenses.yaml
capistrant May 16, 2025
7275ebc
licenses change and bump for vertx core version to match other vertx …
capistrant May 19, 2025
29f5b20
bump some jackson to 2.18.4.1
capistrant Jun 12, 2025
6225dd6
Exclude jaxb-api from sneaking back into distribution
capistrant Jun 12, 2025
f4f7352
Fixup jackson licenses definitions
capistrant Jun 13, 2025
6970d04
improve pom naming for jackson version vars
capistrant Jun 13, 2025
8f69a18
test coverage
capistrant Jun 13, 2025
6890dec
checkstyle
capistrant Jun 13, 2025
46b3dc9
licenses.yaml fixup
capistrant Jun 13, 2025
bc6cca8
Update comment to add detail on unreachable code
capistrant Jun 15, 2025
1d42329
Ban javax.xml.bind:jaxb-api and add more excludes for provided scope …
capistrant Jun 16, 2025
92b2778
Fixup more enforcer errors
capistrant Jun 16, 2025
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
6 changes: 6 additions & 0 deletions extensions-contrib/aliyun-oss-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>3.11.3</version>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
6 changes: 6 additions & 0 deletions extensions-contrib/ddsketch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions-contrib/druid-deltalake-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.7.1</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
Expand Down
12 changes: 12 additions & 0 deletions extensions-contrib/tdigestsketch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,23 @@
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-smile-provider</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
Expand Down
6 changes: 6 additions & 0 deletions extensions-core/datasketches/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,12 @@
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
Expand Down
6 changes: 6 additions & 0 deletions extensions-core/druid-catalog/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,12 @@
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-smile-provider</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
Expand Down
22 changes: 3 additions & 19 deletions extensions-core/kubernetes-overlord-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,9 @@
</parent>

<properties>
<!-- fabric8 6.13.2+ is incompatible with jackson 2.12
~ due to fix for https://github.com/fabric8io/kubernetes-client/issues/6110.
~ GoIntegerDeserializer uses a _parseInteger method that does not exist in 2.12 (introduced in 2.14) -->
<fabric8.version>6.13.1</fabric8.version>
<fabric8.version>7.2.0</fabric8.version>
</properties>

<dependencyManagement>
<dependencies>
<!-- snakeyaml explicitly pinned to version 1.33 as it is
a transitive dependency of com.fasterxml.jackson.dataformat:jackson-dataformat-yaml 2.12.7
please remove this pin, after updating jackson-dataform-yaml to version > 2.14.3 / 2.15.0 -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.33</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.druid</groupId>
Expand Down Expand Up @@ -155,7 +139,7 @@
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
<version>4.5.8</version>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
Expand Down Expand Up @@ -198,7 +182,7 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>mockwebserver</artifactId>
<version>0.2.2</version>
<version>${fabric8.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 6 additions & 0 deletions extensions-core/multi-stage-query/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-smile-provider</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
Expand Down
6 changes: 6 additions & 0 deletions extensions-core/testing-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,12 @@
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
Expand Down
6 changes: 6 additions & 0 deletions indexing-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,12 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-smile-provider</artifactId>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
Expand Down
6 changes: 6 additions & 0 deletions integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,12 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-smile-provider</artifactId>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
53 changes: 39 additions & 14 deletions licenses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,40 @@ name: Jackson
license_category: binary
module: java-core
license_name: Apache License version 2.0
version: 2.12.7
version: 2.18.4.1
libraries:
- com.fasterxml.jackson.core: jackson-annotations
- com.fasterxml.jackson.core: jackson-core
notice: |
# Jackson JSON processor

Jackson is a high-performance, Free/Open Source JSON processing library.
It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
been in development since 2007.
It is currently developed by a community of developers, as well as supported
commercially by FasterXML.com.

## Licensing

Jackson core and extension components may licensed under different licenses.
To find the details that apply to this artifact see the accompanying LICENSE file.
For more information, including possible other licensing options, contact
FasterXML.com (http://fasterxml.com).

## Credits

A list of contributors may be found from CREDITS file, which is included
in some artifacts (usually source distributions); but is always available
from the source code management (SCM) system project uses.

---

name: Jackson
license_category: binary
module: java-core
license_name: Apache License version 2.0
version: 2.18.4
libraries:
- com.fasterxml.jackson.core: jackson-annotations
- com.fasterxml.jackson.dataformat: jackson-dataformat-cbor
- com.fasterxml.jackson.dataformat: jackson-dataformat-smile
- com.fasterxml.jackson.dataformat: jackson-dataformat-xml
Expand Down Expand Up @@ -264,29 +294,24 @@ notice: |

name: Jackson
license_category: binary
module: java-core
module: extensions-contrib/druid-deltalake-extensions
license_name: Apache License version 2.0
version: 2.12.7.1
version: 2.18.4
libraries:
- com.fasterxml.jackson.core: jackson-databind
notice: |
# Jackson JSON processor

Jackson is a high-performance, Free/Open Source JSON processing library.
It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
been in development since 2007.
It is currently developed by a community of developers, as well as supported
commercially by FasterXML.com.

## Licensing

Jackson core and extension components may licensed under different licenses.
To find the details that apply to this artifact see the accompanying LICENSE file.
For more information, including possible other licensing options, contact
FasterXML.com (http://fasterxml.com).

## Credits

A list of contributors may be found from CREDITS file, which is included
in some artifacts (usually source distributions); but is always available
from the source code management (SCM) system project uses.
Expand Down Expand Up @@ -855,7 +880,7 @@ name: kubernetes fabric java client
license_category: binary
module: extensions-core/kubernetes-overlord-extensions
license_name: Apache License version 2.0
version: 6.13.1
version: 7.2.0
libraries:
- io.fabric8: kubernetes-client-api
- io.fabric8: kubernetes-model-batch
Expand Down Expand Up @@ -887,7 +912,7 @@ name: vertx
license_category: binary
module: extensions-core/kubernetes-overlord-extensions
license_name: Apache License version 2.0
version: 4.5.8
version: 4.5.14
libraries:
- io.vertx: vertx-auth-common
- io.vertx: vertx-core
Expand Down Expand Up @@ -1064,7 +1089,7 @@ name: org.snakeyaml snakeyaml-engine
license_category: binary
module: extensions-core/druid-kubernetes-overlord-extensions
license_name: Apache License version 2.0
version: 2.7
version: 2.9
libraries:
- org.snakeyaml: snakeyaml-engine

Expand All @@ -1074,7 +1099,7 @@ name: org.yaml snakeyaml
license_category: binary
module: extensions-core/druid-kubernetes-overlord-extensions
license_name: Apache License version 2.0
version: 1.33
version: 2.3
libraries:
- org.yaml: snakeyaml

Expand Down Expand Up @@ -2859,7 +2884,7 @@ libraries:
---

name: Jackson Dataformat Yaml
version: 2.12.7
version: 2.18.4
license_category: binary
module: extensions/druid-avro-extensions
license_name: Apache License version 2.0
Expand Down
7 changes: 5 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@
<hamcrest.version>1.3</hamcrest.version>
<jetty.version>9.4.57.v20241219</jetty.version>
<jersey.version>1.19.4</jersey.version>
<jackson.version>2.12.7.20221012</jackson.version>
<jackson.core.version>2.18.4.1</jackson.core.version>
<jackson.version>2.18.4</jackson.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<log4j.version>2.22.1</log4j.version>
<mysql.version>8.2.0</mysql.version>
Expand Down Expand Up @@ -615,7 +616,7 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<version>${jackson.core.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -1702,6 +1703,8 @@
<excludes>
<!--LGPL licenced library-->
<exclude>com.google.code.findbugs:annotations</exclude>
<!-- See https://github.com/apache/druid/pull/17370 -->
<exclude>javax.xml.bind:jaxb-api</exclude>
</excludes>
</bannedDependencies>
</rules>
Expand Down
3 changes: 2 additions & 1 deletion processing/src/main/java/org/apache/druid/jackson/JodaStuff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ public DateTime deserialize(JsonParser jp, DeserializationContext ctxt) throws I
// make sure to preserve time zone information when parsing timestamps
return DateTimes.ISO_DATE_OR_TIME_WITH_OFFSET.parse(str);
}
throw ctxt.mappingException(getValueClass());
ctxt.reportWrongTokenException(handledType(), JsonToken.VALUE_NUMBER_INT, "expected int or string token");
return null; // unreachable ... required for compiler, but ctxt.reportWrongTokenException always throws
}
}
}
14 changes: 14 additions & 0 deletions processing/src/test/java/org/apache/druid/jackson/DefaultObjectMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,20 @@ public void testDateTime() throws Exception
final DateTime time = DateTimes.nowUtc();

Assert.assertEquals(StringUtils.format("\"%s\"", time), mapper.writeValueAsString(time));

// string token
Assert.assertEquals(time, mapper.readValue(StringUtils.format("\"%s\"", time), DateTime.class));

// int token
DateTime result = mapper.readValue("1717267200000", DateTime.class);
Assert.assertEquals(DateTimes.utc(1717267200000L), result);

// unexpected token
String badString = "{\"dateTime\": true}";
Exception ex = Assert.assertThrows(Exception.class, () -> {
mapper.readValue(badString, DateTime.class);
});
Assert.assertTrue(ex.getMessage().contains("expected int or string token"));
}

@Test
Expand Down
6 changes: 6 additions & 0 deletions quidem-ut/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,12 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-smile-provider</artifactId>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
12 changes: 12 additions & 0 deletions server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,22 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<exclusions>
Copy link
Copy Markdown
Contributor

@cryptoe cryptoe Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we did not push the exclusion to the main pom.
cc @capistrant @kgyrtkirk ?

Copy link
Copy Markdown
Member

@kgyrtkirk kgyrtkirk Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it was lost in the cracks..should have been better to do that - but I wanted to get it in since it was open for a month; and it was really usefull for my other dep update PR

there is also some note about snakeyaml being set to 1.33; maybe that could also be taken care of together

Copy link
Copy Markdown
Contributor Author

@capistrant capistrant Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad on this. Let me try to address ASAP.

<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-smile-provider</artifactId>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
Expand Down
Loading
Loading