diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index 945af0a165fd..45f10c674317 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -80,10 +80,6 @@ io.dropwizard.metrics metrics-core - - io.jaegertracing - jaeger-client - io.jaegertracing jaeger-core @@ -101,6 +97,7 @@ jakarta.annotation-api + jakarta.xml.bind jakarta.xml.bind-api @@ -144,16 +141,6 @@ org.apache.ratis ratis-grpc - - org.apache.ratis - ratis-metrics-dropwizard3 - - - io.dropwizard.metrics - metrics-core - - - org.apache.ratis ratis-netty @@ -186,10 +173,6 @@ org.reflections reflections - - org.slf4j - jcl-over-slf4j - org.slf4j slf4j-api @@ -198,11 +181,21 @@ org.yaml snakeyaml - - org.glassfish.jaxb - jaxb-runtime - provided + io.jaegertracing + jaeger-client + runtime + + + org.apache.ratis + ratis-metrics-dropwizard3 + runtime + + + + org.slf4j + jcl-over-slf4j + runtime org.slf4j diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index 53e2528a7f28..fde6e8c7898a 100644 --- a/hadoop-hdds/container-service/pom.xml +++ b/hadoop-hdds/container-service/pom.xml @@ -34,10 +34,6 @@ com.fasterxml.jackson.core jackson-databind - - com.github.luben - zstd-jni - com.github.stephenc.jcip jcip-annotations @@ -194,10 +190,6 @@ org.apache.ratis ratis-thirdparty-misc - - org.glassfish.jaxb - jaxb-runtime - org.rocksdb rocksdbjni @@ -215,6 +207,11 @@ hdds-docs provided + + com.github.luben + zstd-jni + runtime + log4j apache-log4j-extras @@ -226,6 +223,11 @@ hadoop-hdfs-client runtime + + org.glassfish.jaxb + jaxb-runtime + runtime + diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index caed46616296..782d8b6fce87 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -144,10 +144,6 @@ org.apache.logging.log4j log4j-api - - org.apache.logging.log4j - log4j-core - org.apache.ozone hdds-common @@ -187,12 +183,6 @@ org.apache.ratis ratis-metrics-dropwizard3 - - - io.dropwizard.metrics - metrics-core - - org.apache.ratis @@ -251,8 +241,10 @@ slf4j-api + org.slf4j - slf4j-reload4j + jcl-over-slf4j + provided @@ -286,6 +278,11 @@ kerb-util runtime + + org.apache.logging.log4j + log4j-core + runtime + org.xerial.snappy snappy-java diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml index 8093262efbda..fd8aae95c135 100644 --- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml +++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml @@ -79,10 +79,6 @@ org.slf4j slf4j-api - - org.slf4j - slf4j-reload4j - diff --git a/hadoop-ozone/cli-shell/pom.xml b/hadoop-ozone/cli-shell/pom.xml index 488d9162e477..f653a45f6caa 100644 --- a/hadoop-ozone/cli-shell/pom.xml +++ b/hadoop-ozone/cli-shell/pom.xml @@ -120,11 +120,6 @@ ozone-filesystem runtime - - org.slf4j - slf4j-reload4j - runtime - diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 2e383b9c3fb2..0f91ba21d9a5 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -61,10 +61,6 @@ io.grpc grpc-netty - - io.netty - netty-codec-http2 - io.netty netty-common @@ -73,10 +69,6 @@ io.netty netty-handler - - io.netty - netty-handler-proxy - jakarta.annotation jakarta.annotation-api @@ -143,6 +135,16 @@ grpc-stub provided + + io.netty + netty-codec-http2 + runtime + + + io.netty + netty-handler-proxy + runtime + io.netty netty-tcnative-boringssl-static diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index 5304edec8a87..eb8c3b6fa9a1 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -104,14 +104,6 @@ io.grpc grpc-stub - - io.netty - netty-codec-http2 - - - io.netty - netty-handler-proxy - io.netty netty-transport @@ -120,11 +112,6 @@ io.netty netty-transport-classes-epoll - - io.netty - netty-transport-native-epoll - linux-x86_64 - io.netty netty-transport-native-unix-common @@ -181,16 +168,28 @@ org.slf4j slf4j-api - - org.slf4j - slf4j-reload4j - com.google.code.findbugs jsr305 3.0.2 provided + + io.netty + netty-codec-http2 + runtime + + + io.netty + netty-handler-proxy + runtime + + + io.netty + netty-transport-native-epoll + linux-x86_64 + runtime + diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml index d20d4334fa28..c0c7533f8993 100644 --- a/hadoop-ozone/datanode/pom.xml +++ b/hadoop-ozone/datanode/pom.xml @@ -43,10 +43,12 @@ org.apache.ozone hdds-container-service + runtime org.glassfish.jaxb jaxb-runtime + runtime diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml index 46d50f0ec9b3..87235af34d83 100644 --- a/hadoop-ozone/dist/pom.xml +++ b/hadoop-ozone/dist/pom.xml @@ -39,70 +39,87 @@ org.apache.ozone hdds-container-service + runtime org.apache.ozone hdds-docs + runtime org.apache.ozone hdds-rocks-native + runtime org.apache.ozone hdds-server-scm + runtime org.apache.ozone ozone-cli-admin + runtime org.apache.ozone ozone-cli-shell + runtime org.apache.ozone ozone-common + runtime org.apache.ozone ozone-csi + runtime org.apache.ozone ozone-datanode + runtime org.apache.ozone ozone-freon + runtime org.apache.ozone ozone-httpfsgateway + runtime org.apache.ozone ozone-insight + runtime org.apache.ozone ozone-manager + runtime org.apache.ozone ozone-recon + runtime org.apache.ozone ozone-s3-secret-store + runtime org.apache.ozone ozone-s3gateway + runtime org.apache.ozone ozone-tools + runtime @@ -238,14 +255,17 @@ org.apache.ozone ozone-filesystem-hadoop2 + runtime org.apache.ozone ozone-filesystem-hadoop3 + runtime org.apache.ozone ozone-filesystem-hadoop3-client + runtime diff --git a/hadoop-ozone/httpfsgateway/pom.xml b/hadoop-ozone/httpfsgateway/pom.xml index 704d0e6a4bf7..e00e193efdbe 100644 --- a/hadoop-ozone/httpfsgateway/pom.xml +++ b/hadoop-ozone/httpfsgateway/pom.xml @@ -108,30 +108,6 @@ org.apache.ozone ozone-filesystem-common - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-webapp - - - org.glassfish.hk2 - hk2-api - - - org.glassfish.jaxb - jaxb-runtime - - - org.glassfish.jersey.core - jersey-server - - - org.glassfish.jersey.inject - jersey-hk2 - org.slf4j slf4j-api @@ -185,8 +161,33 @@ runtime - org.slf4j - slf4j-reload4j + org.eclipse.jetty + jetty-server + runtime + + + org.eclipse.jetty + jetty-webapp + runtime + + + org.glassfish.hk2 + hk2-api + runtime + + + org.glassfish.jaxb + jaxb-runtime + runtime + + + org.glassfish.jersey.core + jersey-server + runtime + + + org.glassfish.jersey.inject + jersey-hk2 runtime diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml index 878391219654..9ac78c878e0b 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -113,6 +113,7 @@ org.glassfish.jaxb jaxb-runtime + runtime diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml index bf6c9e6e4d43..c2e1e953a9f7 100644 --- a/hadoop-ozone/interface-client/pom.xml +++ b/hadoop-ozone/interface-client/pom.xml @@ -65,14 +65,6 @@ io.grpc grpc-stub - - io.netty - netty-codec-http2 - - - io.netty - netty-handler-proxy - org.apache.hadoop.thirdparty hadoop-shaded-protobuf_3_25 @@ -81,6 +73,16 @@ org.apache.ozone hdds-interface-client + + io.netty + netty-codec-http2 + runtime + + + io.netty + netty-handler-proxy + runtime + diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index 619fc874df15..df5d4527f2df 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -46,10 +46,6 @@ com.google.inject guice - - com.google.inject.extensions - guice-assistedinject - com.google.inject.extensions guice-servlet @@ -219,10 +215,6 @@ org.glassfish.hk2 hk2-api - - org.glassfish.hk2.external - jakarta.inject - org.glassfish.jersey.containers jersey-container-servlet @@ -239,18 +231,6 @@ org.glassfish.jersey.core jersey-server - - org.glassfish.jersey.inject - jersey-hk2 - - - org.glassfish.jersey.media - jersey-media-jaxb - - - org.glassfish.jersey.media - jersey-media-json-jackson - org.javassist javassist @@ -296,6 +276,31 @@ org.xerial sqlite-jdbc + + com.google.inject.extensions + guice-assistedinject + runtime + + + org.glassfish.hk2.external + jakarta.inject + runtime + + + org.glassfish.jersey.inject + jersey-hk2 + runtime + + + org.glassfish.jersey.media + jersey-media-jaxb + runtime + + + org.glassfish.jersey.media + jersey-media-json-jackson + runtime + diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index c4d47c8f6e53..54cc7c7debdd 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -58,14 +58,6 @@ info.picocli picocli - - io.netty - netty-codec-http2 - - - io.netty - netty-transport - io.opentracing opentracing-api @@ -184,55 +176,72 @@ org.eclipse.jetty jetty-webapp + + org.glassfish.jersey.core + jersey-common + + + + org.glassfish.jersey.core + jersey-server + + + org.javassist + javassist + + + org.slf4j + slf4j-api + + + org.apache.ozone + hdds-docs + provided + + + io.netty + netty-codec-http2 + runtime + + + io.netty + netty-handler-proxy + runtime + org.glassfish.hk2 hk2-api + runtime org.glassfish.jaxb jaxb-runtime + runtime org.glassfish.jersey.containers jersey-container-servlet-core - - - org.glassfish.jersey.core - jersey-common - - - - org.glassfish.jersey.core - jersey-server + runtime org.glassfish.jersey.ext.cdi jersey-cdi1x + runtime org.glassfish.jersey.inject jersey-hk2 + runtime org.glassfish.jersey.media jersey-media-jaxb - - - org.javassist - javassist + runtime org.jboss.weld.servlet weld-servlet-shaded - - - org.slf4j - slf4j-api - - - org.apache.ozone - hdds-docs - provided + runtime diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 4f1c29f2b76c..24d53f2fe406 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -70,10 +70,6 @@ com.google.protobuf protobuf-java - - commons-codec - commons-codec - commons-collections commons-collections @@ -256,10 +252,6 @@ org.apache.ratis ratis-tools - - org.glassfish.jaxb - jaxb-runtime - org.jgrapht jgrapht-core @@ -296,6 +288,11 @@ org.xerial sqlite-jdbc + + commons-codec + commons-codec + runtime +