From e8685a8b509aca18bea24a4eeb10436e72db4634 Mon Sep 17 00:00:00 2001 From: capistrant Date: Wed, 2 Jul 2025 08:55:19 -0500 Subject: [PATCH] Clean up some jackson dependency excludes by moving it to top level pom --- extensions-contrib/ddsketch/pom.xml | 6 ------ extensions-contrib/tdigestsketch/pom.xml | 12 ------------ extensions-core/datasketches/pom.xml | 6 ------ extensions-core/druid-catalog/pom.xml | 6 ------ extensions-core/multi-stage-query/pom.xml | 6 ------ extensions-core/testing-tools/pom.xml | 6 ------ indexing-service/pom.xml | 6 ------ integration-tests/pom.xml | 19 ------------------- pom.xml | 22 ++++++++++++++++++++++ quidem-ut/pom.xml | 6 ------ server/pom.xml | 12 ------------ services/pom.xml | 6 ------ 12 files changed, 22 insertions(+), 91 deletions(-) diff --git a/extensions-contrib/ddsketch/pom.xml b/extensions-contrib/ddsketch/pom.xml index cb44cfaf92cf..a2a5925135a4 100644 --- a/extensions-contrib/ddsketch/pom.xml +++ b/extensions-contrib/ddsketch/pom.xml @@ -88,12 +88,6 @@ 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 efd101ecec63..b7ba250613ef 100644 --- a/extensions-contrib/tdigestsketch/pom.xml +++ b/extensions-contrib/tdigestsketch/pom.xml @@ -84,23 +84,11 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider provided - - - javax.xml.bind - jaxb-api - - 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 f6afcfab74ea..919e5e8d8209 100644 --- a/extensions-core/datasketches/pom.xml +++ b/extensions-core/datasketches/pom.xml @@ -137,12 +137,6 @@ 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 0ad27d295c69..c854e97055db 100644 --- a/extensions-core/druid-catalog/pom.xml +++ b/extensions-core/druid-catalog/pom.xml @@ -129,12 +129,6 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider provided - - - javax.xml.bind - jaxb-api - - javax.ws.rs diff --git a/extensions-core/multi-stage-query/pom.xml b/extensions-core/multi-stage-query/pom.xml index 0b85650fd764..6fd8eba6c2f0 100644 --- a/extensions-core/multi-stage-query/pom.xml +++ b/extensions-core/multi-stage-query/pom.xml @@ -140,12 +140,6 @@ 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 aec558b3f38d..2042b8033b5b 100644 --- a/extensions-core/testing-tools/pom.xml +++ b/extensions-core/testing-tools/pom.xml @@ -114,12 +114,6 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider provided - - - javax.xml.bind - jaxb-api - - com.fasterxml.jackson.jaxrs diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index b99de223c428..da30e431e8fe 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -153,12 +153,6 @@ 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 f21726db8b54..5a6a4c990610 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -43,19 +43,6 @@ org.apache.hadoop.fs.s3a.S3AFileSystem - - - - - org.yaml - snakeyaml - 1.33 - - - - com.amazonaws @@ -307,12 +294,6 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider - - - javax.xml.bind - jaxb-api - - com.google.guava diff --git a/pom.xml b/pom.xml index 845fb3085b6c..90873012bf28 100644 --- a/pom.xml +++ b/pom.xml @@ -1413,6 +1413,28 @@ 1.16.3 test + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson.version} + + + javax.xml.bind + jaxb-api + + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-smile-provider + ${jackson.version} + + + javax.xml.bind + jaxb-api + + + diff --git a/quidem-ut/pom.xml b/quidem-ut/pom.xml index 8b5b539928b8..51214023af1a 100644 --- a/quidem-ut/pom.xml +++ b/quidem-ut/pom.xml @@ -291,12 +291,6 @@ 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 285e51ee7ed5..5de233b37059 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -90,22 +90,10 @@ 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 8a3b9da612e4..198a9dbb2bfd 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -124,12 +124,6 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider - - - javax.xml.bind - jaxb-api - - com.fasterxml.jackson.dataformat