From efe1ccc81f9cb1cfd14f798bf06a4013bd1a7331 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sun, 11 May 2025 10:24:02 +0200 Subject: [PATCH 1/4] move dependencies due to HDDS-12053 --- hadoop-hdds/rocksdb-checkpoint-differ/pom.xml | 12 ------------ hadoop-ozone/tools/pom.xml | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml index 547cba319f84..a80e8694ffa2 100644 --- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml +++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml @@ -27,10 +27,6 @@ Apache Ozone Checkpoint Differ for RocksDB - - com.github.vlsi.mxgraph - jgraphx - com.google.guava guava @@ -71,14 +67,6 @@ org.apache.ratis ratis-common - - org.jgrapht - jgrapht-core - - - org.jgrapht - jgrapht-ext - org.rocksdb rocksdbjni diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index fff4335b60c6..6cd406d66b8c 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -58,6 +58,10 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 + + com.github.vlsi.mxgraph + jgraphx + com.google.guava guava @@ -240,6 +244,14 @@ org.glassfish.jaxb jaxb-runtime + + org.jgrapht + jgrapht-core + + + org.jgrapht + jgrapht-ext + org.jline jline From 494d1be44c900acd48d0ed64537c26d854703c36 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sun, 11 May 2025 10:23:04 +0200 Subject: [PATCH 2/4] HDDS-12965. Add used undeclared dependencies --- hadoop-hdds/erasurecode/pom.xml | 5 ++ hadoop-hdds/managed-rocksdb/pom.xml | 8 +++ hadoop-hdds/rocks-native/pom.xml | 4 ++ hadoop-hdds/rocksdb-checkpoint-differ/pom.xml | 8 +++ hadoop-hdds/test-utils/pom.xml | 5 ++ .../mini-chaos-tests/pom.xml | 50 +++++++++++++++++++ hadoop-ozone/insight/pom.xml | 4 ++ hadoop-ozone/integration-test-s3/pom.xml | 10 ++++ hadoop-ozone/interface-storage/pom.xml | 5 ++ hadoop-ozone/mini-cluster/pom.xml | 8 +++ hadoop-ozone/recon-codegen/pom.xml | 4 ++ hadoop-ozone/recon/pom.xml | 12 +++++ hadoop-ozone/s3-secret-store/pom.xml | 4 ++ hadoop-ozone/tools/pom.xml | 16 ++++++ 14 files changed, 143 insertions(+) diff --git a/hadoop-hdds/erasurecode/pom.xml b/hadoop-hdds/erasurecode/pom.xml index 6eeec42154b4..53578449df23 100644 --- a/hadoop-hdds/erasurecode/pom.xml +++ b/hadoop-hdds/erasurecode/pom.xml @@ -45,6 +45,11 @@ + + org.apache.commons + commons-lang3 + test + org.apache.ozone hdds-config diff --git a/hadoop-hdds/managed-rocksdb/pom.xml b/hadoop-hdds/managed-rocksdb/pom.xml index 5f9781739587..c1c4685df40f 100644 --- a/hadoop-hdds/managed-rocksdb/pom.xml +++ b/hadoop-hdds/managed-rocksdb/pom.xml @@ -35,10 +35,18 @@ com.google.guava guava + + commons-io + commons-io + jakarta.annotation jakarta.annotation-api + + org.apache.hadoop + hadoop-common + org.apache.ozone hdds-common diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml index 5c3eeb86899b..89c0fc62bf40 100644 --- a/hadoop-hdds/rocks-native/pom.xml +++ b/hadoop-hdds/rocks-native/pom.xml @@ -27,6 +27,10 @@ com.google.guava guava + + commons-io + commons-io + org.apache.commons commons-lang3 diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml index a80e8694ffa2..ac0613f61837 100644 --- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml +++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml @@ -39,10 +39,18 @@ commons-collections commons-collections + + commons-io + commons-io + org.apache.commons commons-lang3 + + org.apache.hadoop + hadoop-common + org.apache.ozone hdds-common diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml index 10899b0558a1..c735cf14692d 100644 --- a/hadoop-hdds/test-utils/pom.xml +++ b/hadoop-hdds/test-utils/pom.xml @@ -47,6 +47,11 @@ org.jacoco.core provided + + org.junit.platform + junit-platform-engine + provided + org.junit.platform junit-platform-launcher diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml index 8562a31a4f70..2c95affc468c 100644 --- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml +++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml @@ -32,6 +32,41 @@ + + info.picocli + picocli + test + + + org.apache.commons + commons-lang3 + test + + + org.apache.hadoop + hadoop-auth + test + + + org.apache.hadoop + hadoop-common + test + + + org.apache.ozone + hdds-client + test + + + org.apache.ozone + hdds-common + test + + + org.apache.ozone + hdds-config + test + org.apache.ozone hdds-container-service @@ -54,6 +89,16 @@ test-jar test + + org.apache.ozone + ozone-client + test + + + org.apache.ozone + ozone-common + test + org.apache.ozone ozone-freon @@ -80,6 +125,11 @@ ozone-recon test + + org.slf4j + slf4j-api + test + software.amazon.awssdk s3 diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml index 304bc958e482..49a50603fb97 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -74,6 +74,10 @@ org.apache.ozone hdds-interface-client + + org.apache.ozone + hdds-interface-server + org.apache.ozone hdds-server-framework diff --git a/hadoop-ozone/integration-test-s3/pom.xml b/hadoop-ozone/integration-test-s3/pom.xml index 48a0faa1e076..9f6ddc516255 100644 --- a/hadoop-ozone/integration-test-s3/pom.xml +++ b/hadoop-ozone/integration-test-s3/pom.xml @@ -46,6 +46,11 @@ commons-lang3 test + + org.apache.hadoop + hadoop-common + test + org.apache.ozone hdds-common @@ -72,6 +77,11 @@ ozone-client test + + org.apache.ozone + ozone-common + test + org.apache.ozone ozone-mini-cluster diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml index 3a27e56c903b..77961757ae2a 100644 --- a/hadoop-ozone/interface-storage/pom.xml +++ b/hadoop-ozone/interface-storage/pom.xml @@ -63,6 +63,11 @@ + + org.apache.hadoop + hadoop-common + test + org.apache.ozone hdds-common diff --git a/hadoop-ozone/mini-cluster/pom.xml b/hadoop-ozone/mini-cluster/pom.xml index be6317d9344c..76af6c74c046 100644 --- a/hadoop-ozone/mini-cluster/pom.xml +++ b/hadoop-ozone/mini-cluster/pom.xml @@ -34,6 +34,14 @@ commons-io commons-io + + org.apache.hadoop + hadoop-auth + + + org.apache.hadoop + hadoop-common + org.apache.ozone hdds-common diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml index b85e7cef1269..ba7261aedf72 100644 --- a/hadoop-ozone/recon-codegen/pom.xml +++ b/hadoop-ozone/recon-codegen/pom.xml @@ -39,6 +39,10 @@ org.apache.derby derby + + org.apache.hadoop + hadoop-common + org.apache.ozone hdds-config diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index 13a5108bae76..38cb0f0fd9b1 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -114,6 +114,18 @@ org.apache.derby derby + + org.apache.hadoop + hadoop-auth + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-hdfs-client + org.apache.ozone hdds-common diff --git a/hadoop-ozone/s3-secret-store/pom.xml b/hadoop-ozone/s3-secret-store/pom.xml index bcbc80ee9a9d..d50fc92df44f 100644 --- a/hadoop-ozone/s3-secret-store/pom.xml +++ b/hadoop-ozone/s3-secret-store/pom.xml @@ -37,6 +37,10 @@ jakarta.annotation jakarta.annotation-api + + org.apache.hadoop + hadoop-common + org.apache.ozone ozone-common diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 6cd406d66b8c..4f1c29f2b76c 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -66,10 +66,18 @@ com.google.guava guava + + com.google.protobuf + protobuf-java + commons-codec commons-codec + + commons-collections + commons-collections + commons-io commons-io @@ -212,6 +220,10 @@ + + org.apache.ozone + rocksdb-checkpoint-differ + org.apache.ratis ratis-client @@ -224,6 +236,10 @@ org.apache.ratis ratis-proto + + org.apache.ratis + ratis-server + org.apache.ratis ratis-server-api From 8a7a6f2efedbfb5a11bae4ce9ea5fa0297f5d085 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sun, 11 May 2025 10:34:55 +0200 Subject: [PATCH 3/4] limit to test scope --- .../mini-chaos-tests/pom.xml | 11 +- hadoop-ozone/integration-test/pom.xml | 152 ++++++++++-------- 2 files changed, 91 insertions(+), 72 deletions(-) diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml index 2c95affc468c..bf7a1636749e 100644 --- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml +++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml @@ -26,12 +26,6 @@ Apache Ozone Mini Ozone Chaos Tests - - org.apache.ozone - ozone-filesystem - - - info.picocli picocli @@ -99,6 +93,11 @@ ozone-common test + + org.apache.ozone + ozone-filesystem + test + org.apache.ozone ozone-freon diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index 488a741f8d6c..14343a35b474 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -26,72 +26,6 @@ Apache Ozone Integration Tests - - org.apache.ozone - hdds-server-scm - - - org.apache.ozone - ozone-cli-admin - - - org.apache.ozone - ozone-cli-shell - - - org.apache.ozone - ozone-client - - - org.apache.ozone - ozone-common - - - org.apache.ozone - ozone-csi - - - org.apache.ozone - ozone-filesystem - - - org.apache.ozone - ozone-freon - - - org.apache.ozone - ozone-manager - - - org.apache.ozone - ozone-recon - - - org.apache.ozone - ozone-s3gateway - - - * - * - - - - - org.apache.ozone - ozone-tools - - - org.apache.ratis - ratis-server - - - org.hamcrest - hamcrest - - - org.slf4j - jul-to-slf4j - org.apache.commons commons-lang3 @@ -248,6 +182,11 @@ test-jar test + + org.apache.ozone + hdds-server-scm + test + org.apache.ozone hdds-server-scm @@ -260,6 +199,46 @@ test-jar test + + org.apache.ozone + ozone-cli-admin + test + + + org.apache.ozone + ozone-cli-shell + test + + + org.apache.ozone + ozone-client + test + + + org.apache.ozone + ozone-common + test + + + org.apache.ozone + ozone-csi + test + + + org.apache.ozone + ozone-filesystem + test + + + org.apache.ozone + ozone-freon + test + + + org.apache.ozone + ozone-manager + test + org.apache.ozone ozone-manager @@ -271,6 +250,47 @@ ozone-mini-cluster test + + org.apache.ozone + ozone-recon + test + + + org.apache.ozone + ozone-s3gateway + test + + + * + * + + + + + org.apache.ozone + ozone-tools + test + + + org.apache.ratis + ratis-server + test + + + org.hamcrest + hamcrest + test + + + org.slf4j + jul-to-slf4j + test + + + org.slf4j + slf4j-api + test + From 6caa1be572d006c0ef6e48562c38575c5a57c342 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sun, 11 May 2025 11:05:03 +0200 Subject: [PATCH 4/4] HDDS-12965. Add used undeclared dependencies --- hadoop-ozone/integration-test/pom.xml | 245 ++++++++++++++++++++++++++ pom.xml | 4 + 2 files changed, 249 insertions(+) diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index 14343a35b474..198f03f20789 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -26,11 +26,106 @@ Apache Ozone Integration Tests + + ch.qos.reload4j + reload4j + test + + + com.fasterxml.jackson.core + jackson-core + test + + + com.fasterxml.jackson.core + jackson-databind + test + + + com.github.stephenc.jcip + jcip-annotations + test + + + com.google.guava + guava + test + + + com.google.protobuf + protobuf-java + test + + + com.squareup.okhttp3 + okhttp + test + + + commons-codec + commons-codec + test + + + commons-io + commons-io + test + + + commons-validator + commons-validator + test + + + info.picocli + picocli + test + + + jakarta.annotation + jakarta.annotation-api + test + + + jakarta.xml.bind + jakarta.xml.bind-api + test + + + javax.servlet + javax.servlet-api + test + + + javax.ws.rs + jsr311-api + test + + + org.apache.commons + commons-compress + test + org.apache.commons commons-lang3 test + + org.apache.commons + commons-text + test + + + org.apache.hadoop + hadoop-auth + test + + + org.apache.hadoop + hadoop-common + test + org.apache.hadoop hadoop-common @@ -76,12 +171,22 @@ + + org.apache.hadoop + hadoop-hdfs + test + org.apache.hadoop hadoop-hdfs test-jar test + + org.apache.hadoop + hadoop-hdfs-client + test + org.apache.hadoop hadoop-kms @@ -164,18 +269,83 @@ + + org.apache.httpcomponents + httpclient + test + + + org.apache.httpcomponents + httpcore + test + + + org.apache.kerby + kerby-util + test + + + org.apache.ozone + hdds-client + test + + + org.apache.ozone + hdds-common + test + org.apache.ozone hdds-common test-jar test + + org.apache.ozone + hdds-config + test + + + org.apache.ozone + hdds-container-service + test + org.apache.ozone hdds-container-service test-jar test + + org.apache.ozone + hdds-interface-admin + test + + + org.apache.ozone + hdds-interface-client + test + + + org.apache.ozone + hdds-interface-server + test + + + org.apache.ozone + hdds-managed-rocksdb + test + + + org.apache.ozone + hdds-rocks-native + test + + + org.apache.ozone + hdds-server-framework + test + org.apache.ozone hdds-server-framework @@ -229,11 +399,26 @@ ozone-filesystem test + + org.apache.ozone + ozone-filesystem-common + test + org.apache.ozone ozone-freon test + + org.apache.ozone + ozone-interface-client + test + + + org.apache.ozone + ozone-interface-storage + test + org.apache.ozone ozone-manager @@ -255,6 +440,11 @@ ozone-recon test + + org.apache.ozone + ozone-reconcodegen + test + org.apache.ozone ozone-s3gateway @@ -271,16 +461,71 @@ ozone-tools test + + org.apache.ozone + rocksdb-checkpoint-differ + test + + + org.apache.ranger + ranger-intg + test + + + org.apache.ratis + ratis-client + test + + + org.apache.ratis + ratis-common + test + + + org.apache.ratis + ratis-grpc + test + + + org.apache.ratis + ratis-metrics-api + test + + + org.apache.ratis + ratis-proto + test + org.apache.ratis ratis-server test + + org.apache.ratis + ratis-server-api + test + + + org.apache.ratis + ratis-thirdparty-misc + test + + + org.bouncycastle + bcpkix-jdk18on + test + org.hamcrest hamcrest test + + org.rocksdb + rocksdbjni + test + org.slf4j jul-to-slf4j diff --git a/pom.xml b/pom.xml index 18f33fec3bf2..fc406ac38852 100644 --- a/pom.xml +++ b/pom.xml @@ -2190,6 +2190,10 @@ true + + + org.apache.hadoop.ozone.om.service.TestRangerBGSyncService +