From 87c4d040e1447d1598a6bc401db203f1065851b0 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 28 May 2025 06:56:58 +0200 Subject: [PATCH 01/13] remove dependency: hdds-annotation-processing --- hadoop-hdds/common/pom.xml | 4 ---- hadoop-hdds/framework/pom.xml | 5 +++++ .../hadoop/ozone/request/validation/RegisterValidator.java | 2 +- hadoop-ozone/dist/src/main/license/jar-report.txt | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index 45f10c674317..00621d98753a 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -113,10 +113,6 @@ org.apache.hadoop hadoop-common - - org.apache.ozone - hdds-annotation-processing - org.apache.ozone hdds-config diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index 782d8b6fce87..e3bb14127613 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -240,6 +240,11 @@ org.slf4j slf4j-api + + org.apache.ozone + hdds-annotation-processing + provided + org.slf4j diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/request/validation/RegisterValidator.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/request/validation/RegisterValidator.java index b88bb9475435..396bffe4438d 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/request/validation/RegisterValidator.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/request/validation/RegisterValidator.java @@ -24,7 +24,7 @@ import org.apache.hadoop.ozone.Versioned; /** - * Annotations to register a validator. {@link org.apache.ozone.annotations.RegisterValidatorProcessor} + * Annotations to register a validator. {@code org.apache.ozone.annotations.RegisterValidatorProcessor} * enforces other annotation to have the following methods: * applyBefore : Returns an enum which implement {@link Versioned} * requestType: Returns an Enum value. diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt index b8c888ee482e..7714a0c57169 100644 --- a/hadoop-ozone/dist/src/main/license/jar-report.txt +++ b/hadoop-ozone/dist/src/main/license/jar-report.txt @@ -66,7 +66,6 @@ share/ozone/lib/hadoop-hdfs-client.jar share/ozone/lib/hadoop-hdfs.jar share/ozone/lib/hadoop-shaded-guava.jar share/ozone/lib/hadoop-shaded-protobuf_3_25.jar -share/ozone/lib/hdds-annotation-processing.jar share/ozone/lib/hdds-client.jar share/ozone/lib/hdds-common.jar share/ozone/lib/hdds-config.jar From 563c0d6f9c8af986cba460d23c12a1a06b79d314 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 28 May 2025 07:09:40 +0200 Subject: [PATCH 02/13] fix dependency: javax.annotation-api --- hadoop-hdds/common/pom.xml | 4 ---- hadoop-hdds/interface-client/pom.xml | 10 ++++++---- hadoop-hdds/interface-server/pom.xml | 6 ++++++ hadoop-ozone/csi/pom.xml | 6 ++++++ hadoop-ozone/interface-client/pom.xml | 6 ++++++ hadoop-ozone/recon/pom.xml | 17 +++++++++++++++++ 6 files changed, 41 insertions(+), 8 deletions(-) diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index 00621d98753a..34732dd94208 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -101,10 +101,6 @@ jakarta.xml.bind jakarta.xml.bind-api - - javax.annotation - javax.annotation-api - org.apache.commons commons-lang3 diff --git a/hadoop-hdds/interface-client/pom.xml b/hadoop-hdds/interface-client/pom.xml index 4ee5999d2f6f..1e876c1199b2 100644 --- a/hadoop-hdds/interface-client/pom.xml +++ b/hadoop-hdds/interface-client/pom.xml @@ -37,10 +37,6 @@ com.google.protobuf protobuf-java - - javax.annotation - javax.annotation-api - org.apache.hadoop.thirdparty hadoop-shaded-protobuf_3_25 @@ -49,6 +45,12 @@ org.apache.ratis ratis-thirdparty-misc + + + javax.annotation + javax.annotation-api + provided + diff --git a/hadoop-hdds/interface-server/pom.xml b/hadoop-hdds/interface-server/pom.xml index 5c968e77d9b4..cee021923a37 100644 --- a/hadoop-hdds/interface-server/pom.xml +++ b/hadoop-hdds/interface-server/pom.xml @@ -46,6 +46,12 @@ org.apache.ratis ratis-thirdparty-misc + + + javax.annotation + javax.annotation-api + provided + diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index eb8c3b6fa9a1..7df833df473b 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -174,6 +174,12 @@ 3.0.2 provided + + + javax.annotation + javax.annotation-api + provided + io.netty netty-codec-http2 diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml index c2e1e953a9f7..894e12093019 100644 --- a/hadoop-ozone/interface-client/pom.xml +++ b/hadoop-ozone/interface-client/pom.xml @@ -73,6 +73,12 @@ org.apache.ozone hdds-interface-client + + + javax.annotation + javax.annotation-api + provided + io.netty netty-codec-http2 diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index df5d4527f2df..a1ddb7cea2e3 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -90,6 +90,14 @@ jakarta.xml.bind jakarta.xml.bind-api + + + javax.annotation + javax.annotation-api + javax.inject javax.inject @@ -352,6 +360,15 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + javax.annotation:javax.annotation-api:jar + + + org.apache.maven.plugins maven-enforcer-plugin From 564f8383da2a3e97973e27523f5045828b3c795c Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 28 May 2025 07:20:36 +0200 Subject: [PATCH 03/13] fix dependency: metainf-services --- hadoop-ozone/cli-admin/pom.xml | 1 + hadoop-ozone/cli-shell/pom.xml | 6 ++++++ hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 1 - hadoop-ozone/dist/src/main/license/jar-report.txt | 1 - hadoop-ozone/freon/pom.xml | 10 ++++++---- hadoop-ozone/tools/pom.xml | 10 ++++++---- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/hadoop-ozone/cli-admin/pom.xml b/hadoop-ozone/cli-admin/pom.xml index e300b1563deb..7357cdeb3bff 100644 --- a/hadoop-ozone/cli-admin/pom.xml +++ b/hadoop-ozone/cli-admin/pom.xml @@ -121,6 +121,7 @@ slf4j-api + org.kohsuke.metainf-services metainf-services provided diff --git a/hadoop-ozone/cli-shell/pom.xml b/hadoop-ozone/cli-shell/pom.xml index f653a45f6caa..186f12886668 100644 --- a/hadoop-ozone/cli-shell/pom.xml +++ b/hadoop-ozone/cli-shell/pom.xml @@ -115,6 +115,12 @@ org.slf4j slf4j-api + + + org.kohsuke.metainf-services + metainf-services + provided + org.apache.ozone ozone-filesystem diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index 3b3e1b043ed6..cfdb7689b9a1 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -463,7 +463,6 @@ MIT org.bouncycastle:bcutil-jdk18on org.checkerframework:checker-qual org.codehaus.mojo:animal-sniffer-annotations - org.kohsuke.metainf-services:metainf-services org.slf4j:jcl-over-slf4j org.slf4j:slf4j-api org.slf4j:slf4j-reload4j diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt index 7714a0c57169..f95bd992d07d 100644 --- a/hadoop-ozone/dist/src/main/license/jar-report.txt +++ b/hadoop-ozone/dist/src/main/license/jar-report.txt @@ -181,7 +181,6 @@ share/ozone/lib/libthrift.jar share/ozone/lib/listenablefuture-empty-to-avoid-conflict-with-guava.jar share/ozone/lib/log4j-api.jar share/ozone/lib/log4j-core.jar -share/ozone/lib/metainf-services.jar share/ozone/lib/metrics-core.jar share/ozone/lib/netty-buffer.Final.jar share/ozone/lib/netty-codec.Final.jar diff --git a/hadoop-ozone/freon/pom.xml b/hadoop-ozone/freon/pom.xml index c1ce02a3b1e0..cac05ff8e2e1 100644 --- a/hadoop-ozone/freon/pom.xml +++ b/hadoop-ozone/freon/pom.xml @@ -174,14 +174,16 @@ org.apache.ratis ratis-thirdparty-misc - - org.kohsuke.metainf-services - metainf-services - org.slf4j slf4j-api + + + org.kohsuke.metainf-services + metainf-services + provided + ch.qos.reload4j reload4j diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 24d53f2fe406..ca3e48224789 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -268,10 +268,6 @@ org.jooq jooq - - org.kohsuke.metainf-services - metainf-services - org.reflections reflections @@ -288,6 +284,12 @@ org.xerial sqlite-jdbc + + + org.kohsuke.metainf-services + metainf-services + provided + commons-codec commons-codec From 6cc8dd2bd890b08eb039bca191940145b2e52e52 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 28 May 2025 07:31:36 +0200 Subject: [PATCH 04/13] fix dependency: protobuf-java-util --- hadoop-ozone/csi/pom.xml | 39 ++++++++++--------- .../dist/src/main/license/bin/LICENSE.txt | 1 - .../dist/src/main/license/jar-report.txt | 1 - 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index 7df833df473b..47dd7ea92016 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -45,25 +45,6 @@ protobuf-java ${grpc.protobuf-compile.version} - - com.google.protobuf - protobuf-java-util - ${grpc.protobuf-compile.version} - - - com.google.code.findbugs - jsr305 - - - com.google.j2objc - j2objc-annotations - - - com.google.protobuf - protobuf-java - - - commons-io commons-io @@ -174,6 +155,26 @@ 3.0.2 provided + + com.google.protobuf + protobuf-java-util + ${grpc.protobuf-compile.version} + provided + + + com.google.code.findbugs + jsr305 + + + com.google.j2objc + j2objc-annotations + + + com.google.protobuf + protobuf-java + + + javax.annotation diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index cfdb7689b9a1..15616f0953a7 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -479,7 +479,6 @@ BSD 3-Clause com.github.vlsi.mxgraph:jgraphx com.google.protobuf:protobuf-java - com.google.protobuf:protobuf-java-util com.google.re2j:re2j com.jcraft:jsch com.thoughtworks.paranamer:paranamer diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt index f95bd992d07d..aa4a2d884cfd 100644 --- a/hadoop-ozone/dist/src/main/license/jar-report.txt +++ b/hadoop-ozone/dist/src/main/license/jar-report.txt @@ -241,7 +241,6 @@ share/ozone/lib/picocli.jar share/ozone/lib/picocli-shell-jline3.jar share/ozone/lib/protobuf-java.jar share/ozone/lib/protobuf-java.jar -share/ozone/lib/protobuf-java-util.jar share/ozone/lib/proto-google-common-protos.jar share/ozone/lib/ranger-intg.jar share/ozone/lib/ranger-plugin-classloader.jar From 0f51e1bce4d8c93909920d870829fa6c6c1deb3e Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 28 May 2025 07:44:59 +0200 Subject: [PATCH 05/13] fix dependency: netty-handler --- hadoop-ozone/common/pom.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 0f91ba21d9a5..5fcb0d6ac3e6 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -65,10 +65,6 @@ io.netty netty-common - - io.netty - netty-handler - jakarta.annotation jakarta.annotation-api @@ -135,6 +131,12 @@ grpc-stub provided + + + io.netty + netty-handler + provided + io.netty netty-codec-http2 From 21a69e824726be68cb0c4ea70f9acaa6755c33aa Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 28 May 2025 07:47:23 +0200 Subject: [PATCH 06/13] fix dependency: kotlin-stdlib --- hadoop-hdds/common/pom.xml | 4 ---- pom.xml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index 34732dd94208..41bb244861ea 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -157,10 +157,6 @@ org.bouncycastle bcprov-jdk18on - - org.jetbrains.kotlin - kotlin-stdlib - org.reflections reflections diff --git a/pom.xml b/pom.xml index 4f688109cf1d..2e50f200aae8 100644 --- a/pom.xml +++ b/pom.xml @@ -548,10 +548,6 @@ org.apache.tomcat.embed tomcat-embed-core - - org.jetbrains.kotlin - kotlin-stdlib - From 40a2cda309cb026e37bd9afc6eb2eb2193aabf0f Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 28 May 2025 07:51:02 +0200 Subject: [PATCH 07/13] add used undeclared dependencies --- hadoop-ozone/integration-test-s3/pom.xml | 20 ++++++++++++++++++++ hadoop-ozone/s3gateway/pom.xml | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/hadoop-ozone/integration-test-s3/pom.xml b/hadoop-ozone/integration-test-s3/pom.xml index 9f6ddc516255..2cf6ae0d8bd5 100644 --- a/hadoop-ozone/integration-test-s3/pom.xml +++ b/hadoop-ozone/integration-test-s3/pom.xml @@ -102,6 +102,11 @@ slf4j-api test + + software.amazon.awssdk + apache-client + test + software.amazon.awssdk auth @@ -112,6 +117,16 @@ aws-core test + + software.amazon.awssdk + http-client-spi + test + + + software.amazon.awssdk + identity-spi + test + software.amazon.awssdk regions @@ -132,6 +147,11 @@ sdk-core test + + software.amazon.awssdk + utils + test + diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index 54cc7c7debdd..3c1e4ea52757 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -42,6 +42,10 @@ com.fasterxml.jackson.module jackson-module-jaxb-annotations + + com.github.stephenc.jcip + jcip-annotations + com.google.guava guava From be56265d755fc98dc215b0b6bcc324a8b70ffb4d Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 28 May 2025 08:06:06 +0200 Subject: [PATCH 08/13] fix dependency: jakarta.xml.bind-api --- hadoop-hdds/container-service/pom.xml | 4 ---- hadoop-ozone/datanode/pom.xml | 4 ---- hadoop-ozone/httpfsgateway/pom.xml | 4 ---- hadoop-ozone/insight/pom.xml | 9 +++++---- hadoop-ozone/recon-codegen/pom.xml | 6 ++++++ 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index fde6e8c7898a..fb3b8d18e175 100644 --- a/hadoop-hdds/container-service/pom.xml +++ b/hadoop-hdds/container-service/pom.xml @@ -98,10 +98,6 @@ jakarta.annotation jakarta.annotation-api - - jakarta.xml.bind - jakarta.xml.bind-api - org.apache.commons commons-compress diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml index c0c7533f8993..4020ecd567d5 100644 --- a/hadoop-ozone/datanode/pom.xml +++ b/hadoop-ozone/datanode/pom.xml @@ -36,10 +36,6 @@ jakarta.activation jakarta.activation-api - - jakarta.xml.bind - jakarta.xml.bind-api - org.apache.ozone hdds-container-service diff --git a/hadoop-ozone/httpfsgateway/pom.xml b/hadoop-ozone/httpfsgateway/pom.xml index e00e193efdbe..9a4fb6ed6c78 100644 --- a/hadoop-ozone/httpfsgateway/pom.xml +++ b/hadoop-ozone/httpfsgateway/pom.xml @@ -64,10 +64,6 @@ jakarta.ws.rs jakarta.ws.rs-api - - jakarta.xml.bind - jakarta.xml.bind-api - javax.servlet javax.servlet-api diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml index 9ac78c878e0b..798f2f883176 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -42,10 +42,6 @@ jakarta.activation jakarta.activation-api - - jakarta.xml.bind - jakarta.xml.bind-api - org.apache.httpcomponents httpclient @@ -110,6 +106,11 @@ org.apache.ozone ozone-manager + + jakarta.xml.bind + jakarta.xml.bind-api + provided + org.glassfish.jaxb jaxb-runtime diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml index 9582f4357744..6eda1180a5c9 100644 --- a/hadoop-ozone/recon-codegen/pom.xml +++ b/hadoop-ozone/recon-codegen/pom.xml @@ -75,6 +75,12 @@ org.springframework spring-tx + + + jakarta.xml.bind + jakarta.xml.bind-api + provided + From d283130618adf764f4e0cfec4233ff6448d558af Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 28 May 2025 08:49:22 +0200 Subject: [PATCH 09/13] remove dependency: jakarta.activation-api --- hadoop-ozone/datanode/pom.xml | 4 ---- hadoop-ozone/insight/pom.xml | 4 ---- hadoop-ozone/recon/pom.xml | 4 ---- hadoop-ozone/s3gateway/pom.xml | 4 ---- hadoop-ozone/tools/pom.xml | 4 ---- 5 files changed, 20 deletions(-) diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml index 4020ecd567d5..60c3bfac2ae4 100644 --- a/hadoop-ozone/datanode/pom.xml +++ b/hadoop-ozone/datanode/pom.xml @@ -32,10 +32,6 @@ - - jakarta.activation - jakarta.activation-api - org.apache.ozone hdds-container-service diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml index 798f2f883176..960660fb0c87 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -38,10 +38,6 @@ io.dropwizard.metrics metrics-core - - jakarta.activation - jakarta.activation-api - org.apache.httpcomponents httpclient diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index a1ddb7cea2e3..80b54a06afb1 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -70,10 +70,6 @@ info.picocli picocli - - jakarta.activation - jakarta.activation-api - jakarta.annotation jakarta.annotation-api diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index 3c1e4ea52757..7b48fca74a65 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -74,10 +74,6 @@ io.opentracing opentracing-util - - jakarta.activation - jakarta.activation-api - jakarta.annotation jakarta.annotation-api diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index ca3e48224789..758a0c88244f 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -98,10 +98,6 @@ io.opentracing opentracing-util - - jakarta.activation - jakarta.activation-api - jakarta.annotation jakarta.annotation-api From d31aef822f65bd9a41065d0b74ba9b02e99063f6 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 28 May 2025 09:27:22 +0200 Subject: [PATCH 10/13] HDDS-12976. Clean up unused dependencies --- hadoop-hdds/common/pom.xml | 13 ------ hadoop-hdds/container-service/pom.xml | 4 -- hadoop-hdds/rocks-native/pom.xml | 4 -- hadoop-hdds/server-scm/pom.xml | 16 ------- hadoop-ozone/cli-shell/pom.xml | 4 -- hadoop-ozone/csi/pom.xml | 4 -- hadoop-ozone/freon/pom.xml | 5 --- hadoop-ozone/httpfsgateway/pom.xml | 8 ---- hadoop-ozone/insight/pom.xml | 12 ------ hadoop-ozone/mini-cluster/pom.xml | 8 ---- hadoop-ozone/ozone-manager/pom.xml | 4 -- hadoop-ozone/ozonefs/pom.xml | 4 -- hadoop-ozone/recon-codegen/pom.xml | 12 ------ hadoop-ozone/recon/pom.xml | 12 ------ hadoop-ozone/s3gateway/pom.xml | 8 ---- hadoop-ozone/tools/pom.xml | 60 --------------------------- 16 files changed, 178 deletions(-) diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index 41bb244861ea..1b53330312f6 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -47,11 +47,6 @@ com.github.stephenc.jcip jcip-annotations - - com.google.errorprone - error_prone_annotations - true - com.google.guava guava @@ -76,10 +71,6 @@ info.picocli picocli - - io.dropwizard.metrics - metrics-core - io.jaegertracing jaeger-core @@ -157,10 +148,6 @@ org.bouncycastle bcprov-jdk18on - - org.reflections - reflections - org.slf4j slf4j-api diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index fb3b8d18e175..b9d34d5fe60d 100644 --- a/hadoop-hdds/container-service/pom.xml +++ b/hadoop-hdds/container-service/pom.xml @@ -62,10 +62,6 @@ info.picocli picocli - - io.dropwizard.metrics - metrics-core - io.netty netty-buffer diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml index 94bc77b79eb1..0c7e8fa7e2da 100644 --- a/hadoop-hdds/rocks-native/pom.xml +++ b/hadoop-hdds/rocks-native/pom.xml @@ -43,10 +43,6 @@ org.apache.ozone hdds-managed-rocksdb - - org.eclipse.jetty - jetty-io - org.rocksdb rocksdbjni diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml index 7f9db0c04d08..a2970becb48e 100644 --- a/hadoop-hdds/server-scm/pom.xml +++ b/hadoop-hdds/server-scm/pom.xml @@ -63,10 +63,6 @@ info.picocli picocli - - io.dropwizard.metrics - metrics-core - jakarta.annotation jakarta.annotation-api @@ -84,10 +80,6 @@ org.apache.commons commons-lang3 - - org.apache.commons - commons-text - org.apache.hadoop hadoop-auth @@ -141,10 +133,6 @@ org.apache.ratis ratis-grpc - - org.apache.ratis - ratis-netty - org.apache.ratis ratis-proto @@ -165,10 +153,6 @@ org.bouncycastle bcpkix-jdk18on - - org.bouncycastle - bcprov-jdk18on - org.eclipse.jetty jetty-webapp diff --git a/hadoop-ozone/cli-shell/pom.xml b/hadoop-ozone/cli-shell/pom.xml index 186f12886668..f7eeee7583c2 100644 --- a/hadoop-ozone/cli-shell/pom.xml +++ b/hadoop-ozone/cli-shell/pom.xml @@ -95,10 +95,6 @@ org.apache.ozone ozone-common - - org.apache.ozone - ozone-filesystem-common - org.apache.ozone ozone-interface-client diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index 47dd7ea92016..b4b8f9fb01aa 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -32,10 +32,6 @@ - - ch.qos.reload4j - reload4j - com.google.guava guava diff --git a/hadoop-ozone/freon/pom.xml b/hadoop-ozone/freon/pom.xml index cac05ff8e2e1..670bb651068b 100644 --- a/hadoop-ozone/freon/pom.xml +++ b/hadoop-ozone/freon/pom.xml @@ -184,11 +184,6 @@ metainf-services provided - - ch.qos.reload4j - reload4j - runtime - diff --git a/hadoop-ozone/httpfsgateway/pom.xml b/hadoop-ozone/httpfsgateway/pom.xml index 9a4fb6ed6c78..f0b96351ddcf 100644 --- a/hadoop-ozone/httpfsgateway/pom.xml +++ b/hadoop-ozone/httpfsgateway/pom.xml @@ -46,10 +46,6 @@ com.fasterxml.jackson.core jackson-databind - - com.google.guava - guava - com.googlecode.json-simple json-simple @@ -100,10 +96,6 @@ org.apache.ozone ozone-common - - org.apache.ozone - ozone-filesystem-common - org.slf4j slf4j-api diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml index 960660fb0c87..471f9e09a729 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -34,10 +34,6 @@ info.picocli picocli - - io.dropwizard.metrics - metrics-core - org.apache.httpcomponents httpclient @@ -82,18 +78,10 @@ org.apache.ozone ozone-cli-admin - - org.apache.ozone - ozone-client - org.apache.ozone ozone-common - - org.apache.ozone - ozone-filesystem - org.apache.ozone ozone-interface-client diff --git a/hadoop-ozone/mini-cluster/pom.xml b/hadoop-ozone/mini-cluster/pom.xml index 76af6c74c046..c1c03119a0c7 100644 --- a/hadoop-ozone/mini-cluster/pom.xml +++ b/hadoop-ozone/mini-cluster/pom.xml @@ -97,14 +97,6 @@ org.apache.ozone ozone-manager - - org.apache.ozone - ozone-recon - - - org.apache.ozone - ozone-reconcodegen - org.apache.ratis ratis-common diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index d2dcdb9d6578..b6f380041433 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -286,10 +286,6 @@ org.aspectj aspectjweaver - - org.bouncycastle - bcprov-jdk18on - org.eclipse.jetty jetty-util diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml index c6587407a38c..39c866975d0b 100644 --- a/hadoop-ozone/ozonefs/pom.xml +++ b/hadoop-ozone/ozonefs/pom.xml @@ -53,10 +53,6 @@ org.apache.ozone hdds-config - - org.apache.ozone - ozone-client - org.apache.ozone ozone-common diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml index 6eda1180a5c9..90041224b8a5 100644 --- a/hadoop-ozone/recon-codegen/pom.xml +++ b/hadoop-ozone/recon-codegen/pom.xml @@ -43,14 +43,6 @@ org.apache.hadoop hadoop-common - - org.apache.ozone - hdds-config - - - org.apache.ozone - ozone-common - org.jooq jooq @@ -67,10 +59,6 @@ org.slf4j slf4j-api - - org.springframework - spring-jdbc - org.springframework spring-tx diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index 80b54a06afb1..4378123fe3a9 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -235,22 +235,10 @@ org.glassfish.jersey.core jersey-server - - org.javassist - javassist - org.jooq jooq - - org.jooq - jooq-codegen - - - org.jooq - jooq-meta - org.reflections reflections diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index 7b48fca74a65..b17e218413e7 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -143,10 +143,6 @@ org.apache.ozone hdds-interface-client - - org.apache.ozone - hdds-interface-server - org.apache.ozone hdds-server-framework @@ -185,10 +181,6 @@ org.glassfish.jersey.core jersey-server - - org.javassist - javassist - org.slf4j slf4j-api diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 758a0c88244f..43d089132278 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -34,22 +34,10 @@ ch.qos.reload4j reload4j - - com.amazonaws - aws-java-sdk-core - - - com.amazonaws - aws-java-sdk-s3 - com.fasterxml.jackson.core jackson-annotations - - com.fasterxml.jackson.core - jackson-core - com.fasterxml.jackson.core jackson-databind @@ -82,22 +70,6 @@ info.picocli picocli - - info.picocli - picocli-shell-jline3 - - - io.dropwizard.metrics - metrics-core - - - io.opentracing - opentracing-api - - - io.opentracing - opentracing-util - jakarta.annotation jakarta.annotation-api @@ -118,14 +90,6 @@ org.apache.hadoop hadoop-hdfs - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - org.apache.ozone hdds-client @@ -146,10 +110,6 @@ org.apache.ozone hdds-interface-client - - org.apache.ozone - hdds-interface-server - org.apache.ozone hdds-managed-rocksdb @@ -182,14 +142,6 @@ org.apache.ozone ozone-common - - org.apache.ozone - ozone-filesystem - - - org.apache.ozone - ozone-filesystem-common - org.apache.ozone ozone-interface-client @@ -216,10 +168,6 @@ org.apache.ozone rocksdb-checkpoint-differ - - org.apache.ratis - ratis-client - org.apache.ratis ratis-common @@ -256,14 +204,6 @@ org.jgrapht jgrapht-ext - - org.jline - jline - - - org.jooq - jooq - org.reflections reflections From 84453aa2ba6f487cb6083ef9ed8908564e5fd82d Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 28 May 2025 09:27:59 +0200 Subject: [PATCH 11/13] remove dependency: jersey-container-servlet --- hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 1 - hadoop-ozone/dist/src/main/license/jar-report.txt | 1 - hadoop-ozone/recon/pom.xml | 4 ---- 3 files changed, 6 deletions(-) diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index 15616f0953a7..6e903d358ac3 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -231,7 +231,6 @@ EPL 2.0 org.glassfish.hk2:hk2-locator org.glassfish.hk2:hk2-utils org.glassfish.hk2:osgi-resource-locator - org.glassfish.jersey.containers:jersey-container-servlet org.glassfish.jersey.containers:jersey-container-servlet-core org.glassfish.jersey.core:jersey-client org.glassfish.jersey.core:jersey-common diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt index aa4a2d884cfd..dd7915ae2119 100644 --- a/hadoop-ozone/dist/src/main/license/jar-report.txt +++ b/hadoop-ozone/dist/src/main/license/jar-report.txt @@ -125,7 +125,6 @@ share/ozone/lib/jersey-client.jar share/ozone/lib/jersey-client.jar share/ozone/lib/jersey-common.jar share/ozone/lib/jersey-container-servlet-core.jar -share/ozone/lib/jersey-container-servlet.jar share/ozone/lib/jersey-core.jar share/ozone/lib/jersey-entity-filtering.jar share/ozone/lib/jersey-hk2.jar diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index 4378123fe3a9..60c2149575e4 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -219,10 +219,6 @@ org.glassfish.hk2 hk2-api - - org.glassfish.jersey.containers - jersey-container-servlet - org.glassfish.jersey.containers jersey-container-servlet-core From dfe5ed7b273230bd5a58dd9deac83faeb912a15a Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 28 May 2025 09:47:46 +0200 Subject: [PATCH 12/13] remove dependency: aspectjweaver --- hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 1 - hadoop-ozone/dist/src/main/license/jar-report.txt | 1 - hadoop-ozone/ozone-manager/pom.xml | 4 ---- pom.xml | 5 ----- 4 files changed, 11 deletions(-) diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index 6e903d358ac3..0356db3ed7f4 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -222,7 +222,6 @@ EPL 2.0 jakarta.annotation:jakarta.annotation-api jakarta.ws.rs:jakarta.ws.rs-api org.aspectj:aspectjrt - org.aspectj:aspectjweaver org.glassfish.hk2.external:aopalliance-repackaged org.glassfish.hk2.external:jakarta.inject org.glassfish.hk2.external:javax.inject diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt index dd7915ae2119..b7322a84c2c5 100644 --- a/hadoop-ozone/dist/src/main/license/jar-report.txt +++ b/hadoop-ozone/dist/src/main/license/jar-report.txt @@ -11,7 +11,6 @@ share/ozone/lib/asm.jar share/ozone/lib/asm-tree.jar share/ozone/lib/asm-util.jar share/ozone/lib/aspectjrt.jar -share/ozone/lib/aspectjweaver.jar share/ozone/lib/aws-java-sdk-core.jar share/ozone/lib/aws-java-sdk-kms.jar share/ozone/lib/aws-java-sdk-logs.jar diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index b6f380041433..eeaec368d02a 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -282,10 +282,6 @@ org.aspectj aspectjrt - - org.aspectj - aspectjweaver - org.eclipse.jetty jetty-util diff --git a/pom.xml b/pom.xml index 2e50f200aae8..acee5cbb97d3 100644 --- a/pom.xml +++ b/pom.xml @@ -1377,11 +1377,6 @@ aspectjrt ${aspectj.version} - - org.aspectj - aspectjweaver - ${aspectj.version} - org.assertj assertj-core From cc65e840ec1e304b63d0870da77d689b95897848 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Fri, 6 Jun 2025 05:42:18 +0200 Subject: [PATCH 13/13] restore netty-handler in ozone-common --- hadoop-ozone/common/pom.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 5fcb0d6ac3e6..0f91ba21d9a5 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -65,6 +65,10 @@ io.netty netty-common + + io.netty + netty-handler + jakarta.annotation jakarta.annotation-api @@ -131,12 +135,6 @@ grpc-stub provided - - - io.netty - netty-handler - provided - io.netty netty-codec-http2