From 353c7d4839eb3b3073a3954e3a7689a5e14edce7 Mon Sep 17 00:00:00 2001 From: capistrant Date: Fri, 16 May 2025 16:02:26 -0500 Subject: [PATCH 01/13] Bump jackson to 2.18.4 and fabric8 to 7.2.0 --- .../kubernetes-overlord-extensions/pom.xml | 20 ++----------------- pom.xml | 2 +- .../org/apache/druid/jackson/JodaStuff.java | 3 ++- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/extensions-core/kubernetes-overlord-extensions/pom.xml b/extensions-core/kubernetes-overlord-extensions/pom.xml index 80e61cec9ee6..e1476df0da20 100644 --- a/extensions-core/kubernetes-overlord-extensions/pom.xml +++ b/extensions-core/kubernetes-overlord-extensions/pom.xml @@ -35,25 +35,9 @@ - - 6.13.1 + 7.2.0 - - - - - org.yaml - snakeyaml - 1.33 - - - - org.apache.druid @@ -198,7 +182,7 @@ io.fabric8 mockwebserver - 0.2.2 + ${fabric8.version} test diff --git a/pom.xml b/pom.xml index 68ee72ef2e30..106d2fcd60ac 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 1.3 9.4.57.v20241219 1.19.4 - 2.12.7.20221012 + 2.18.4 1.9.13 2.22.1 8.2.0 diff --git a/processing/src/main/java/org/apache/druid/jackson/JodaStuff.java b/processing/src/main/java/org/apache/druid/jackson/JodaStuff.java index 573af0a0828c..635357712ce1 100644 --- a/processing/src/main/java/org/apache/druid/jackson/JodaStuff.java +++ b/processing/src/main/java/org/apache/druid/jackson/JodaStuff.java @@ -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; // required for compiler, but ctxt.reportWrongTokenException always throws } } } From c1e6e791d32d5e436f516526c472ab26d5d7b548 Mon Sep 17 00:00:00 2001 From: capistrant Date: Fri, 16 May 2025 17:35:52 -0500 Subject: [PATCH 02/13] Update licenses.yaml --- .../druid-deltalake-extensions/pom.xml | 2 +- licenses.yaml | 36 ++----------------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/extensions-contrib/druid-deltalake-extensions/pom.xml b/extensions-contrib/druid-deltalake-extensions/pom.xml index 635d1a3b6abf..282039fc1981 100644 --- a/extensions-contrib/druid-deltalake-extensions/pom.xml +++ b/extensions-contrib/druid-deltalake-extensions/pom.xml @@ -96,7 +96,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.7.1 + ${jackson.version} it.unimi.dsi diff --git a/licenses.yaml b/licenses.yaml index 9509f442d24d..ac60ddf720e0 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -223,10 +223,11 @@ name: Jackson license_category: binary module: java-core license_name: Apache License version 2.0 -version: 2.12.7 +version: 2.18.4 libraries: - com.fasterxml.jackson.core: jackson-annotations - com.fasterxml.jackson.core: jackson-core + - com.fasterxml.jackson.core: jackson-databind - com.fasterxml.jackson.dataformat: jackson-dataformat-cbor - com.fasterxml.jackson.dataformat: jackson-dataformat-smile - com.fasterxml.jackson.dataformat: jackson-dataformat-xml @@ -262,37 +263,6 @@ notice: | --- -name: Jackson -license_category: binary -module: java-core -license_name: Apache License version 2.0 -version: 2.12.7.1 -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. - ---- - name: JavaBeans Activation Framework API JAR license_category: binary module: java-core @@ -855,7 +825,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 From 7275ebc161586d87585d50dc607b70efd1d9f30d Mon Sep 17 00:00:00 2001 From: capistrant Date: Mon, 19 May 2025 12:11:22 -0500 Subject: [PATCH 03/13] licenses change and bump for vertx core version to match other vertx deps --- .../kubernetes-overlord-extensions/pom.xml | 2 +- licenses.yaml | 47 +++++++++++++++++-- 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/extensions-core/kubernetes-overlord-extensions/pom.xml b/extensions-core/kubernetes-overlord-extensions/pom.xml index e1476df0da20..ec731a590349 100644 --- a/extensions-core/kubernetes-overlord-extensions/pom.xml +++ b/extensions-core/kubernetes-overlord-extensions/pom.xml @@ -139,7 +139,7 @@ io.vertx vertx-core - 4.5.8 + 4.5.14 javax.ws.rs diff --git a/licenses.yaml b/licenses.yaml index ac60ddf720e0..a45bd6cdc5cc 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -227,7 +227,6 @@ version: 2.18.4 libraries: - com.fasterxml.jackson.core: jackson-annotations - com.fasterxml.jackson.core: jackson-core - - com.fasterxml.jackson.core: jackson-databind - com.fasterxml.jackson.dataformat: jackson-dataformat-cbor - com.fasterxml.jackson.dataformat: jackson-dataformat-smile - com.fasterxml.jackson.dataformat: jackson-dataformat-xml @@ -263,6 +262,32 @@ notice: | --- +name: Jackson +license_category: binary +module: extensions-contrib/druid-deltalake-extensions +license_name: Apache License version 2.0 +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. + +--- + name: JavaBeans Activation Framework API JAR license_category: binary module: java-core @@ -857,7 +882,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 @@ -1034,7 +1059,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 @@ -1044,7 +1069,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 @@ -2829,7 +2854,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 @@ -5046,6 +5071,18 @@ libraries: --- +name: +license_category: binary +module: extensions-contrib/ambari-metrics-emitter +license_name: CDDL 1.1 +copyright: Oracle and/or its affiliates. +license_file_path: licenses/bin/javax.CDDL11 +version: 2.2.12 +libraries: + - javax.xml.bind: jaxb-api + +--- + # Web console modules start name: "@babel/code-frame" license_category: binary From 29f5b20cbd3c65543906ed18ae02f00121e4ee0c Mon Sep 17 00:00:00 2001 From: capistrant Date: Thu, 12 Jun 2025 16:19:31 -0500 Subject: [PATCH 04/13] bump some jackson to 2.18.4.1 --- .../druid-deltalake-extensions/pom.xml | 2 +- licenses.yaml | 16 ++-------------- pom.xml | 3 ++- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/extensions-contrib/druid-deltalake-extensions/pom.xml b/extensions-contrib/druid-deltalake-extensions/pom.xml index 282039fc1981..d8fcc38a4b53 100644 --- a/extensions-contrib/druid-deltalake-extensions/pom.xml +++ b/extensions-contrib/druid-deltalake-extensions/pom.xml @@ -96,7 +96,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} + ${jackson.databind.version} it.unimi.dsi diff --git a/licenses.yaml b/licenses.yaml index a45bd6cdc5cc..99999b1f441d 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -223,7 +223,7 @@ name: Jackson license_category: binary module: java-core license_name: Apache License version 2.0 -version: 2.18.4 +version: 2.18.4.1 libraries: - com.fasterxml.jackson.core: jackson-annotations - com.fasterxml.jackson.core: jackson-core @@ -2854,7 +2854,7 @@ libraries: --- name: Jackson Dataformat Yaml -version: 2.18.4 +version: 2.18.4.1 license_category: binary module: extensions/druid-avro-extensions license_name: Apache License version 2.0 @@ -5071,18 +5071,6 @@ libraries: --- -name: -license_category: binary -module: extensions-contrib/ambari-metrics-emitter -license_name: CDDL 1.1 -copyright: Oracle and/or its affiliates. -license_file_path: licenses/bin/javax.CDDL11 -version: 2.2.12 -libraries: - - javax.xml.bind: jaxb-api - ---- - # Web console modules start name: "@babel/code-frame" license_category: binary diff --git a/pom.xml b/pom.xml index 106d2fcd60ac..8c719156ca2e 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,8 @@ 1.3 9.4.57.v20241219 1.19.4 - 2.18.4 + 2.18.4.1 + 2.18.4 1.9.13 2.22.1 8.2.0 From 6225dd624dc701fe5b0fc4889ff116fe084e2fd6 Mon Sep 17 00:00:00 2001 From: capistrant Date: Thu, 12 Jun 2025 16:50:38 -0500 Subject: [PATCH 05/13] Exclude jaxb-api from sneaking back into distribution --- extensions-contrib/aliyun-oss-extensions/pom.xml | 6 ++++++ indexing-service/pom.xml | 6 ++++++ integration-tests/pom.xml | 6 ++++++ quidem-ut/pom.xml | 6 ++++++ server/pom.xml | 12 ++++++++++++ services/pom.xml | 6 ++++++ 6 files changed, 42 insertions(+) diff --git a/extensions-contrib/aliyun-oss-extensions/pom.xml b/extensions-contrib/aliyun-oss-extensions/pom.xml index ac79e63df556..7d280355bf22 100644 --- a/extensions-contrib/aliyun-oss-extensions/pom.xml +++ b/extensions-contrib/aliyun-oss-extensions/pom.xml @@ -43,6 +43,12 @@ com.aliyun.oss aliyun-sdk-oss 3.11.3 + + + javax.xml.bind + jaxb-api + + diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 5c722530acf8..8a875c6dfcb8 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -153,6 +153,12 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider + + + javax.xml.bind + jaxb-api + + com.google.errorprone diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index f54e88c93044..d9d53fff0cf4 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -307,6 +307,12 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider + + + javax.xml.bind + jaxb-api + + com.google.guava diff --git a/quidem-ut/pom.xml b/quidem-ut/pom.xml index c8d50c0d7969..5cab737337f0 100644 --- a/quidem-ut/pom.xml +++ b/quidem-ut/pom.xml @@ -286,6 +286,12 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider + + + javax.xml.bind + jaxb-api + + com.google.guava diff --git a/server/pom.xml b/server/pom.xml index 5de233b37059..285e51ee7ed5 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -90,10 +90,22 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + + + javax.xml.bind + jaxb-api + + com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider + + + javax.xml.bind + jaxb-api + + com.fasterxml.jackson.dataformat diff --git a/services/pom.xml b/services/pom.xml index 570e48da1669..43a82aa8f5c0 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -124,6 +124,12 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider + + + javax.xml.bind + jaxb-api + + com.opencsv From f4f735230cdc43de18929ff8a6f6c282c3760347 Mon Sep 17 00:00:00 2001 From: capistrant Date: Fri, 13 Jun 2025 09:24:50 -0500 Subject: [PATCH 06/13] Fixup jackson licenses definitions --- licenses.yaml | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/licenses.yaml b/licenses.yaml index 99999b1f441d..276350c3c689 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -225,8 +225,38 @@ module: java-core license_name: Apache License version 2.0 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 From 6970d0454db48233d35aa79fb880b0f63067b600 Mon Sep 17 00:00:00 2001 From: capistrant Date: Fri, 13 Jun 2025 10:21:24 -0500 Subject: [PATCH 07/13] improve pom naming for jackson version vars --- extensions-contrib/druid-deltalake-extensions/pom.xml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions-contrib/druid-deltalake-extensions/pom.xml b/extensions-contrib/druid-deltalake-extensions/pom.xml index d8fcc38a4b53..282039fc1981 100644 --- a/extensions-contrib/druid-deltalake-extensions/pom.xml +++ b/extensions-contrib/druid-deltalake-extensions/pom.xml @@ -96,7 +96,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.databind.version} + ${jackson.version} it.unimi.dsi diff --git a/pom.xml b/pom.xml index 8c719156ca2e..31cd22a36c26 100644 --- a/pom.xml +++ b/pom.xml @@ -100,8 +100,8 @@ 1.3 9.4.57.v20241219 1.19.4 - 2.18.4.1 - 2.18.4 + 2.18.4.1 + 2.18.4 1.9.13 2.22.1 8.2.0 @@ -616,7 +616,7 @@ com.fasterxml.jackson jackson-bom - ${jackson.version} + ${jackson.core.version} import pom From 8f69a189309c4f6eac88c29b886f416f4e1733e5 Mon Sep 17 00:00:00 2001 From: capistrant Date: Fri, 13 Jun 2025 10:21:34 -0500 Subject: [PATCH 08/13] test coverage --- .../druid/jackson/DefaultObjectMapperTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/processing/src/test/java/org/apache/druid/jackson/DefaultObjectMapperTest.java b/processing/src/test/java/org/apache/druid/jackson/DefaultObjectMapperTest.java index 92c8a2cb2989..8f6f8eca2489 100644 --- a/processing/src/test/java/org/apache/druid/jackson/DefaultObjectMapperTest.java +++ b/processing/src/test/java/org/apache/druid/jackson/DefaultObjectMapperTest.java @@ -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 From 6890dec47c029c49ddeccc21654fbb21521f3b15 Mon Sep 17 00:00:00 2001 From: capistrant Date: Fri, 13 Jun 2025 10:25:49 -0500 Subject: [PATCH 09/13] checkstyle --- .../java/org/apache/druid/jackson/DefaultObjectMapperTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processing/src/test/java/org/apache/druid/jackson/DefaultObjectMapperTest.java b/processing/src/test/java/org/apache/druid/jackson/DefaultObjectMapperTest.java index 8f6f8eca2489..ae461d26c2a7 100644 --- a/processing/src/test/java/org/apache/druid/jackson/DefaultObjectMapperTest.java +++ b/processing/src/test/java/org/apache/druid/jackson/DefaultObjectMapperTest.java @@ -58,7 +58,7 @@ public void testDateTime() throws Exception Assert.assertEquals(StringUtils.format("\"%s\"", time), mapper.writeValueAsString(time)); // string token - Assert.assertEquals(time, mapper.readValue(StringUtils.format("\"%s\"", time), DateTime.class)); + Assert.assertEquals(time, mapper.readValue(StringUtils.format("\"%s\"", time), DateTime.class)); // int token DateTime result = mapper.readValue("1717267200000", DateTime.class); From 46b3dc95b486e1b31b0c6d69aaea67ed31200232 Mon Sep 17 00:00:00 2001 From: capistrant Date: Fri, 13 Jun 2025 11:05:38 -0500 Subject: [PATCH 10/13] licenses.yaml fixup --- licenses.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses.yaml b/licenses.yaml index 276350c3c689..83c034e4be8b 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -2884,7 +2884,7 @@ libraries: --- name: Jackson Dataformat Yaml -version: 2.18.4.1 +version: 2.18.4 license_category: binary module: extensions/druid-avro-extensions license_name: Apache License version 2.0 From bc6cca89dc301225c1f3a08390631f3f5e27ecaf Mon Sep 17 00:00:00 2001 From: capistrant Date: Sun, 15 Jun 2025 15:32:27 -0500 Subject: [PATCH 11/13] Update comment to add detail on unreachable code --- .../src/main/java/org/apache/druid/jackson/JodaStuff.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processing/src/main/java/org/apache/druid/jackson/JodaStuff.java b/processing/src/main/java/org/apache/druid/jackson/JodaStuff.java index 635357712ce1..ae89d90bb044 100644 --- a/processing/src/main/java/org/apache/druid/jackson/JodaStuff.java +++ b/processing/src/main/java/org/apache/druid/jackson/JodaStuff.java @@ -118,7 +118,7 @@ public DateTime deserialize(JsonParser jp, DeserializationContext ctxt) throws I return DateTimes.ISO_DATE_OR_TIME_WITH_OFFSET.parse(str); } ctxt.reportWrongTokenException(handledType(), JsonToken.VALUE_NUMBER_INT, "expected int or string token"); - return null; // required for compiler, but ctxt.reportWrongTokenException always throws + return null; // unreachable ... required for compiler, but ctxt.reportWrongTokenException always throws } } } From 1d42329a17b617dd9c55ac50ff1e99e790a63745 Mon Sep 17 00:00:00 2001 From: capistrant Date: Mon, 16 Jun 2025 09:01:04 -0500 Subject: [PATCH 12/13] Ban javax.xml.bind:jaxb-api and add more excludes for provided scope transitive dependency --- extensions-contrib/ddsketch/pom.xml | 6 ++++++ extensions-contrib/tdigestsketch/pom.xml | 6 ++++++ extensions-core/datasketches/pom.xml | 6 ++++++ extensions-core/druid-catalog/pom.xml | 6 ++++++ pom.xml | 2 ++ 5 files changed, 26 insertions(+) diff --git a/extensions-contrib/ddsketch/pom.xml b/extensions-contrib/ddsketch/pom.xml index a2a5925135a4..cb44cfaf92cf 100644 --- a/extensions-contrib/ddsketch/pom.xml +++ b/extensions-contrib/ddsketch/pom.xml @@ -88,6 +88,12 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider provided + + + javax.xml.bind + jaxb-api + + com.fasterxml.jackson.jaxrs diff --git a/extensions-contrib/tdigestsketch/pom.xml b/extensions-contrib/tdigestsketch/pom.xml index b7ba250613ef..9fc5d479574c 100644 --- a/extensions-contrib/tdigestsketch/pom.xml +++ b/extensions-contrib/tdigestsketch/pom.xml @@ -89,6 +89,12 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider provided + + + javax.xml.bind + jaxb-api + + it.unimi.dsi diff --git a/extensions-core/datasketches/pom.xml b/extensions-core/datasketches/pom.xml index 919e5e8d8209..f6afcfab74ea 100644 --- a/extensions-core/datasketches/pom.xml +++ b/extensions-core/datasketches/pom.xml @@ -137,6 +137,12 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider provided + + + javax.xml.bind + jaxb-api + + com.fasterxml.jackson.jaxrs diff --git a/extensions-core/druid-catalog/pom.xml b/extensions-core/druid-catalog/pom.xml index c854e97055db..0ad27d295c69 100644 --- a/extensions-core/druid-catalog/pom.xml +++ b/extensions-core/druid-catalog/pom.xml @@ -129,6 +129,12 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider provided + + + javax.xml.bind + jaxb-api + + javax.ws.rs diff --git a/pom.xml b/pom.xml index 31cd22a36c26..983cd6f49081 100644 --- a/pom.xml +++ b/pom.xml @@ -1703,6 +1703,8 @@ com.google.code.findbugs:annotations + + javax.xml.bind:jaxb-api From 92b2778bd208d6fe13393648953b4ff349326cad Mon Sep 17 00:00:00 2001 From: capistrant Date: Mon, 16 Jun 2025 10:47:59 -0500 Subject: [PATCH 13/13] Fixup more enforcer errors --- extensions-contrib/tdigestsketch/pom.xml | 6 ++++++ extensions-core/multi-stage-query/pom.xml | 6 ++++++ extensions-core/testing-tools/pom.xml | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/extensions-contrib/tdigestsketch/pom.xml b/extensions-contrib/tdigestsketch/pom.xml index 9fc5d479574c..efd101ecec63 100644 --- a/extensions-contrib/tdigestsketch/pom.xml +++ b/extensions-contrib/tdigestsketch/pom.xml @@ -84,6 +84,12 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider provided + + + javax.xml.bind + jaxb-api + + com.fasterxml.jackson.jaxrs diff --git a/extensions-core/multi-stage-query/pom.xml b/extensions-core/multi-stage-query/pom.xml index bc26993c072b..e514f00bbf1d 100644 --- a/extensions-core/multi-stage-query/pom.xml +++ b/extensions-core/multi-stage-query/pom.xml @@ -140,6 +140,12 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider provided + + + javax.xml.bind + jaxb-api + + javax.ws.rs diff --git a/extensions-core/testing-tools/pom.xml b/extensions-core/testing-tools/pom.xml index 2042b8033b5b..aec558b3f38d 100644 --- a/extensions-core/testing-tools/pom.xml +++ b/extensions-core/testing-tools/pom.xml @@ -114,6 +114,12 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider provided + + + javax.xml.bind + jaxb-api + + com.fasterxml.jackson.jaxrs