diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index 45f10c674317..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 @@ -101,10 +92,6 @@ jakarta.xml.bind jakarta.xml.bind-api - - javax.annotation - javax.annotation-api - org.apache.commons commons-lang3 @@ -113,10 +100,6 @@ org.apache.hadoop hadoop-common - - org.apache.ozone - hdds-annotation-processing - org.apache.ozone hdds-config @@ -165,14 +148,6 @@ org.bouncycastle bcprov-jdk18on - - org.jetbrains.kotlin - kotlin-stdlib - - - org.reflections - reflections - org.slf4j slf4j-api diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index fde6e8c7898a..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 @@ -98,10 +94,6 @@ jakarta.annotation jakarta.annotation-api - - jakarta.xml.bind - jakarta.xml.bind-api - org.apache.commons commons-compress 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-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-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-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..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 @@ -115,6 +111,12 @@ org.slf4j slf4j-api + + + org.kohsuke.metainf-services + metainf-services + provided + org.apache.ozone ozone-filesystem 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/csi/pom.xml b/hadoop-ozone/csi/pom.xml index eb8c3b6fa9a1..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 @@ -45,25 +41,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 +151,32 @@ 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 + javax.annotation-api + provided + io.netty netty-codec-http2 diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml index c0c7533f8993..60c3bfac2ae4 100644 --- a/hadoop-ozone/datanode/pom.xml +++ b/hadoop-ozone/datanode/pom.xml @@ -32,14 +32,6 @@ - - jakarta.activation - jakarta.activation-api - - - jakarta.xml.bind - jakarta.xml.bind-api - org.apache.ozone hdds-container-service diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index 3b3e1b043ed6..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 @@ -231,7 +230,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 @@ -463,7 +461,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 @@ -480,7 +477,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 b8c888ee482e..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 @@ -66,7 +65,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 @@ -126,7 +124,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 @@ -182,7 +179,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 @@ -243,7 +239,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 diff --git a/hadoop-ozone/freon/pom.xml b/hadoop-ozone/freon/pom.xml index c1ce02a3b1e0..670bb651068b 100644 --- a/hadoop-ozone/freon/pom.xml +++ b/hadoop-ozone/freon/pom.xml @@ -174,18 +174,15 @@ org.apache.ratis ratis-thirdparty-misc - - org.kohsuke.metainf-services - metainf-services - org.slf4j slf4j-api - ch.qos.reload4j - reload4j - runtime + + org.kohsuke.metainf-services + metainf-services + provided diff --git a/hadoop-ozone/httpfsgateway/pom.xml b/hadoop-ozone/httpfsgateway/pom.xml index e00e193efdbe..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 @@ -64,10 +60,6 @@ jakarta.ws.rs jakarta.ws.rs-api - - jakarta.xml.bind - jakarta.xml.bind-api - javax.servlet javax.servlet-api @@ -104,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 9ac78c878e0b..471f9e09a729 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -34,18 +34,6 @@ info.picocli picocli - - io.dropwizard.metrics - metrics-core - - - jakarta.activation - jakarta.activation-api - - - jakarta.xml.bind - jakarta.xml.bind-api - org.apache.httpcomponents httpclient @@ -90,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 @@ -110,6 +90,11 @@ org.apache.ozone ozone-manager + + jakarta.xml.bind + jakarta.xml.bind-api + provided + org.glassfish.jaxb jaxb-runtime 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/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/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..eeaec368d02a 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -282,14 +282,6 @@ org.aspectj aspectjrt - - 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 9582f4357744..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 @@ -69,11 +61,13 @@ org.springframework - spring-jdbc + spring-tx - org.springframework - spring-tx + + jakarta.xml.bind + jakarta.xml.bind-api + provided diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index df5d4527f2df..60c2149575e4 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 @@ -90,6 +86,14 @@ jakarta.xml.bind jakarta.xml.bind-api + + + javax.annotation + javax.annotation-api + javax.inject javax.inject @@ -215,10 +219,6 @@ org.glassfish.hk2 hk2-api - - org.glassfish.jersey.containers - jersey-container-servlet - org.glassfish.jersey.containers jersey-container-servlet-core @@ -231,22 +231,10 @@ org.glassfish.jersey.core jersey-server - - org.javassist - javassist - org.jooq jooq - - org.jooq - jooq-codegen - - - org.jooq - jooq-meta - org.reflections reflections @@ -352,6 +340,15 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + javax.annotation:javax.annotation-api:jar + + + org.apache.maven.plugins maven-enforcer-plugin diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index 54cc7c7debdd..b17e218413e7 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 @@ -70,10 +74,6 @@ io.opentracing opentracing-util - - jakarta.activation - jakarta.activation-api - jakarta.annotation jakarta.annotation-api @@ -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 24d53f2fe406..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,26 +70,6 @@ info.picocli picocli - - info.picocli - picocli-shell-jline3 - - - io.dropwizard.metrics - metrics-core - - - io.opentracing - opentracing-api - - - io.opentracing - opentracing-util - - - jakarta.activation - jakarta.activation-api - jakarta.annotation jakarta.annotation-api @@ -122,14 +90,6 @@ org.apache.hadoop hadoop-hdfs - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - org.apache.ozone hdds-client @@ -150,10 +110,6 @@ org.apache.ozone hdds-interface-client - - org.apache.ozone - hdds-interface-server - org.apache.ozone hdds-managed-rocksdb @@ -186,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 @@ -220,10 +168,6 @@ org.apache.ozone rocksdb-checkpoint-differ - - org.apache.ratis - ratis-client - org.apache.ratis ratis-common @@ -260,18 +204,6 @@ org.jgrapht jgrapht-ext - - org.jline - jline - - - org.jooq - jooq - - - org.kohsuke.metainf-services - metainf-services - org.reflections reflections @@ -288,6 +220,12 @@ org.xerial sqlite-jdbc + + + org.kohsuke.metainf-services + metainf-services + provided + commons-codec commons-codec diff --git a/pom.xml b/pom.xml index 837522f95b0f..70c3139d223c 100644 --- a/pom.xml +++ b/pom.xml @@ -548,10 +548,6 @@ org.apache.tomcat.embed tomcat-embed-core - - org.jetbrains.kotlin - kotlin-stdlib - @@ -1381,11 +1377,6 @@ aspectjrt ${aspectj.version} - - org.aspectj - aspectjweaver - ${aspectj.version} - org.assertj assertj-core