From 3b0169a653a9bce039e6f45acdf6dd527a746d0d Mon Sep 17 00:00:00 2001 From: Sammi Chen Date: Wed, 10 Mar 2021 15:32:24 +0800 Subject: [PATCH 01/15] HDDS-4936. Change ozone maven groupId from org.apache.hadoop to org.apache.ozone. --- hadoop-hdds/client/pom.xml | 10 +-- hadoop-hdds/common/pom.xml | 10 +-- hadoop-hdds/config/pom.xml | 4 +- hadoop-hdds/container-service/pom.xml | 20 +++--- hadoop-hdds/docs/pom.xml | 2 +- hadoop-hdds/framework/pom.xml | 14 ++-- hadoop-hdds/hadoop-dependency-client/pom.xml | 2 +- hadoop-hdds/hadoop-dependency-server/pom.xml | 2 +- hadoop-hdds/hadoop-dependency-test/pom.xml | 2 +- hadoop-hdds/interface-admin/pom.xml | 4 +- hadoop-hdds/interface-client/pom.xml | 2 +- hadoop-hdds/interface-server/pom.xml | 4 +- hadoop-hdds/pom.xml | 38 +++++----- hadoop-hdds/server-scm/pom.xml | 26 +++---- hadoop-hdds/test-utils/pom.xml | 2 +- hadoop-hdds/tools/pom.xml | 12 ++-- hadoop-ozone/client/pom.xml | 6 +- hadoop-ozone/common/pom.xml | 12 ++-- hadoop-ozone/csi/pom.xml | 6 +- hadoop-ozone/datanode/pom.xml | 6 +- hadoop-ozone/dist/pom.xml | 32 ++++----- .../mini-chaos-tests/pom.xml | 10 +-- .../network-tests/pom.xml | 2 +- hadoop-ozone/fault-injection-test/pom.xml | 2 +- hadoop-ozone/insight/pom.xml | 20 +++--- hadoop-ozone/integration-test/pom.xml | 34 ++++----- hadoop-ozone/interface-client/pom.xml | 4 +- hadoop-ozone/interface-storage/pom.xml | 14 ++-- hadoop-ozone/ozone-manager/pom.xml | 28 ++++---- hadoop-ozone/ozonefs-common/pom.xml | 20 +++--- hadoop-ozone/ozonefs-hadoop2/pom.xml | 8 +-- hadoop-ozone/ozonefs-hadoop3/pom.xml | 6 +- hadoop-ozone/ozonefs-shaded/pom.xml | 4 +- hadoop-ozone/ozonefs/pom.xml | 6 +- hadoop-ozone/pom.xml | 70 +++++++++---------- hadoop-ozone/recon-codegen/pom.xml | 4 +- hadoop-ozone/recon/pom.xml | 18 ++--- hadoop-ozone/s3gateway/pom.xml | 20 +++--- hadoop-ozone/tools/pom.xml | 24 +++---- pom.xml | 2 +- 40 files changed, 256 insertions(+), 256 deletions(-) diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml index ee1d6fab5ca6..3fae2eb50878 100644 --- a/hadoop-hdds/client/pom.xml +++ b/hadoop-hdds/client/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -31,16 +31,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test @@ -52,7 +52,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index 8fc3747b9611..aeae7e8a864c 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -30,7 +30,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-client @@ -67,11 +67,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> jackson-annotations - org.apache.hadoop + org.apache.ozone hadoop-hdds-config - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test @@ -189,7 +189,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml index 1a185787b99f..9183e08f9461 100644 --- a/hadoop-hdds/config/pom.xml +++ b/hadoop-hdds/config/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -38,7 +38,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> slf4j-api - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index ab9f488233da..e81a6957c332 100644 --- a/hadoop-hdds/container-service/pom.xml +++ b/hadoop-hdds/container-service/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -30,11 +30,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test @@ -43,17 +43,17 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> commons-compress - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-hdds-client @@ -77,7 +77,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs provided @@ -98,7 +98,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test @@ -132,14 +132,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs ${project.build.outputDirectory}/webapps/hddsDatanode docs/**/*.* diff --git a/hadoop-hdds/docs/pom.xml b/hadoop-hdds/docs/pom.xml index 3a6aea0aa6c0..f4a93df9eb92 100644 --- a/hadoop-hdds/docs/pom.xml +++ b/hadoop-hdds/docs/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index a34ece50842a..7e5e80574803 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -31,24 +31,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-server - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-admin - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server @@ -107,7 +107,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml index d135b20790af..ecbb9847d729 100644 --- a/hadoop-hdds/hadoop-dependency-client/pom.xml +++ b/hadoop-hdds/hadoop-dependency-client/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml index 708bdb3153c4..34b1283bfe81 100644 --- a/hadoop-hdds/hadoop-dependency-server/pom.xml +++ b/hadoop-hdds/hadoop-dependency-server/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT diff --git a/hadoop-hdds/hadoop-dependency-test/pom.xml b/hadoop-hdds/hadoop-dependency-test/pom.xml index 6fd90a94b959..b681e2a93caf 100644 --- a/hadoop-hdds/hadoop-dependency-test/pom.xml +++ b/hadoop-hdds/hadoop-dependency-test/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT diff --git a/hadoop-hdds/interface-admin/pom.xml b/hadoop-hdds/interface-admin/pom.xml index c509ee187654..1d16472a500d 100644 --- a/hadoop-hdds/interface-admin/pom.xml +++ b/hadoop-hdds/interface-admin/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -36,7 +36,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client diff --git a/hadoop-hdds/interface-client/pom.xml b/hadoop-hdds/interface-client/pom.xml index eca70678a947..a999c544b0d9 100644 --- a/hadoop-hdds/interface-client/pom.xml +++ b/hadoop-hdds/interface-client/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT diff --git a/hadoop-hdds/interface-server/pom.xml b/hadoop-hdds/interface-server/pom.xml index bdac4bbf91a0..608f09295833 100644 --- a/hadoop-hdds/interface-server/pom.xml +++ b/hadoop-hdds/interface-server/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -37,7 +37,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index 3a81a953931a..ead65317f630 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -18,7 +18,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-main-ozone 1.1.0-SNAPSHOT @@ -64,99 +64,99 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-common ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-client ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test ${hdds.version} test - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-server ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-admin ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-client ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-config ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils ${hdds.version} test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common ${hdds.version} test-jar @@ -164,7 +164,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service ${hdds.version} test-jar @@ -172,7 +172,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm test-jar ${hdds.version} diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml index 4e1d48199ff9..10a13e6f53a3 100644 --- a/hadoop-hdds/server-scm/pom.xml +++ b/hadoop-hdds/server-scm/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -30,35 +30,35 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service - org.apache.hadoop + org.apache.ozone hadoop-hdds-client - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs provided @@ -85,13 +85,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service test test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test @@ -131,7 +131,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> bcprov-jdk15on - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test @@ -151,14 +151,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs ${project.build.outputDirectory}/webapps/scm diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml index 5151659b59ff..a4ca79c9b1bb 100644 --- a/hadoop-hdds/test-utils/pom.xml +++ b/hadoop-hdds/test-utils/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml index 904c14b5a9fb..007a76cf5b8d 100644 --- a/hadoop-hdds/tools/pom.xml +++ b/hadoop-hdds/tools/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -31,24 +31,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-hdds-client - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml index 794bd476cd22..05dfd6f7543c 100644 --- a/hadoop-ozone/client/pom.xml +++ b/hadoop-ozone/client/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -30,12 +30,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-ozone-common diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 1c2cb3f08759..6a43770a91f1 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -35,20 +35,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> commons-compress - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-client - org.apache.hadoop + org.apache.ozone hadoop-ozone-interface-client @@ -57,7 +57,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index 3262a65ecd88..ba109a2db278 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -18,7 +18,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -41,7 +41,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-config @@ -104,7 +104,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> ${grpc-compile.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-client diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml index 77c66bd4fb88..a7229c1f6d35 100644 --- a/hadoop-ozone/datanode/pom.xml +++ b/hadoop-ozone/datanode/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -32,7 +32,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server compile @@ -43,7 +43,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml index 8cc3f1376a18..3b08fedca809 100644 --- a/hadoop-ozone/dist/pom.xml +++ b/hadoop-ozone/dist/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -179,47 +179,47 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service - org.apache.hadoop + org.apache.ozone hadoop-ozone-s3gateway - org.apache.hadoop + org.apache.ozone hadoop-ozone-csi - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager - org.apache.hadoop + org.apache.ozone hadoop-ozone-tools - org.apache.hadoop + org.apache.ozone hadoop-ozone-common - org.apache.hadoop + org.apache.ozone hadoop-ozone-datanode - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs - org.apache.hadoop + org.apache.ozone hadoop-ozone-insight @@ -233,11 +233,11 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-hadoop2 - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-hadoop3 @@ -252,7 +252,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-recon @@ -300,7 +300,7 @@ jacoco-core.jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils 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 2137416d0fcc..fcb9e887b3e8 100644 --- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml +++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml @@ -19,7 +19,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 hadoop-ozone-fault-injection-test - org.apache.hadoop + org.apache.ozone 1.1.0-SNAPSHOT 1.1.0-SNAPSHOT @@ -34,22 +34,22 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem - org.apache.hadoop + org.apache.ozone hadoop-ozone-integration-test test test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/fault-injection-test/network-tests/pom.xml b/hadoop-ozone/fault-injection-test/network-tests/pom.xml index b18702d02339..3ef72ac9c12c 100644 --- a/hadoop-ozone/fault-injection-test/network-tests/pom.xml +++ b/hadoop-ozone/fault-injection-test/network-tests/pom.xml @@ -18,7 +18,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone-fault-injection-test 1.1.0-SNAPSHOT diff --git a/hadoop-ozone/fault-injection-test/pom.xml b/hadoop-ozone/fault-injection-test/pom.xml index 4910f39d3930..b54845129b5f 100644 --- a/hadoop-ozone/fault-injection-test/pom.xml +++ b/hadoop-ozone/fault-injection-test/pom.xml @@ -18,7 +18,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml index 5cfeaaff1b80..23a31456d282 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -30,37 +30,37 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager - org.apache.hadoop + org.apache.ozone hadoop-ozone-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm - org.apache.hadoop + org.apache.ozone hadoop-ozone-client - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools @@ -90,7 +90,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index b3c263687735..263fde776b0c 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -31,20 +31,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-ozone-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager @@ -54,31 +54,31 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-ozone-s3gateway - org.apache.hadoop + org.apache.ozone hadoop-ozone-csi - org.apache.hadoop + org.apache.ozone hadoop-ozone-recon - org.apache.hadoop + org.apache.ozone hadoop-ozone-client - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem - org.apache.hadoop + org.apache.ozone hadoop-ozone-tools - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools @@ -87,13 +87,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager test test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test @@ -151,19 +151,19 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm test test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service test test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml index a2827b89cf43..c44e0787fe94 100644 --- a/hadoop-ozone/interface-client/pom.xml +++ b/hadoop-ozone/interface-client/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -34,7 +34,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> protobuf-java - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml index 4d0daeccdb8f..97968caa16fb 100644 --- a/hadoop-ozone/interface-storage/pom.xml +++ b/hadoop-ozone/interface-storage/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-common @@ -40,29 +40,29 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-interface-client - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm test-jar test - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index 7c3edcb85af0..3da53a0400f4 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -31,43 +31,43 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-ozone-common - org.apache.hadoop + org.apache.ozone hadoop-ozone-client - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs provided - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client - org.apache.hadoop + org.apache.ozone hadoop-ozone-interface-storage - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server @@ -87,18 +87,18 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> provided - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm test test-jar @@ -139,14 +139,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs ${project.build.outputDirectory}/webapps/ozoneManager docs/**/*.* diff --git a/hadoop-ozone/ozonefs-common/pom.xml b/hadoop-ozone/ozonefs-common/pom.xml index 47b2f660f616..8f26d9cca938 100644 --- a/hadoop-ozone/ozonefs-common/pom.xml +++ b/hadoop-ozone/ozonefs-common/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -38,7 +38,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-client @@ -47,39 +47,39 @@ provided - org.apache.hadoop + org.apache.ozone hadoop-ozone-client - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-ozone-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework test - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager test - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service test diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml index 4e7819ecd950..3af1d87151e8 100644 --- a/hadoop-ozone/ozonefs-hadoop2/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-shaded true @@ -39,7 +39,7 @@ hadoop-common - org.apache.hadoop + org.apache.ozone hadoop-hdfs-client @@ -93,7 +93,7 @@ META-INF/versions/**/*.* - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-shaded ${project.version} diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml index 7288eb9f6eea..43df463df9a0 100644 --- a/hadoop-ozone/ozonefs-hadoop3/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-shaded true @@ -76,7 +76,7 @@ META-INF/versions/**/*.* - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-shaded ${project.version} diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml index 62664ffaa8a9..71263b4063c7 100644 --- a/hadoop-ozone/ozonefs-shaded/pom.xml +++ b/hadoop-ozone/ozonefs-shaded/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -32,7 +32,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-common diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml index ef88a76e98ce..833ee1ce302d 100644 --- a/hadoop-ozone/ozonefs/pom.xml +++ b/hadoop-ozone/ozonefs/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -77,11 +77,11 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-common - org.apache.hadoop + org.apache.ozone hadoop-ozone-client diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 94f47e8dbdf3..92e92d3012e1 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -14,7 +14,7 @@ --> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-main-ozone 1.1.0-SNAPSHOT @@ -58,179 +58,179 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-common ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-client ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-interface-client ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-interface-storage ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-s3gateway ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-csi ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-datanode ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-tools ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-shaded ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-common ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-hadoop3 ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-hadoop2 ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-config ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils ${hdds.version} test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-client ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test ${hdds.version} test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common ${hdds.version} test-jar test - org.apache.hadoop + org.apache.ozone hadoop-ozone-integration-test ${ozone.version} test-jar - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager ${ozone.version} test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-common ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-client ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-insight ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-recon ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service ${hdds.version} test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm test-jar ${hdds.version} diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml index 4660abe10e0b..7502be611840 100644 --- a/hadoop-ozone/recon-codegen/pom.xml +++ b/hadoop-ozone/recon-codegen/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> hadoop-ozone - org.apache.hadoop + org.apache.ozone 1.1.0-SNAPSHOT 4.0.0 @@ -25,7 +25,7 @@ Apache Ozone Recon CodeGen - org.apache.hadoop + org.apache.ozone hadoop-ozone-common diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index 4c55e309aa16..72a3de7b19f9 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -16,7 +16,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -174,7 +174,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-common @@ -192,12 +192,12 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-reconcodegen ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager @@ -207,13 +207,13 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools @@ -223,7 +223,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm @@ -263,7 +263,7 @@ jersey-hk2 - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test @@ -279,7 +279,7 @@ test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index 88bb0b58cc8d..06dfde535eac 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -32,17 +32,17 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-common compile - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework @@ -91,7 +91,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server @@ -113,7 +113,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test @@ -160,11 +160,11 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-client - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs provided @@ -200,14 +200,14 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs ${project.build.outputDirectory}/webapps/static diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 94b0a095cdc0..4632684019bd 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -30,41 +30,41 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager - org.apache.hadoop + org.apache.ozone hadoop-ozone-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools - org.apache.hadoop + org.apache.ozone hadoop-ozone-client - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-ozone-recon @@ -74,7 +74,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server @@ -130,7 +130,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/pom.xml b/pom.xml index 5b6be04b52f6..1bd9c53b2fb9 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-main-ozone 1.1.0-SNAPSHOT Apache Ozone Main From e80870e5662ab4d7542ec5238781e126ed931aee Mon Sep 17 00:00:00 2001 From: Sammi Chen Date: Tue, 23 Mar 2021 21:05:59 +0800 Subject: [PATCH 02/15] HDDS-5008. Remove hadoop from ozone module artifactId. --- hadoop-hdds/client/pom.xml | 12 ++-- hadoop-hdds/common/pom.xml | 12 ++-- hadoop-hdds/config/pom.xml | 6 +- hadoop-hdds/container-service/pom.xml | 22 +++--- hadoop-hdds/docs/pom.xml | 4 +- hadoop-hdds/framework/pom.xml | 16 ++--- hadoop-hdds/hadoop-dependency-client/pom.xml | 4 +- hadoop-hdds/hadoop-dependency-server/pom.xml | 4 +- hadoop-hdds/hadoop-dependency-test/pom.xml | 4 +- hadoop-hdds/interface-admin/pom.xml | 6 +- hadoop-hdds/interface-client/pom.xml | 4 +- hadoop-hdds/interface-server/pom.xml | 6 +- hadoop-hdds/pom.xml | 40 +++++------ hadoop-hdds/server-scm/pom.xml | 30 ++++---- hadoop-hdds/test-utils/pom.xml | 4 +- hadoop-hdds/tools/pom.xml | 14 ++-- hadoop-ozone/client/pom.xml | 8 +-- hadoop-ozone/common/pom.xml | 14 ++-- hadoop-ozone/csi/pom.xml | 8 +-- hadoop-ozone/datanode/pom.xml | 8 +-- .../dev-support/checks/integration.sh | 2 +- hadoop-ozone/dev-support/checks/unit.sh | 2 +- .../dist/dev-support/bin/dist-tar-stitching | 6 +- hadoop-ozone/dist/pom.xml | 40 +++++------ .../mini-chaos-tests/pom.xml | 10 +-- .../network-tests/pom.xml | 4 +- hadoop-ozone/fault-injection-test/pom.xml | 4 +- hadoop-ozone/insight/pom.xml | 22 +++--- hadoop-ozone/integration-test/pom.xml | 36 +++++----- hadoop-ozone/interface-client/pom.xml | 6 +- hadoop-ozone/interface-storage/pom.xml | 16 ++--- hadoop-ozone/ozone-manager/pom.xml | 32 ++++----- hadoop-ozone/ozonefs-common/pom.xml | 22 +++--- hadoop-ozone/ozonefs-hadoop2/pom.xml | 8 +-- hadoop-ozone/ozonefs-hadoop3/pom.xml | 8 +-- hadoop-ozone/ozonefs-shaded/pom.xml | 6 +- hadoop-ozone/ozonefs/pom.xml | 8 +-- hadoop-ozone/pom.xml | 72 +++++++++---------- hadoop-ozone/recon-codegen/pom.xml | 6 +- hadoop-ozone/recon/pom.xml | 20 +++--- hadoop-ozone/s3gateway/pom.xml | 22 +++--- hadoop-ozone/tools/pom.xml | 26 +++---- pom.xml | 4 +- 43 files changed, 304 insertions(+), 304 deletions(-) diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml index 3fae2eb50878..32296d4940a6 100644 --- a/hadoop-hdds/client/pom.xml +++ b/hadoop-hdds/client/pom.xml @@ -19,11 +19,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-client + hdds-client 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Client Library Apache Ozone HDDS Client @@ -32,16 +32,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test @@ -53,7 +53,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index aeae7e8a864c..0b59fd1d745f 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-common + hdds-common 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Common Apache Ozone HDDS Common @@ -31,7 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-client + hdds-hadoop-dependency-client info.picocli @@ -68,11 +68,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-config + hdds-config org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test @@ -190,7 +190,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client org.hamcrest diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml index 9183e08f9461..98266a60aa1f 100644 --- a/hadoop-hdds/config/pom.xml +++ b/hadoop-hdds/config/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-config + hdds-config 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Config Tools Apache Ozone HDDS Config @@ -39,7 +39,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index e81a6957c332..0c6175f97b30 100644 --- a/hadoop-hdds/container-service/pom.xml +++ b/hadoop-hdds/container-service/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-container-service + hdds-container-service 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Container Service Apache Ozone HDDS Container Service @@ -31,11 +31,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test @@ -44,17 +44,17 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-hdds-client + hdds-client commons-codec @@ -78,7 +78,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-docs + hdds-docs provided @@ -99,7 +99,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test @@ -133,14 +133,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* org.apache.ozone - hadoop-hdds-docs + hdds-docs ${project.build.outputDirectory}/webapps/hddsDatanode docs/**/*.* diff --git a/hadoop-hdds/docs/pom.xml b/hadoop-hdds/docs/pom.xml index f4a93df9eb92..cd1536ee7ad7 100644 --- a/hadoop-hdds/docs/pom.xml +++ b/hadoop-hdds/docs/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-docs + hdds-docs 1.1.0-SNAPSHOT Apache Ozone/HDDS Documentation Apache Ozone/HDDS Documentation diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index 7e5e80574803..f11a1cc0187f 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-server-framework + hdds-server-framework 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Server Framework @@ -32,24 +32,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-interface-server + hdds-interface-server org.apache.ozone - hadoop-hdds-interface-admin + hdds-interface-admin org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server org.eclipse.jetty @@ -108,7 +108,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml index ecbb9847d729..76af0eb8af52 100644 --- a/hadoop-hdds/hadoop-dependency-client/pom.xml +++ b/hadoop-hdds/hadoop-dependency-client/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-hadoop-dependency-client + hdds-hadoop-dependency-client 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Hadoop client dependencies diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml index 34b1283bfe81..1d1b8e52d6a3 100644 --- a/hadoop-hdds/hadoop-dependency-server/pom.xml +++ b/hadoop-hdds/hadoop-dependency-server/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Hadoop server dependencies diff --git a/hadoop-hdds/hadoop-dependency-test/pom.xml b/hadoop-hdds/hadoop-dependency-test/pom.xml index b681e2a93caf..fcb466ae36d0 100644 --- a/hadoop-hdds/hadoop-dependency-test/pom.xml +++ b/hadoop-hdds/hadoop-dependency-test/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Hadoop test dependencies diff --git a/hadoop-hdds/interface-admin/pom.xml b/hadoop-hdds/interface-admin/pom.xml index 1d16472a500d..cb62f70afbd0 100644 --- a/hadoop-hdds/interface-admin/pom.xml +++ b/hadoop-hdds/interface-admin/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-interface-admin + hdds-interface-admin 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Admin interface @@ -37,7 +37,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client diff --git a/hadoop-hdds/interface-client/pom.xml b/hadoop-hdds/interface-client/pom.xml index a999c544b0d9..35808151986e 100644 --- a/hadoop-hdds/interface-client/pom.xml +++ b/hadoop-hdds/interface-client/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-interface-client + hdds-interface-client 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Client interface diff --git a/hadoop-hdds/interface-server/pom.xml b/hadoop-hdds/interface-server/pom.xml index 608f09295833..ee9d5d078d22 100644 --- a/hadoop-hdds/interface-server/pom.xml +++ b/hadoop-hdds/interface-server/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-interface-server + hdds-interface-server 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Server interface @@ -38,7 +38,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index ead65317f630..7a5f472c923c 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -19,11 +19,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-main-ozone + ozone-main 1.1.0-SNAPSHOT - hadoop-hdds + hdds 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Project Apache Ozone HDDS @@ -65,99 +65,99 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-common + hdds-common ${hdds.version} org.apache.ozone - hadoop-hdds-hadoop-dependency-client + hdds-hadoop-dependency-client ${hdds.version} org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server ${hdds.version} org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test ${hdds.version} test org.apache.ozone - hadoop-hdds-interface-server + hdds-interface-server ${hdds.version} org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client ${hdds.version} org.apache.ozone - hadoop-hdds-interface-admin + hdds-interface-admin ${hdds.version} org.apache.ozone - hadoop-hdds-client + hdds-client ${hdds.version} org.apache.ozone - hadoop-hdds-tools + hdds-tools ${hdds.version} org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework ${hdds.version} org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm ${hdds.version} org.apache.ozone - hadoop-hdds-container-service + hdds-container-service ${hdds.version} org.apache.ozone - hadoop-hdds-docs + hdds-docs ${hdds.version} org.apache.ozone - hadoop-hdds-config + hdds-config ${hdds.version} org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils ${hdds.version} test org.apache.ozone - hadoop-hdds-common + hdds-common ${hdds.version} test-jar test @@ -165,7 +165,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-container-service + hdds-container-service ${hdds.version} test-jar test @@ -173,7 +173,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm test-jar ${hdds.version} test diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml index 10a13e6f53a3..278048efbffd 100644 --- a/hadoop-hdds/server-scm/pom.xml +++ b/hadoop-hdds/server-scm/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-server-scm + hdds-server-scm 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Storage Container Manager Server Apache Ozone HDDS SCM Server @@ -31,35 +31,35 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-hdds-container-service + hdds-container-service org.apache.ozone - hadoop-hdds-client + hdds-client org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-hdds-docs + hdds-docs provided @@ -86,13 +86,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-container-service + hdds-container-service test test-jar org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test @@ -132,7 +132,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test @@ -152,14 +152,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* org.apache.ozone - hadoop-hdds-docs + hdds-docs ${project.build.outputDirectory}/webapps/scm docs/**/*.* @@ -180,7 +180,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - ${basedir}/../../hadoop-hdds/common/src/main/resources + ${basedir}/../../hdds/common/src/main/resources ${basedir}/src/test/resources diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml index a4ca79c9b1bb..bf73b76eeff7 100644 --- a/hadoop-hdds/test-utils/pom.xml +++ b/hadoop-hdds/test-utils/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-test-utils + hdds-test-utils 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Test Utils Apache Ozone HDDS Test Utils diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml index 007a76cf5b8d..23c83fdb5970 100644 --- a/hadoop-hdds/tools/pom.xml +++ b/hadoop-hdds/tools/pom.xml @@ -19,11 +19,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-tools + hdds-tools 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Tools Apache Ozone HDDS Tools @@ -32,24 +32,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-hdds-client + hdds-client org.apache.ozone - hadoop-hdds-container-service + hdds-container-service ratis-tools diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml index 05dfd6f7543c..53af6e873d12 100644 --- a/hadoop-ozone/client/pom.xml +++ b/hadoop-ozone/client/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-client + ozone-client 1.1.0-SNAPSHOT Apache Ozone Client Apache Ozone Client @@ -31,12 +31,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-ozone-common + ozone-common junit diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 6a43770a91f1..924a96f02a61 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-common + ozone-common 1.1.0-SNAPSHOT Apache Ozone Common Apache Ozone Common @@ -36,20 +36,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-hdds-client + hdds-client org.apache.ozone - hadoop-ozone-interface-client + ozone-interface-client junit @@ -58,7 +58,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index ba109a2db278..cbc897a6edbc 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -19,10 +19,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-csi + ozone-csi 1.1.0-SNAPSHOT Apache Ozone CSI service Apache Ozone CSI service @@ -42,7 +42,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-config + hdds-config org.apache.hadoop @@ -105,7 +105,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-client + ozone-client com.google.guava diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml index a7229c1f6d35..25fc1cdc3608 100644 --- a/hadoop-ozone/datanode/pom.xml +++ b/hadoop-ozone/datanode/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-datanode + ozone-datanode Apache Ozone Datanode jar 1.1.0-SNAPSHOT @@ -33,7 +33,7 @@ org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server compile @@ -44,7 +44,7 @@ org.apache.ozone - hadoop-hdds-container-service + hdds-container-service com.sun.xml.bind diff --git a/hadoop-ozone/dev-support/checks/integration.sh b/hadoop-ozone/dev-support/checks/integration.sh index 367351873f21..a8142efb0fa3 100755 --- a/hadoop-ozone/dev-support/checks/integration.sh +++ b/hadoop-ozone/dev-support/checks/integration.sh @@ -16,4 +16,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" CHECK=integration -source "${DIR}/junit.sh" -pl :hadoop-ozone-integration-test,:mini-chaos-tests "$@" +source "${DIR}/junit.sh" -pl :ozone-integration-test,:mini-chaos-tests "$@" diff --git a/hadoop-ozone/dev-support/checks/unit.sh b/hadoop-ozone/dev-support/checks/unit.sh index 22139b5e40b9..b3c46a94baec 100755 --- a/hadoop-ozone/dev-support/checks/unit.sh +++ b/hadoop-ozone/dev-support/checks/unit.sh @@ -16,4 +16,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" CHECK=unit -source "${DIR}/junit.sh" -pl \!:hadoop-ozone-integration-test,\!:mini-chaos-tests "$@" +source "${DIR}/junit.sh" -pl \!:ozone-integration-test,\!:mini-chaos-tests "$@" diff --git a/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching b/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching index 408233afda12..c94e7d0eb6ea 100755 --- a/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching +++ b/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching @@ -38,8 +38,8 @@ function run() fi } -run tar -c -f "hadoop-ozone-${VERSION}.tar" "ozone-${VERSION}" -run gzip -f "hadoop-ozone-${VERSION}.tar" +run tar -c -f "ozone-${VERSION}.tar" "ozone-${VERSION}" +run gzip -f "ozone-${VERSION}.tar" echo -echo "Ozone dist tar available at: ${BASEDIR}/hadoop-ozone-${VERSION}.tar.gz" +echo "Ozone dist tar available at: ${BASEDIR}/ozone-${VERSION}.tar.gz" echo diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml index 3b08fedca809..150af4e52517 100644 --- a/hadoop-ozone/dist/pom.xml +++ b/hadoop-ozone/dist/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-dist + ozone-dist Apache Ozone Distribution jar 1.1.0-SNAPSHOT @@ -73,8 +73,8 @@ *.classpath - hadoop-hdds-server-scm,hadoop-ozone-common,hadoop-ozone-csi,hadoop-ozone-datanode,hadoop-ozone-insight, - hadoop-ozone-ozone-manager,hadoop-ozone-recon,hadoop-ozone-s3gateway,hadoop-ozone-tools + hdds-server-scm,ozone-common,ozone-csi,ozone-datanode,ozone-insight, + ozone-manager,ozone-recon,ozone-s3gateway,ozone-tools @@ -180,47 +180,47 @@ org.apache.ozone - hadoop-hdds-tools + hdds-tools org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm org.apache.ozone - hadoop-hdds-container-service + hdds-container-service org.apache.ozone - hadoop-ozone-s3gateway + ozone-s3gateway org.apache.ozone - hadoop-ozone-csi + ozone-csi org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager org.apache.ozone - hadoop-ozone-tools + ozone-tools org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.ozone - hadoop-ozone-datanode + ozone-datanode org.apache.ozone - hadoop-hdds-docs + hdds-docs org.apache.ozone - hadoop-ozone-insight + ozone-insight @@ -234,11 +234,11 @@ org.apache.ozone - hadoop-ozone-filesystem-hadoop2 + ozone-filesystem-hadoop2 org.apache.ozone - hadoop-ozone-filesystem-hadoop3 + ozone-filesystem-hadoop3 @@ -253,7 +253,7 @@ org.apache.ozone - hadoop-ozone-recon + ozone-recon @@ -301,7 +301,7 @@ org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils @@ -334,7 +334,7 @@ ../.. false false - hadoop-ozone-${project.version}-src + ozone-${project.version}-src target ${project.basedir}/../.. 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 fcb9e887b3e8..2609418068ea 100644 --- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml +++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml @@ -18,7 +18,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - hadoop-ozone-fault-injection-test + ozone-fault-injection-test org.apache.ozone 1.1.0-SNAPSHOT @@ -35,22 +35,22 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-ozone-filesystem + ozone-filesystem org.apache.ozone - hadoop-ozone-integration-test + ozone-integration-test test test-jar org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/fault-injection-test/network-tests/pom.xml b/hadoop-ozone/fault-injection-test/network-tests/pom.xml index 3ef72ac9c12c..6fd837d9843b 100644 --- a/hadoop-ozone/fault-injection-test/network-tests/pom.xml +++ b/hadoop-ozone/fault-injection-test/network-tests/pom.xml @@ -19,10 +19,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone-fault-injection-test + ozone-fault-injection-test 1.1.0-SNAPSHOT - hadoop-ozone-network-tests + ozone-network-tests Apache Ozone Network Tests Apache Ozone Network Tests jar diff --git a/hadoop-ozone/fault-injection-test/pom.xml b/hadoop-ozone/fault-injection-test/pom.xml index b54845129b5f..df31367cff0c 100644 --- a/hadoop-ozone/fault-injection-test/pom.xml +++ b/hadoop-ozone/fault-injection-test/pom.xml @@ -19,10 +19,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-fault-injection-test + ozone-fault-injection-test 1.1.0-SNAPSHOT Apache Ozone Fault Injection Tests Apache Ozone Fault Injection Tests diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml index 23a31456d282..e2c21b8984e5 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-insight + ozone-insight 1.1.0-SNAPSHOT Apache Ozone Insight Tool Apache Ozone Insight Tool @@ -31,37 +31,37 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.ozone - hadoop-ozone-filesystem + ozone-filesystem org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-hdds-tools + hdds-tools com.sun.xml.bind @@ -91,7 +91,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index 263fde776b0c..e7513e89633d 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-integration-test + ozone-integration-test 1.1.0-SNAPSHOT Apache Ozone Integration Tests Apache Ozone Integration Tests @@ -32,20 +32,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager org.apache.hadoop @@ -55,31 +55,31 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-s3gateway + ozone-s3gateway org.apache.ozone - hadoop-ozone-csi + ozone-csi org.apache.ozone - hadoop-ozone-recon + ozone-recon org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.ozone - hadoop-ozone-filesystem + ozone-filesystem org.apache.ozone - hadoop-ozone-tools + ozone-tools org.apache.ozone - hadoop-hdds-tools + hdds-tools org.apache.commons @@ -88,13 +88,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager test test-jar org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test @@ -152,19 +152,19 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm test test-jar org.apache.ozone - hadoop-hdds-container-service + hdds-container-service test test-jar org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml index c44e0787fe94..9458ded7d973 100644 --- a/hadoop-ozone/interface-client/pom.xml +++ b/hadoop-ozone/interface-client/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-interface-client + ozone-interface-client 1.1.0-SNAPSHOT Apache Ozone Client interface Apache Ozone Client Interface @@ -35,7 +35,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml index 97968caa16fb..12b129439222 100644 --- a/hadoop-ozone/interface-storage/pom.xml +++ b/hadoop-ozone/interface-storage/pom.xml @@ -19,10 +19,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-interface-storage + ozone-interface-storage 1.1.0-SNAPSHOT Apache Ozone Storage Interface Apache Ozone Storage Interface @@ -31,7 +31,7 @@ org.apache.ozone - hadoop-ozone-common + ozone-common @@ -41,29 +41,29 @@ org.apache.ozone - hadoop-ozone-interface-client + ozone-interface-client org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm test-jar test org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index 3da53a0400f4..1fda1a82ab76 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-ozone-manager + ozone-manager 1.1.0-SNAPSHOT Apache Ozone Manager Server Apache Ozone Manager Server @@ -32,43 +32,43 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.ozone - hadoop-hdds-docs + hdds-docs provided org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client org.apache.ozone - hadoop-ozone-interface-storage + ozone-interface-storage org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server @@ -88,18 +88,18 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm test test-jar @@ -140,14 +140,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* org.apache.ozone - hadoop-hdds-docs + hdds-docs ${project.build.outputDirectory}/webapps/ozoneManager docs/**/*.* @@ -167,7 +167,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - ${basedir}/../../hadoop-hdds/common/src/main/resources + ${basedir}/../../hdds/common/src/main/resources ${basedir}/src/test/resources diff --git a/hadoop-ozone/ozonefs-common/pom.xml b/hadoop-ozone/ozonefs-common/pom.xml index 8f26d9cca938..683e47025d4c 100644 --- a/hadoop-ozone/ozonefs-common/pom.xml +++ b/hadoop-ozone/ozonefs-common/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem-common + ozone-filesystem-common Apache Ozone FileSystem Common jar 1.1.0-SNAPSHOT @@ -39,7 +39,7 @@ org.apache.ozone - hadoop-hdds-hadoop-dependency-client + hdds-hadoop-dependency-client com.github.spotbugs @@ -48,39 +48,39 @@ org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm test org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework test org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager test org.apache.ozone - hadoop-hdds-container-service + hdds-container-service test diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml index 3af1d87151e8..87da2575abf0 100644 --- a/hadoop-ozone/ozonefs-hadoop2/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem-hadoop2 + ozone-filesystem-hadoop2 Apache Ozone FS Hadoop 2.x compatibility jar 1.1.0-SNAPSHOT @@ -31,7 +31,7 @@ org.apache.ozone - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded true @@ -94,7 +94,7 @@ org.apache.ozone - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded ${project.version} diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml index 43df463df9a0..b43ef5ec4db8 100644 --- a/hadoop-ozone/ozonefs-hadoop3/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem-hadoop3 + ozone-filesystem-hadoop3 Apache Ozone FS Hadoop 3.x compatibility jar 1.1.0-SNAPSHOT @@ -31,7 +31,7 @@ org.apache.ozone - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded true @@ -77,7 +77,7 @@ org.apache.ozone - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded ${project.version} diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml index 71263b4063c7..8eeefe970b05 100644 --- a/hadoop-ozone/ozonefs-shaded/pom.xml +++ b/hadoop-ozone/ozonefs-shaded/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded Apache Ozone FileSystem Shaded jar 1.1.0-SNAPSHOT @@ -33,7 +33,7 @@ org.apache.ozone - hadoop-ozone-filesystem-common + ozone-filesystem-common org.apache.hadoop diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml index 833ee1ce302d..1514e59c7180 100644 --- a/hadoop-ozone/ozonefs/pom.xml +++ b/hadoop-ozone/ozonefs/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem + ozone-filesystem Apache Ozone FileSystem jar 1.1.0-SNAPSHOT @@ -78,11 +78,11 @@ org.apache.ozone - hadoop-ozone-filesystem-common + ozone-filesystem-common org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.hadoop diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 92e92d3012e1..0b728f4996dc 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -15,10 +15,10 @@ 4.0.0 org.apache.ozone - hadoop-main-ozone + ozone-main 1.1.0-SNAPSHOT - hadoop-ozone + ozone 1.1.0-SNAPSHOT Apache Ozone Project Apache Ozone @@ -59,179 +59,179 @@ org.apache.ozone - hadoop-ozone-common + ozone-common ${ozone.version} org.apache.ozone - hadoop-ozone-client + ozone-client ${ozone.version} org.apache.ozone - hadoop-ozone-interface-client + ozone-interface-client ${ozone.version} org.apache.ozone - hadoop-ozone-interface-storage + ozone-interface-storage ${ozone.version} org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager ${ozone.version} org.apache.ozone - hadoop-ozone-s3gateway + ozone-s3gateway ${ozone.version} org.apache.ozone - hadoop-ozone-csi + ozone-csi ${ozone.version} org.apache.ozone - hadoop-ozone-datanode + ozone-datanode ${ozone.version} org.apache.ozone - hadoop-ozone-tools + ozone-tools ${ozone.version} org.apache.ozone - hadoop-ozone-filesystem + ozone-filesystem ${ozone.version} org.apache.ozone - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded ${ozone.version} org.apache.ozone - hadoop-ozone-filesystem-common + ozone-filesystem-common ${ozone.version} org.apache.ozone - hadoop-ozone-filesystem-hadoop3 + ozone-filesystem-hadoop3 ${ozone.version} org.apache.ozone - hadoop-ozone-filesystem-hadoop2 + ozone-filesystem-hadoop2 ${ozone.version} org.apache.ozone - hadoop-hdds-config + hdds-config ${hdds.version} org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client ${hdds.version} org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils ${hdds.version} test org.apache.ozone - hadoop-hdds-hadoop-dependency-client + hdds-hadoop-dependency-client ${hdds.version} org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server ${hdds.version} org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test ${hdds.version} test org.apache.ozone - hadoop-hdds-common + hdds-common ${hdds.version} test-jar test org.apache.ozone - hadoop-ozone-integration-test + ozone-integration-test ${ozone.version} test-jar org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager ${ozone.version} test-jar org.apache.ozone - hadoop-hdds-common + hdds-common ${hdds.version} org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework ${hdds.version} org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm ${hdds.version} org.apache.ozone - hadoop-hdds-docs + hdds-docs ${hdds.version} org.apache.ozone - hadoop-hdds-container-service + hdds-container-service ${hdds.version} org.apache.ozone - hadoop-hdds-client + hdds-client ${hdds.version} org.apache.ozone - hadoop-hdds-tools + hdds-tools ${hdds.version} org.apache.ozone - hadoop-ozone-insight + ozone-insight ${hdds.version} org.apache.ozone - hadoop-ozone-recon + ozone-recon ${ozone.version} org.apache.ozone - hadoop-hdds-container-service + hdds-container-service ${hdds.version} test-jar org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm test-jar ${hdds.version} diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml index 7502be611840..fdf787ccaf26 100644 --- a/hadoop-ozone/recon-codegen/pom.xml +++ b/hadoop-ozone/recon-codegen/pom.xml @@ -16,17 +16,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - hadoop-ozone + ozone org.apache.ozone 1.1.0-SNAPSHOT 4.0.0 - hadoop-ozone-reconcodegen + ozone-reconcodegen Apache Ozone Recon CodeGen org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.derby diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index 72a3de7b19f9..05f959900cb5 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -17,12 +17,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT Apache Ozone Recon 4.0.0 - hadoop-ozone-recon + ozone-recon @@ -175,7 +175,7 @@ org.apache.ozone - hadoop-ozone-common + ozone-common jersey-server @@ -193,12 +193,12 @@ org.apache.ozone - hadoop-ozone-reconcodegen + ozone-reconcodegen ${ozone.version} org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager com.sun.jersey @@ -208,13 +208,13 @@ org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-tools + hdds-tools * @@ -224,7 +224,7 @@ org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm com.google.inject @@ -264,7 +264,7 @@ org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test @@ -280,7 +280,7 @@ org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index 06dfde535eac..d6ba095698d5 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-s3gateway + ozone-s3gateway Apache Ozone S3 Gateway jar 1.1.0-SNAPSHOT @@ -33,17 +33,17 @@ org.apache.ozone - hadoop-ozone-common + ozone-common compile org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.jboss.weld.servlet @@ -92,7 +92,7 @@ org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server com.sun.jersey @@ -114,7 +114,7 @@ org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test @@ -161,11 +161,11 @@ org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.ozone - hadoop-hdds-docs + hdds-docs provided @@ -201,14 +201,14 @@ org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* org.apache.ozone - hadoop-hdds-docs + hdds-docs ${project.build.outputDirectory}/webapps/static diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 4632684019bd..ce7adad79ddc 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-tools + ozone-tools 1.1.0-SNAPSHOT Apache Ozone Tools Apache Ozone Tools @@ -31,41 +31,41 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm org.apache.ozone - hadoop-hdds-tools + hdds-tools org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.ozone - hadoop-ozone-filesystem + ozone-filesystem org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-ozone-recon + ozone-recon org.springframework @@ -75,7 +75,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server org.apache.ratis @@ -131,7 +131,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/pom.xml b/pom.xml index 1bd9c53b2fb9..98a4dbabcc91 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-main-ozone + ozone-main 1.1.0-SNAPSHOT Apache Ozone Main Apache Ozone Main @@ -2002,7 +2002,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs hadoop-hdds/dev-support/checkstyle/checkstyle.xml - hadoop-hdds/dev-support/checkstyle/suppressions.xml + hdds/dev-support/checkstyle/suppressions.xml true false xml From 81334ed914d7facc6b21c4cceaff597b86228f2b Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 23 Mar 2021 14:51:49 +0100 Subject: [PATCH 03/15] Fix checkstyle --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 98a4dbabcc91..1863bb49eda3 100644 --- a/pom.xml +++ b/pom.xml @@ -2002,7 +2002,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs hadoop-hdds/dev-support/checkstyle/checkstyle.xml - hdds/dev-support/checkstyle/suppressions.xml + hadoop-hdds/dev-support/checkstyle/suppressions.xml true false xml From 0f7bf9f721ce14416245153ebb23b055c773073f Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 23 Mar 2021 15:42:45 +0100 Subject: [PATCH 04/15] Update module names in coverage.sh --- hadoop-ozone/dev-support/checks/coverage.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hadoop-ozone/dev-support/checks/coverage.sh b/hadoop-ozone/dev-support/checks/coverage.sh index 1374ad99535c..75d6126483e7 100755 --- a/hadoop-ozone/dev-support/checks/coverage.sh +++ b/hadoop-ozone/dev-support/checks/coverage.sh @@ -42,8 +42,7 @@ rm -rf target/coverage-classes || true mkdir -p target/coverage-classes #Unzip all the classes from the last build -find hadoop-ozone/dist/target/*/share/ozone/lib -name "hadoop-*.jar" | \ - grep -E 'hadoop-ozone-|hadoop-hdds-' | \ +find hadoop-ozone/dist/target/*/share/ozone/lib -name 'hdds-*.jar' -or -name 'ozone-*.jar' | \ grep -v -E 'shaded|hadoop2|hadoop3|tests' | \ xargs -n1 unzip -o -q -d target/coverage-classes From 715a95664e9f9efd510a1545d724915abc6cc1fb Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 23 Mar 2021 16:36:17 +0100 Subject: [PATCH 05/15] Fix GH workflow --- .github/workflows/post-commit.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml index a8e5ed3b038f..5b05700695c5 100644 --- a/.github/workflows/post-commit.yml +++ b/.github/workflows/post-commit.yml @@ -56,13 +56,13 @@ jobs: if: matrix.java == '8' with: name: ozone-bin - path: hadoop-ozone/dist/target/hadoop-ozone*.tar.gz + path: hadoop-ozone/dist/target/ozone*.tar.gz retention-days: 1 - name: Delete temporary build artifacts before caching run: | #Never cache local artifacts - rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-hdds* - rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-ozone* + rm -rf ~/.m2/repository/org/apache/ozone/hdds* + rm -rf ~/.m2/repository/org/apache/ozone/ozone* if: always() bats: runs-on: ubuntu-18.04 @@ -206,7 +206,7 @@ jobs: - name: Untar binaries run: | mkdir -p /mnt/ozone/hadoop-ozone/dist/target - tar xzvf hadoop-ozone*.tar.gz -C /mnt/ozone/hadoop-ozone/dist/target + tar xzvf ozone*.tar.gz -C /mnt/ozone/hadoop-ozone/dist/target sudo chmod -R a+rwX /mnt/ozone/hadoop-ozone/dist/target - name: Install robotframework run: sudo pip install robotframework @@ -273,7 +273,7 @@ jobs: - name: Untar binaries run: | mkdir -p hadoop-ozone/dist/target - tar xzvf target/artifacts/ozone-bin/hadoop-ozone*.tar.gz -C hadoop-ozone/dist/target + tar xzvf target/artifacts/ozone-bin/ozone*.tar.gz -C hadoop-ozone/dist/target - name: Calculate combined coverage run: ./hadoop-ozone/dev-support/checks/coverage.sh - name: Setup java 11 @@ -310,7 +310,7 @@ jobs: - name: Untar binaries run: | mkdir -p /mnt/ozone/hadoop-ozone/dist/target - tar xzvf hadoop-ozone*.tar.gz -C /mnt/ozone/hadoop-ozone/dist/target + tar xzvf ozone*.tar.gz -C /mnt/ozone/hadoop-ozone/dist/target - name: Install robotframework run: sudo pip install robotframework - name: Install k3s From 2a24161262cc12a4712225bb5bb03e4848aa3a38 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 23 Mar 2021 18:51:48 +0100 Subject: [PATCH 06/15] Fix module names --- hadoop-hdds/docs/content/interface/O3fs.md | 4 +- hadoop-hdds/docs/content/interface/O3fs.zh.md | 8 ++-- hadoop-hdds/docs/content/interface/Ofs.md | 4 +- .../docs/content/recipe/SparkOzoneFSK8S.md | 6 +-- .../docs/content/recipe/SparkOzoneFSK8S.zh.md | 6 +-- .../compose/ozone-mr/hadoop27/docker-config | 4 +- .../compose/ozone-mr/hadoop31/docker-config | 4 +- .../compose/ozone-mr/hadoop32/docker-config | 4 +- .../src/main/compose/ozonesecure-mr/README.md | 2 +- .../main/compose/ozonesecure-mr/docker-config | 4 +- .../dist/src/main/license/bin/LICENSE.txt | 2 +- .../src/main/smoketest/cli/classpath.robot | 14 +++---- hadoop-ozone/dist/src/shell/ozone/ozone | 40 +++++++++---------- hadoop-ozone/native-client/README.md | 4 +- 14 files changed, 53 insertions(+), 53 deletions(-) diff --git a/hadoop-hdds/docs/content/interface/O3fs.md b/hadoop-hdds/docs/content/interface/O3fs.md index 4db9d23a4290..f2cfb37381e6 100644 --- a/hadoop-hdds/docs/content/interface/O3fs.md +++ b/hadoop-hdds/docs/content/interface/O3fs.md @@ -68,10 +68,10 @@ This will make this bucket to be the default Hadoop compatible file system and r You also need to add the ozone-filesystem-hadoop3.jar file to the classpath: {{< highlight bash >}} -export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/hadoop-ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH +export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH {{< /highlight >}} -(Note: with Hadoop 2.x, use the `hadoop-ozone-filesystem-hadoop2-*.jar`) +(Note: with Hadoop 2.x, use the `ozone-filesystem-hadoop2-*.jar`) Once the default Filesystem has been setup, users can run commands like ls, put, mkdir, etc. For example, diff --git a/hadoop-hdds/docs/content/interface/O3fs.zh.md b/hadoop-hdds/docs/content/interface/O3fs.zh.md index 528238740579..38a807f45766 100644 --- a/hadoop-hdds/docs/content/interface/O3fs.zh.md +++ b/hadoop-hdds/docs/content/interface/O3fs.zh.md @@ -64,10 +64,10 @@ ozone sh bucket create /volume/bucket 你还需要将 ozone-filesystem.jar 文件加入 classpath： {{< highlight bash >}} -export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/hadoop-ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH +export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH {{< /highlight >}} -(注意：当使用Hadoop 2.x时，应该在classpath上添加hadoop-ozone-filesystem-hadoop2-*.jar) +(注意：当使用Hadoop 2.x时，应该在classpath上添加ozone-filesystem-hadoop2-*.jar) 当配置了默认的文件系统之后，用户可以运行 ls、put、mkdir 等命令，比如： @@ -137,10 +137,10 @@ hdfs dfs -ls o3fs://bucket.volume.om-host.example.com:6789/key 你还需要将 ozone-filesystem.jar 文件加入 classpath： {{< highlight bash >}} -export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/hadoop-ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH +export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH {{< /highlight >}} -(注意：当使用Hadoop 2.x时，应该在classpath上添加hadoop-ozone-filesystem-hadoop2-*.jar) +(注意：当使用Hadoop 2.x时，应该在classpath上添加ozone-filesystem-hadoop2-*.jar) 当配置了默认的文件系统之后，用户可以运行 ls、put、mkdir 等命令，比如： diff --git a/hadoop-hdds/docs/content/interface/Ofs.md b/hadoop-hdds/docs/content/interface/Ofs.md index fcc1467a7102..0f552c3dcf1e 100644 --- a/hadoop-hdds/docs/content/interface/Ofs.md +++ b/hadoop-hdds/docs/content/interface/Ofs.md @@ -82,10 +82,10 @@ This will make all the volumes and buckets to be the default Hadoop compatible f You also need to add the ozone-filesystem-hadoop3.jar file to the classpath: {{< highlight bash >}} -export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/hadoop-ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH +export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH {{< /highlight >}} -(Note: with Hadoop 2.x, use the `hadoop-ozone-filesystem-hadoop2-*.jar`) +(Note: with Hadoop 2.x, use the `ozone-filesystem-hadoop2-*.jar`) Once the default Filesystem has been setup, users can run commands like ls, put, mkdir, etc. For example: diff --git a/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.md b/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.md index 0f0d094c8fbb..cb2b88404b67 100644 --- a/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.md +++ b/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.md @@ -82,7 +82,7 @@ And create a custom `core-site.xml`. Copy the `ozonefs.jar` file from an ozone distribution (__use the hadoop2 version!__) ``` -kubectl cp om-0:/opt/hadoop/share/ozone/lib/hadoop-ozone-filesystem-hadoop2-VERSION.jar hadoop-ozone-filesystem-hadoop2.jar +kubectl cp om-0:/opt/hadoop/share/ozone/lib/ozone-filesystem-hadoop2-VERSION.jar ozone-filesystem-hadoop2.jar ``` @@ -93,7 +93,7 @@ ADD core-site.xml /opt/hadoop/conf/core-site.xml ADD ozone-site.xml /opt/hadoop/conf/ozone-site.xml ENV HADOOP_CONF_DIR=/opt/hadoop/conf ENV SPARK_EXTRA_CLASSPATH=/opt/hadoop/conf -ADD hadoop-ozone-filesystem-hadoop2.jar /opt/hadoop-ozone-filesystem-hadoop2.jar +ADD ozone-filesystem-hadoop2.jar /opt/ozone-filesystem-hadoop2.jar ``` ```bash @@ -142,7 +142,7 @@ bin/spark-submit \ --conf spark.kubernetes.authenticate.driver.serviceAccountName=spark \ --conf spark.kubernetes.container.image=myrepo/spark-ozone \ --conf spark.kubernetes.container.image.pullPolicy=Always \ - --jars /opt/hadoop-ozone-filesystem-hadoop2.jar \ + --jars /opt/ozone-filesystem-hadoop2.jar \ local:///opt/spark/examples/jars/spark-examples_2.11-2.4.0.jar \ o3fs://test.s3v.ozone-om-0.ozone-om:9862/alice.txt ``` diff --git a/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.zh.md b/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.zh.md index 1a1589ca3b61..5f1e9190d533 100644 --- a/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.zh.md +++ b/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.zh.md @@ -77,7 +77,7 @@ kubectl cp om-0:/opt/hadoop/etc/hadoop/ozone-site.xml . ``` -kubectl cp om-0:/opt/hadoop/share/ozone/lib/hadoop-ozone-filesystem-hadoop2-VERSION.jar hadoop-ozone-filesystem-hadoop2.jar +kubectl cp om-0:/opt/hadoop/share/ozone/lib/ozone-filesystem-hadoop2-VERSION.jar ozone-filesystem-hadoop2.jar ``` @@ -88,7 +88,7 @@ ADD core-site.xml /opt/hadoop/conf/core-site.xml ADD ozone-site.xml /opt/hadoop/conf/ozone-site.xml ENV HADOOP_CONF_DIR=/opt/hadoop/conf ENV SPARK_EXTRA_CLASSPATH=/opt/hadoop/conf -ADD hadoop-ozone-filesystem-hadoop2.jar /opt/hadoop-ozone-filesystem-hadoop2.jar +ADD ozone-filesystem-hadoop2.jar /opt/ozone-filesystem-hadoop2.jar ``` ```bash @@ -140,7 +140,7 @@ bin/spark-submit \ --conf spark.kubernetes.authenticate.driver.serviceAccountName=spark \ --conf spark.kubernetes.container.image=myrepo/spark-ozone \ --conf spark.kubernetes.container.image.pullPolicy=Always \ - --jars /opt/hadoop-ozone-filesystem-hadoop2.jar \ + --jars /opt/ozone-filesystem-hadoop2.jar \ local:///opt/spark/examples/jars/spark-examples_2.11-2.4.0.jar \ o3fs://test.s3v.ozone-om-0.ozone-om:9862/alice.txt ``` diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-config index b1b3238fb0bd..3a6bdc5f26ce 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-config @@ -16,9 +16,9 @@ CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs CORE-SITE.xml_fs.AbstractFileSystem.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzFs -MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop2-@project.version@.jar +MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop2-@project.version@.jar -HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop2-@project.version@.jar +HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop2-@project.version@.jar OZONE_CLASSPATH= no_proxy=om,scm,s3g,recon,kdc,localhost,127.0.0.1 diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-config index 38abf19b353d..d2fa4923da2f 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-config @@ -16,9 +16,9 @@ CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs CORE-SITE.xml_fs.AbstractFileSystem.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzFs -MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop3-@project.version@.jar +MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-@project.version@.jar -HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop3-@project.version@.jar +HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-@project.version@.jar OZONE_CLASSPATH= no_proxy=om,scm,s3g,recon,kdc,localhost,127.0.0.1 diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-config index 38abf19b353d..d2fa4923da2f 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-config @@ -16,9 +16,9 @@ CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs CORE-SITE.xml_fs.AbstractFileSystem.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzFs -MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop3-@project.version@.jar +MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-@project.version@.jar -HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop3-@project.version@.jar +HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-@project.version@.jar OZONE_CLASSPATH= no_proxy=om,scm,s3g,recon,kdc,localhost,127.0.0.1 diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md index 63a09a9221a4..ec5f512b624c 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md @@ -47,7 +47,7 @@ docker-compose exec rm bash kinit -kt /etc/security/keytabs/hadoop.keytab hadoop/rm@EXAMPLE.COM export HADOOP_MAPRED_HOME=/opt/hadoop/share/hadoop/mapreduce -export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:/opt/hadoop/share/hadoop/mapreduce/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current-@project.version@.jar +export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:/opt/hadoop/share/hadoop/mapreduce/*:/opt/ozone/share/ozone/lib/ozone-filesystem-lib-current-@project.version@.jar hadoop fs -mkdir /user hadoop fs -mkdir /user/hadoop diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config index 2f201478e7fa..15382945f076 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config @@ -78,7 +78,7 @@ MAPRED-SITE.XML_mapreduce.reduce.env=HADOOP_MAPRED_HOME=$HADOOP_HOME MAPRED-SITE.XML_mapreduce.map.memory.mb=2048 MAPRED-SITE.XML_mapreduce.reduce.memory.mb=2048 #MAPRED-SITE.XML_mapred.child.java.opts=-Xmx2048 -MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop3-@project.version@.jar +MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-@project.version@.jar YARN-SITE.XML_yarn.app.mapreduce.am.staging-dir=/user YARN-SITE.XML_yarn.timeline-service.enabled=true @@ -139,7 +139,7 @@ JSVC_HOME=/usr/bin SLEEP_SECONDS=5 KERBEROS_ENABLED=true -HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop3-@project.version@.jar +HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-@project.version@.jar OZONE_CLASSPATH= OZONE_CONF_DIR=/etc/hadoop OZONE_LOG_DIR=/var/log/hadoop diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index 7c8de34dca2d..24ba960cb831 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -395,7 +395,7 @@ BSD 2-Clause -------------------------------------------------------------------------------- -hadoop-hdds-server-scm, hadoop-ozone-ozone-manager, hadoop-ozone-s3gateway and hadoop-hdds-server-framework +hdds-server-scm, ozone-ozone-manager, ozone-s3gateway and hdds-server-framework contains the source of the following javascript/css components (See licenses/ for text of these licenses): Apache Software Foundation License 2.0 diff --git a/hadoop-ozone/dist/src/main/smoketest/cli/classpath.robot b/hadoop-ozone/dist/src/main/smoketest/cli/classpath.robot index 506aa031787a..9578d29621c0 100644 --- a/hadoop-ozone/dist/src/main/smoketest/cli/classpath.robot +++ b/hadoop-ozone/dist/src/main/smoketest/cli/classpath.robot @@ -26,21 +26,21 @@ Ignores HADOOP_CLASSPATH if OZONE_CLASSPATH is set [setup] Create File %{HDDS_LIB_JARS_DIR}/hadoop-classpath.jar Set Environment Variable HADOOP_CLASSPATH %{HDDS_LIB_JARS_DIR}/hadoop-classpath.jar Set Environment Variable OZONE_CLASSPATH ${EMPTY} - ${output} = Execute ozone classpath hadoop-ozone-insight - Should Contain ${output} hadoop-hdds-interface + ${output} = Execute ozone classpath ozone-insight + Should Contain ${output} hdds-interface Should Not Contain ${output} %{HDDS_LIB_JARS_DIR}/hadoop-classpath.jar [teardown] Remove File %{HDDS_LIB_JARS_DIR}/hadoop-classpath.jar Picks up items from OZONE_CLASSPATH [setup] Create File %{HDDS_LIB_JARS_DIR}/ozone-classpath.jar Set Environment Variable OZONE_CLASSPATH %{HDDS_LIB_JARS_DIR}/ozone-classpath.jar - ${output} = Execute ozone classpath hadoop-ozone-insight + ${output} = Execute ozone classpath ozone-insight Should Contain ${output} %{HDDS_LIB_JARS_DIR}/ozone-classpath.jar [teardown] Remove File %{HDDS_LIB_JARS_DIR}/ozone-classpath.jar Adds optional dir entries - [setup] Create File %{HDDS_LIB_JARS_DIR}/hadoop-ozone-insight/optional.jar + [setup] Create File %{HDDS_LIB_JARS_DIR}/ozone-insight/optional.jar Set Environment Variable OZONE_CLASSPATH ${EMPTY} - ${output} = Execute ozone classpath hadoop-ozone-insight - Should Contain ${output} %{HDDS_LIB_JARS_DIR}/hadoop-ozone-insight/optional.jar - [teardown] Remove File %{HDDS_LIB_JARS_DIR}/hadoop-ozone-insight/optional.jar + ${output} = Execute ozone classpath ozone-insight + Should Contain ${output} %{HDDS_LIB_JARS_DIR}/ozone-insight/optional.jar + [teardown] Remove File %{HDDS_LIB_JARS_DIR}/ozone-insight/optional.jar diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone b/hadoop-ozone/dist/src/shell/ozone/ozone index f5c14230f18e..4ef3340964a3 100755 --- a/hadoop-ozone/dist/src/shell/ozone/ozone +++ b/hadoop-ozone/dist/src/shell/ozone/ozone @@ -89,7 +89,7 @@ function ozonecmd_case case ${subcmd} in auditparser) OZONE_CLASSNAME=org.apache.hadoop.ozone.audit.parser.AuditParser - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" + OZONE_RUN_ARTIFACT_NAME="ozone-tools" ;; classpath) if [[ "$#" -gt 0 ]]; then @@ -114,7 +114,7 @@ function ozonecmd_case OZONE_DATANODE_OPTS="-Dlog4j.configurationFile=${OZONE_CONF_DIR}/dn-audit-log4j2.properties ${OZONE_DATANODE_OPTS}" OZONE_DATANODE_OPTS="-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector ${OZONE_DATANODE_OPTS}" OZONE_CLASSNAME=org.apache.hadoop.ozone.HddsDatanodeService - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-datanode" + OZONE_RUN_ARTIFACT_NAME="ozone-datanode" ;; envvars) echo "JAVA_HOME='${JAVA_HOME}'" @@ -132,10 +132,10 @@ function ozonecmd_case OZONE_CLASSNAME=org.apache.hadoop.ozone.freon.Freon OZONE_FREON_OPTS="${OZONE_FREON_OPTS}" OZONE_OPTS="${OZONE_OPTS} ${OZONE_FREON_OPTS}" - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" + OZONE_RUN_ARTIFACT_NAME="ozone-tools" ;; genesis) - ARTIFACT_LIB_DIR="${OZONE_HOME}/share/ozone/lib/hadoop-ozone-tools" + ARTIFACT_LIB_DIR="${OZONE_HOME}/share/ozone/lib/ozone-tools" mkdir -p "$ARTIFACT_LIB_DIR" if [[ ! -f "$ARTIFACT_LIB_DIR/jmh-core-1.23.jar" ]]; then echo "jmh-core jar is missing from $ARTIFACT_LIB_DIR, trying to download from maven central (License: GPL + classpath exception)" @@ -148,11 +148,11 @@ function ozonecmd_case fi OZONE_CLASSNAME=org.apache.hadoop.ozone.genesis.Genesis - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" + OZONE_RUN_ARTIFACT_NAME="ozone-tools" ;; getconf) OZONE_CLASSNAME=org.apache.hadoop.ozone.conf.OzoneGetConf; - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" + OZONE_RUN_ARTIFACT_NAME="ozone-tools" ;; om) OZONE_SUBCMD_SUPPORTDAEMONIZATION="true" @@ -161,18 +161,18 @@ function ozonecmd_case OZONE_OM_OPTS="${RATIS_OPTS} ${OZONE_OM_OPTS}" OZONE_OM_OPTS="${OZONE_OM_OPTS} -Dlog4j.configurationFile=${OZONE_CONF_DIR}/om-audit-log4j2.properties" OZONE_OM_OPTS="-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector ${OZONE_OM_OPTS}" - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-ozone-manager" + OZONE_RUN_ARTIFACT_NAME="ozone-ozone-manager" ;; sh | shell) OZONE_CLASSNAME=org.apache.hadoop.ozone.shell.OzoneShell ozone_deprecate_envvar HDFS_OM_SH_OPTS OZONE_SH_OPTS OZONE_SH_OPTS="${OZONE_SH_OPTS} -Dhadoop.log.file=ozone-shell.log -Dlog4j.configuration=file:${ozone_shell_log4j}" OZONE_OPTS="${OZONE_OPTS} ${OZONE_SH_OPTS}" - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" + OZONE_RUN_ARTIFACT_NAME="ozone-tools" ;; s3) OZONE_CLASSNAME=org.apache.hadoop.ozone.shell.s3.S3Shell - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" + OZONE_RUN_ARTIFACT_NAME="ozone-tools" ;; scm) OZONE_SUBCMD_SUPPORTDAEMONIZATION="true" @@ -181,50 +181,50 @@ function ozonecmd_case OZONE_SCM_OPTS="${RATIS_OPTS} ${OZONE_SCM_OPTS}" OZONE_SCM_OPTS="${OZONE_SCM_OPTS} -Dlog4j.configurationFile=${OZONE_CONF_DIR}/scm-audit-log4j2.properties" OZONE_SCM_OPTS="-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector ${OZONE_SCM_OPTS}" - OZONE_RUN_ARTIFACT_NAME="hadoop-hdds-server-scm" + OZONE_RUN_ARTIFACT_NAME="hdds-server-scm" ;; s3g) OZONE_SUBCMD_SUPPORTDAEMONIZATION="true" OZONE_CLASSNAME='org.apache.hadoop.ozone.s3.Gateway' - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-s3gateway" + OZONE_RUN_ARTIFACT_NAME="ozone-s3gateway" ;; csi) OZONE_SUBCMD_SUPPORTDAEMONIZATION="true" OZONE_CLASSNAME='org.apache.hadoop.ozone.csi.CsiServer' - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-csi" + OZONE_RUN_ARTIFACT_NAME="ozone-csi" ;; recon) OZONE_SUBCMD_SUPPORTDAEMONIZATION="true" OZONE_CLASSNAME='org.apache.hadoop.ozone.recon.ReconServer' - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-recon" + OZONE_RUN_ARTIFACT_NAME="ozone-recon" ;; fs) OZONE_CLASSNAME=org.apache.hadoop.fs.ozone.OzoneFsShell - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" + OZONE_RUN_ARTIFACT_NAME="ozone-tools" ;; insight) OZONE_CLASSNAME=org.apache.hadoop.ozone.insight.Insight - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-insight" + OZONE_RUN_ARTIFACT_NAME="ozone-insight" ;; version) OZONE_CLASSNAME=org.apache.hadoop.ozone.util.OzoneVersionInfo - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" + OZONE_RUN_ARTIFACT_NAME="ozone-tools" ;; genconf) OZONE_CLASSNAME=org.apache.hadoop.ozone.genconf.GenerateOzoneRequiredConfigurations - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" + OZONE_RUN_ARTIFACT_NAME="ozone-tools" ;; dtutil) OZONE_CLASSNAME=org.apache.hadoop.security.token.DtUtilShell - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" + OZONE_RUN_ARTIFACT_NAME="ozone-tools" ;; admin) OZONE_CLASSNAME=org.apache.hadoop.hdds.cli.OzoneAdmin - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" + OZONE_RUN_ARTIFACT_NAME="ozone-tools" ;; debug) OZONE_CLASSNAME=org.apache.hadoop.ozone.debug.OzoneDebug - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" + OZONE_RUN_ARTIFACT_NAME="ozone-tools" ;; *) OZONE_CLASSNAME="${subcmd}" diff --git a/hadoop-ozone/native-client/README.md b/hadoop-ozone/native-client/README.md index 04bb6facf20b..d4482d916443 100644 --- a/hadoop-ozone/native-client/README.md +++ b/hadoop-ozone/native-client/README.md @@ -73,9 +73,9 @@ For example CLASSPATH is not set. CLASSPATH can be set using the following command: - export CLASSPATH=$({OZONE_HOME}/hadoop-ozone/dist/target/ozone-0.5.0-SNAPSHOT/bin/ozone classpath hadoop-ozone-filesystem --glob) + export CLASSPATH=$({OZONE_HOME}/hadoop-ozone/dist/target/ozone-0.5.0-SNAPSHOT/bin/ozone classpath ozone-filesystem --glob) - export CLASSPATH=$CLASSPATH:{OZONE_HOME}/hadoop-ozone/dist/target/ozone-0.5.0-SNAPSHOT/share/ozone/lib/hadoop-ozone-filesystem-0.5.0-SNAPSHOT.jar + export CLASSPATH=$CLASSPATH:{OZONE_HOME}/hadoop-ozone/dist/target/ozone-0.5.0-SNAPSHOT/share/ozone/lib/ozone-filesystem-0.5.0-SNAPSHOT.jar LD_LIBRARY_PATH is not set. LD_LIBRARY_PATH can be set using the following command: From 57157df34a0cd02bf14d5f66ecc8638b8902ad29 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 23 Mar 2021 19:37:37 +0100 Subject: [PATCH 07/15] Fix ozone-manager artifact name --- hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 2 +- hadoop-ozone/dist/src/shell/ozone/ozone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index 24ba960cb831..a2d6dc412d52 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -395,7 +395,7 @@ BSD 2-Clause -------------------------------------------------------------------------------- -hdds-server-scm, ozone-ozone-manager, ozone-s3gateway and hdds-server-framework +hdds-server-scm, ozone-manager, ozone-s3gateway and hdds-server-framework contains the source of the following javascript/css components (See licenses/ for text of these licenses): Apache Software Foundation License 2.0 diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone b/hadoop-ozone/dist/src/shell/ozone/ozone index 4ef3340964a3..2d72a5cebf87 100755 --- a/hadoop-ozone/dist/src/shell/ozone/ozone +++ b/hadoop-ozone/dist/src/shell/ozone/ozone @@ -161,7 +161,7 @@ function ozonecmd_case OZONE_OM_OPTS="${RATIS_OPTS} ${OZONE_OM_OPTS}" OZONE_OM_OPTS="${OZONE_OM_OPTS} -Dlog4j.configurationFile=${OZONE_CONF_DIR}/om-audit-log4j2.properties" OZONE_OM_OPTS="-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector ${OZONE_OM_OPTS}" - OZONE_RUN_ARTIFACT_NAME="ozone-ozone-manager" + OZONE_RUN_ARTIFACT_NAME="ozone-manager" ;; sh | shell) OZONE_CLASSNAME=org.apache.hadoop.ozone.shell.OzoneShell From 98b6a07c2b5f4af2b003f68f2b4e5d2f6a27d37c Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 23 Mar 2021 19:38:36 +0100 Subject: [PATCH 08/15] Fix IDEA run configs --- .../dev-support/intellij/runConfigurations/CsiServer.xml | 4 ++-- .../dev-support/intellij/runConfigurations/Datanode1.xml | 2 +- .../dev-support/intellij/runConfigurations/Datanode2.xml | 2 +- .../dev-support/intellij/runConfigurations/Datanode3.xml | 2 +- .../intellij/runConfigurations/FreonStandalone.xml | 4 ++-- .../dev-support/intellij/runConfigurations/OzoneManager.xml | 2 +- .../intellij/runConfigurations/OzoneManagerInit.xml | 2 +- .../dev-support/intellij/runConfigurations/OzoneShell.xml | 2 +- hadoop-ozone/dev-support/intellij/runConfigurations/Recon.xml | 4 ++-- .../dev-support/intellij/runConfigurations/S3Gateway.xml | 4 ++-- .../intellij/runConfigurations/StorageContainerManager.xml | 2 +- .../runConfigurations/StorageContainerManagerInit.xml | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/CsiServer.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/CsiServer.xml index d3bb7ab8f56d..3c153386e2a3 100644 --- a/hadoop-ozone/dev-support/intellij/runConfigurations/CsiServer.xml +++ b/hadoop-ozone/dev-support/intellij/runConfigurations/CsiServer.xml @@ -17,7 +17,7 @@ - \ No newline at end of file + diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode1.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode1.xml index e3a9ec9a8d8a..16580fa82013 100644 --- a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode1.xml +++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode1.xml @@ -17,7 +17,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml index 1a185787b99f..9183e08f9461 100644 --- a/hadoop-hdds/config/pom.xml +++ b/hadoop-hdds/config/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -38,7 +38,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> slf4j-api - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index ab9f488233da..e81a6957c332 100644 --- a/hadoop-hdds/container-service/pom.xml +++ b/hadoop-hdds/container-service/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -30,11 +30,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test @@ -43,17 +43,17 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> commons-compress - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-hdds-client @@ -77,7 +77,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs provided @@ -98,7 +98,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test @@ -132,14 +132,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs ${project.build.outputDirectory}/webapps/hddsDatanode docs/**/*.* diff --git a/hadoop-hdds/docs/pom.xml b/hadoop-hdds/docs/pom.xml index 3a6aea0aa6c0..f4a93df9eb92 100644 --- a/hadoop-hdds/docs/pom.xml +++ b/hadoop-hdds/docs/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index a34ece50842a..7e5e80574803 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -31,24 +31,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-server - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-admin - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server @@ -107,7 +107,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml index d135b20790af..ecbb9847d729 100644 --- a/hadoop-hdds/hadoop-dependency-client/pom.xml +++ b/hadoop-hdds/hadoop-dependency-client/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml index 708bdb3153c4..34b1283bfe81 100644 --- a/hadoop-hdds/hadoop-dependency-server/pom.xml +++ b/hadoop-hdds/hadoop-dependency-server/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT diff --git a/hadoop-hdds/hadoop-dependency-test/pom.xml b/hadoop-hdds/hadoop-dependency-test/pom.xml index 6fd90a94b959..b681e2a93caf 100644 --- a/hadoop-hdds/hadoop-dependency-test/pom.xml +++ b/hadoop-hdds/hadoop-dependency-test/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT diff --git a/hadoop-hdds/interface-admin/pom.xml b/hadoop-hdds/interface-admin/pom.xml index c509ee187654..1d16472a500d 100644 --- a/hadoop-hdds/interface-admin/pom.xml +++ b/hadoop-hdds/interface-admin/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -36,7 +36,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client diff --git a/hadoop-hdds/interface-client/pom.xml b/hadoop-hdds/interface-client/pom.xml index eca70678a947..a999c544b0d9 100644 --- a/hadoop-hdds/interface-client/pom.xml +++ b/hadoop-hdds/interface-client/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT diff --git a/hadoop-hdds/interface-server/pom.xml b/hadoop-hdds/interface-server/pom.xml index bdac4bbf91a0..608f09295833 100644 --- a/hadoop-hdds/interface-server/pom.xml +++ b/hadoop-hdds/interface-server/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -37,7 +37,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index 3a81a953931a..ead65317f630 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -18,7 +18,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-main-ozone 1.1.0-SNAPSHOT @@ -64,99 +64,99 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-common ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-client ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test ${hdds.version} test - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-server ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-admin ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-client ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-config ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils ${hdds.version} test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common ${hdds.version} test-jar @@ -164,7 +164,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service ${hdds.version} test-jar @@ -172,7 +172,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm test-jar ${hdds.version} diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml index 4e1d48199ff9..10a13e6f53a3 100644 --- a/hadoop-hdds/server-scm/pom.xml +++ b/hadoop-hdds/server-scm/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -30,35 +30,35 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service - org.apache.hadoop + org.apache.ozone hadoop-hdds-client - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs provided @@ -85,13 +85,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service test test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test @@ -131,7 +131,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> bcprov-jdk15on - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test @@ -151,14 +151,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs ${project.build.outputDirectory}/webapps/scm diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml index 5151659b59ff..a4ca79c9b1bb 100644 --- a/hadoop-hdds/test-utils/pom.xml +++ b/hadoop-hdds/test-utils/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml index 904c14b5a9fb..007a76cf5b8d 100644 --- a/hadoop-hdds/tools/pom.xml +++ b/hadoop-hdds/tools/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-hdds 1.1.0-SNAPSHOT @@ -31,24 +31,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-hdds-client - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml index 794bd476cd22..05dfd6f7543c 100644 --- a/hadoop-ozone/client/pom.xml +++ b/hadoop-ozone/client/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -30,12 +30,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-ozone-common diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 1c2cb3f08759..6a43770a91f1 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -35,20 +35,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> commons-compress - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-client - org.apache.hadoop + org.apache.ozone hadoop-ozone-interface-client @@ -57,7 +57,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index 3262a65ecd88..ba109a2db278 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -18,7 +18,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -41,7 +41,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-config @@ -104,7 +104,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> ${grpc-compile.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-client diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml index 77c66bd4fb88..a7229c1f6d35 100644 --- a/hadoop-ozone/datanode/pom.xml +++ b/hadoop-ozone/datanode/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -32,7 +32,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server compile @@ -43,7 +43,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml index 8cc3f1376a18..3b08fedca809 100644 --- a/hadoop-ozone/dist/pom.xml +++ b/hadoop-ozone/dist/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -179,47 +179,47 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service - org.apache.hadoop + org.apache.ozone hadoop-ozone-s3gateway - org.apache.hadoop + org.apache.ozone hadoop-ozone-csi - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager - org.apache.hadoop + org.apache.ozone hadoop-ozone-tools - org.apache.hadoop + org.apache.ozone hadoop-ozone-common - org.apache.hadoop + org.apache.ozone hadoop-ozone-datanode - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs - org.apache.hadoop + org.apache.ozone hadoop-ozone-insight @@ -233,11 +233,11 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-hadoop2 - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-hadoop3 @@ -252,7 +252,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-recon @@ -300,7 +300,7 @@ jacoco-core.jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils 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 2137416d0fcc..fcb9e887b3e8 100644 --- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml +++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml @@ -19,7 +19,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 hadoop-ozone-fault-injection-test - org.apache.hadoop + org.apache.ozone 1.1.0-SNAPSHOT 1.1.0-SNAPSHOT @@ -34,22 +34,22 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem - org.apache.hadoop + org.apache.ozone hadoop-ozone-integration-test test test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/fault-injection-test/network-tests/pom.xml b/hadoop-ozone/fault-injection-test/network-tests/pom.xml index b18702d02339..3ef72ac9c12c 100644 --- a/hadoop-ozone/fault-injection-test/network-tests/pom.xml +++ b/hadoop-ozone/fault-injection-test/network-tests/pom.xml @@ -18,7 +18,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone-fault-injection-test 1.1.0-SNAPSHOT diff --git a/hadoop-ozone/fault-injection-test/pom.xml b/hadoop-ozone/fault-injection-test/pom.xml index 4910f39d3930..b54845129b5f 100644 --- a/hadoop-ozone/fault-injection-test/pom.xml +++ b/hadoop-ozone/fault-injection-test/pom.xml @@ -18,7 +18,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml index 5cfeaaff1b80..23a31456d282 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -30,37 +30,37 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager - org.apache.hadoop + org.apache.ozone hadoop-ozone-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm - org.apache.hadoop + org.apache.ozone hadoop-ozone-client - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools @@ -90,7 +90,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index b3c263687735..263fde776b0c 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -31,20 +31,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-ozone-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager @@ -54,31 +54,31 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-ozone-s3gateway - org.apache.hadoop + org.apache.ozone hadoop-ozone-csi - org.apache.hadoop + org.apache.ozone hadoop-ozone-recon - org.apache.hadoop + org.apache.ozone hadoop-ozone-client - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem - org.apache.hadoop + org.apache.ozone hadoop-ozone-tools - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools @@ -87,13 +87,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager test test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test @@ -151,19 +151,19 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm test test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service test test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml index a2827b89cf43..c44e0787fe94 100644 --- a/hadoop-ozone/interface-client/pom.xml +++ b/hadoop-ozone/interface-client/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -34,7 +34,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> protobuf-java - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml index 4d0daeccdb8f..97968caa16fb 100644 --- a/hadoop-ozone/interface-storage/pom.xml +++ b/hadoop-ozone/interface-storage/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-common @@ -40,29 +40,29 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-interface-client - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm test-jar test - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index 7c3edcb85af0..3da53a0400f4 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -31,43 +31,43 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-ozone-common - org.apache.hadoop + org.apache.ozone hadoop-ozone-client - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs provided - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client - org.apache.hadoop + org.apache.ozone hadoop-ozone-interface-storage - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server @@ -87,18 +87,18 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> provided - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm test test-jar @@ -139,14 +139,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs ${project.build.outputDirectory}/webapps/ozoneManager docs/**/*.* diff --git a/hadoop-ozone/ozonefs-common/pom.xml b/hadoop-ozone/ozonefs-common/pom.xml index 47b2f660f616..8f26d9cca938 100644 --- a/hadoop-ozone/ozonefs-common/pom.xml +++ b/hadoop-ozone/ozonefs-common/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -38,7 +38,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-client @@ -47,39 +47,39 @@ provided - org.apache.hadoop + org.apache.ozone hadoop-ozone-client - org.apache.hadoop + org.apache.ozone hadoop-hdds-common - org.apache.hadoop + org.apache.ozone hadoop-ozone-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework test - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager test - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service test diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml index 4e7819ecd950..3af1d87151e8 100644 --- a/hadoop-ozone/ozonefs-hadoop2/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-shaded true @@ -39,7 +39,7 @@ hadoop-common - org.apache.hadoop + org.apache.ozone hadoop-hdfs-client @@ -93,7 +93,7 @@ META-INF/versions/**/*.* - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-shaded ${project.version} diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml index 7288eb9f6eea..43df463df9a0 100644 --- a/hadoop-ozone/ozonefs-hadoop3/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-shaded true @@ -76,7 +76,7 @@ META-INF/versions/**/*.* - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-shaded ${project.version} diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml index 62664ffaa8a9..71263b4063c7 100644 --- a/hadoop-ozone/ozonefs-shaded/pom.xml +++ b/hadoop-ozone/ozonefs-shaded/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -32,7 +32,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-common diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml index ef88a76e98ce..833ee1ce302d 100644 --- a/hadoop-ozone/ozonefs/pom.xml +++ b/hadoop-ozone/ozonefs/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -77,11 +77,11 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-common - org.apache.hadoop + org.apache.ozone hadoop-ozone-client diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 94f47e8dbdf3..92e92d3012e1 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -14,7 +14,7 @@ --> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-main-ozone 1.1.0-SNAPSHOT @@ -58,179 +58,179 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-common ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-client ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-interface-client ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-interface-storage ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-s3gateway ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-csi ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-datanode ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-tools ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-shaded ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-common ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-hadoop3 ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem-hadoop2 ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-config ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-interface-client ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils ${hdds.version} test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-client ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test ${hdds.version} test - org.apache.hadoop + org.apache.ozone hadoop-hdds-common ${hdds.version} test-jar test - org.apache.hadoop + org.apache.ozone hadoop-ozone-integration-test ${ozone.version} test-jar - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager ${ozone.version} test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-common ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-client ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-insight ${hdds.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-recon ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-hdds-container-service ${hdds.version} test-jar - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm test-jar ${hdds.version} diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml index 4660abe10e0b..7502be611840 100644 --- a/hadoop-ozone/recon-codegen/pom.xml +++ b/hadoop-ozone/recon-codegen/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> hadoop-ozone - org.apache.hadoop + org.apache.ozone 1.1.0-SNAPSHOT 4.0.0 @@ -25,7 +25,7 @@ Apache Ozone Recon CodeGen - org.apache.hadoop + org.apache.ozone hadoop-ozone-common diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index 4c55e309aa16..72a3de7b19f9 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -16,7 +16,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -174,7 +174,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-common @@ -192,12 +192,12 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-reconcodegen ${ozone.version} - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager @@ -207,13 +207,13 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools @@ -223,7 +223,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm @@ -263,7 +263,7 @@ jersey-hk2 - org.apache.hadoop + org.apache.ozone hadoop-hdds-common test-jar test @@ -279,7 +279,7 @@ test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index 88bb0b58cc8d..06dfde535eac 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -32,17 +32,17 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-common compile - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework @@ -91,7 +91,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server @@ -113,7 +113,7 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test @@ -160,11 +160,11 @@ - org.apache.hadoop + org.apache.ozone hadoop-ozone-client - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs provided @@ -200,14 +200,14 @@ - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* - org.apache.hadoop + org.apache.ozone hadoop-hdds-docs ${project.build.outputDirectory}/webapps/static diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 94b0a095cdc0..4632684019bd 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -18,7 +18,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-ozone 1.1.0-SNAPSHOT @@ -30,41 +30,41 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-ozone-ozone-manager - org.apache.hadoop + org.apache.ozone hadoop-ozone-common - org.apache.hadoop + org.apache.ozone hadoop-hdds-test-utils test - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-scm - org.apache.hadoop + org.apache.ozone hadoop-hdds-tools - org.apache.hadoop + org.apache.ozone hadoop-ozone-client - org.apache.hadoop + org.apache.ozone hadoop-ozone-filesystem - org.apache.hadoop + org.apache.ozone hadoop-hdds-server-framework - org.apache.hadoop + org.apache.ozone hadoop-ozone-recon @@ -74,7 +74,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-server @@ -130,7 +130,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop + org.apache.ozone hadoop-hdds-hadoop-dependency-test test diff --git a/pom.xml b/pom.xml index fc9c13dea910..7fc4eb16f5fa 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop + org.apache.ozone hadoop-main-ozone 1.1.0-SNAPSHOT Apache Ozone Main From 43463264f8c3d27be8b95716f0d7a5d6735d4142 Mon Sep 17 00:00:00 2001 From: Sammi Chen Date: Tue, 23 Mar 2021 21:05:59 +0800 Subject: [PATCH 10/15] HDDS-5008. Remove hadoop from ozone module artifactId. --- hadoop-hdds/client/pom.xml | 12 ++-- hadoop-hdds/common/pom.xml | 12 ++-- hadoop-hdds/config/pom.xml | 6 +- hadoop-hdds/container-service/pom.xml | 22 +++--- hadoop-hdds/docs/pom.xml | 4 +- hadoop-hdds/framework/pom.xml | 16 ++--- hadoop-hdds/hadoop-dependency-client/pom.xml | 4 +- hadoop-hdds/hadoop-dependency-server/pom.xml | 4 +- hadoop-hdds/hadoop-dependency-test/pom.xml | 4 +- hadoop-hdds/interface-admin/pom.xml | 6 +- hadoop-hdds/interface-client/pom.xml | 4 +- hadoop-hdds/interface-server/pom.xml | 6 +- hadoop-hdds/pom.xml | 40 +++++------ hadoop-hdds/server-scm/pom.xml | 30 ++++---- hadoop-hdds/test-utils/pom.xml | 4 +- hadoop-hdds/tools/pom.xml | 14 ++-- hadoop-ozone/client/pom.xml | 8 +-- hadoop-ozone/common/pom.xml | 14 ++-- hadoop-ozone/csi/pom.xml | 8 +-- hadoop-ozone/datanode/pom.xml | 8 +-- .../dev-support/checks/integration.sh | 2 +- hadoop-ozone/dev-support/checks/unit.sh | 2 +- .../dist/dev-support/bin/dist-tar-stitching | 6 +- hadoop-ozone/dist/pom.xml | 40 +++++------ .../mini-chaos-tests/pom.xml | 10 +-- .../network-tests/pom.xml | 4 +- hadoop-ozone/fault-injection-test/pom.xml | 4 +- hadoop-ozone/insight/pom.xml | 22 +++--- hadoop-ozone/integration-test/pom.xml | 36 +++++----- hadoop-ozone/interface-client/pom.xml | 6 +- hadoop-ozone/interface-storage/pom.xml | 16 ++--- hadoop-ozone/ozone-manager/pom.xml | 32 ++++----- hadoop-ozone/ozonefs-common/pom.xml | 22 +++--- hadoop-ozone/ozonefs-hadoop2/pom.xml | 8 +-- hadoop-ozone/ozonefs-hadoop3/pom.xml | 8 +-- hadoop-ozone/ozonefs-shaded/pom.xml | 6 +- hadoop-ozone/ozonefs/pom.xml | 8 +-- hadoop-ozone/pom.xml | 72 +++++++++---------- hadoop-ozone/recon-codegen/pom.xml | 6 +- hadoop-ozone/recon/pom.xml | 20 +++--- hadoop-ozone/s3gateway/pom.xml | 22 +++--- hadoop-ozone/tools/pom.xml | 26 +++---- pom.xml | 4 +- 43 files changed, 304 insertions(+), 304 deletions(-) diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml index 3fae2eb50878..32296d4940a6 100644 --- a/hadoop-hdds/client/pom.xml +++ b/hadoop-hdds/client/pom.xml @@ -19,11 +19,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-client + hdds-client 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Client Library Apache Ozone HDDS Client @@ -32,16 +32,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test @@ -53,7 +53,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index aeae7e8a864c..0b59fd1d745f 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-common + hdds-common 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Common Apache Ozone HDDS Common @@ -31,7 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-client + hdds-hadoop-dependency-client info.picocli @@ -68,11 +68,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-config + hdds-config org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test @@ -190,7 +190,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client org.hamcrest diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml index 9183e08f9461..98266a60aa1f 100644 --- a/hadoop-hdds/config/pom.xml +++ b/hadoop-hdds/config/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-config + hdds-config 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Config Tools Apache Ozone HDDS Config @@ -39,7 +39,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index e81a6957c332..0c6175f97b30 100644 --- a/hadoop-hdds/container-service/pom.xml +++ b/hadoop-hdds/container-service/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-container-service + hdds-container-service 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Container Service Apache Ozone HDDS Container Service @@ -31,11 +31,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test @@ -44,17 +44,17 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-hdds-client + hdds-client commons-codec @@ -78,7 +78,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-docs + hdds-docs provided @@ -99,7 +99,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test @@ -133,14 +133,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* org.apache.ozone - hadoop-hdds-docs + hdds-docs ${project.build.outputDirectory}/webapps/hddsDatanode docs/**/*.* diff --git a/hadoop-hdds/docs/pom.xml b/hadoop-hdds/docs/pom.xml index f4a93df9eb92..cd1536ee7ad7 100644 --- a/hadoop-hdds/docs/pom.xml +++ b/hadoop-hdds/docs/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-docs + hdds-docs 1.1.0-SNAPSHOT Apache Ozone/HDDS Documentation Apache Ozone/HDDS Documentation diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index 7e5e80574803..f11a1cc0187f 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-server-framework + hdds-server-framework 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Server Framework @@ -32,24 +32,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-interface-server + hdds-interface-server org.apache.ozone - hadoop-hdds-interface-admin + hdds-interface-admin org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server org.eclipse.jetty @@ -108,7 +108,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml index ecbb9847d729..76af0eb8af52 100644 --- a/hadoop-hdds/hadoop-dependency-client/pom.xml +++ b/hadoop-hdds/hadoop-dependency-client/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-hadoop-dependency-client + hdds-hadoop-dependency-client 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Hadoop client dependencies diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml index 34b1283bfe81..1d1b8e52d6a3 100644 --- a/hadoop-hdds/hadoop-dependency-server/pom.xml +++ b/hadoop-hdds/hadoop-dependency-server/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Hadoop server dependencies diff --git a/hadoop-hdds/hadoop-dependency-test/pom.xml b/hadoop-hdds/hadoop-dependency-test/pom.xml index b681e2a93caf..fcb466ae36d0 100644 --- a/hadoop-hdds/hadoop-dependency-test/pom.xml +++ b/hadoop-hdds/hadoop-dependency-test/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Hadoop test dependencies diff --git a/hadoop-hdds/interface-admin/pom.xml b/hadoop-hdds/interface-admin/pom.xml index 1d16472a500d..cb62f70afbd0 100644 --- a/hadoop-hdds/interface-admin/pom.xml +++ b/hadoop-hdds/interface-admin/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-interface-admin + hdds-interface-admin 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Admin interface @@ -37,7 +37,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client diff --git a/hadoop-hdds/interface-client/pom.xml b/hadoop-hdds/interface-client/pom.xml index a999c544b0d9..35808151986e 100644 --- a/hadoop-hdds/interface-client/pom.xml +++ b/hadoop-hdds/interface-client/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-interface-client + hdds-interface-client 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Client interface diff --git a/hadoop-hdds/interface-server/pom.xml b/hadoop-hdds/interface-server/pom.xml index 608f09295833..ee9d5d078d22 100644 --- a/hadoop-hdds/interface-server/pom.xml +++ b/hadoop-hdds/interface-server/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-interface-server + hdds-interface-server 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Server interface @@ -38,7 +38,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index ead65317f630..7a5f472c923c 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -19,11 +19,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-main-ozone + ozone-main 1.1.0-SNAPSHOT - hadoop-hdds + hdds 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Project Apache Ozone HDDS @@ -65,99 +65,99 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-common + hdds-common ${hdds.version} org.apache.ozone - hadoop-hdds-hadoop-dependency-client + hdds-hadoop-dependency-client ${hdds.version} org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server ${hdds.version} org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test ${hdds.version} test org.apache.ozone - hadoop-hdds-interface-server + hdds-interface-server ${hdds.version} org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client ${hdds.version} org.apache.ozone - hadoop-hdds-interface-admin + hdds-interface-admin ${hdds.version} org.apache.ozone - hadoop-hdds-client + hdds-client ${hdds.version} org.apache.ozone - hadoop-hdds-tools + hdds-tools ${hdds.version} org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework ${hdds.version} org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm ${hdds.version} org.apache.ozone - hadoop-hdds-container-service + hdds-container-service ${hdds.version} org.apache.ozone - hadoop-hdds-docs + hdds-docs ${hdds.version} org.apache.ozone - hadoop-hdds-config + hdds-config ${hdds.version} org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils ${hdds.version} test org.apache.ozone - hadoop-hdds-common + hdds-common ${hdds.version} test-jar test @@ -165,7 +165,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-container-service + hdds-container-service ${hdds.version} test-jar test @@ -173,7 +173,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm test-jar ${hdds.version} test diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml index 10a13e6f53a3..278048efbffd 100644 --- a/hadoop-hdds/server-scm/pom.xml +++ b/hadoop-hdds/server-scm/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-server-scm + hdds-server-scm 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Storage Container Manager Server Apache Ozone HDDS SCM Server @@ -31,35 +31,35 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-hdds-container-service + hdds-container-service org.apache.ozone - hadoop-hdds-client + hdds-client org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-hdds-docs + hdds-docs provided @@ -86,13 +86,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-container-service + hdds-container-service test test-jar org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test @@ -132,7 +132,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test @@ -152,14 +152,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* org.apache.ozone - hadoop-hdds-docs + hdds-docs ${project.build.outputDirectory}/webapps/scm docs/**/*.* @@ -180,7 +180,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - ${basedir}/../../hadoop-hdds/common/src/main/resources + ${basedir}/../../hdds/common/src/main/resources ${basedir}/src/test/resources diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml index a4ca79c9b1bb..bf73b76eeff7 100644 --- a/hadoop-hdds/test-utils/pom.xml +++ b/hadoop-hdds/test-utils/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-test-utils + hdds-test-utils 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Test Utils Apache Ozone HDDS Test Utils diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml index 007a76cf5b8d..23c83fdb5970 100644 --- a/hadoop-hdds/tools/pom.xml +++ b/hadoop-hdds/tools/pom.xml @@ -19,11 +19,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-hdds + hdds 1.1.0-SNAPSHOT - hadoop-hdds-tools + hdds-tools 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Tools Apache Ozone HDDS Tools @@ -32,24 +32,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-hdds-client + hdds-client org.apache.ozone - hadoop-hdds-container-service + hdds-container-service ratis-tools diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml index 05dfd6f7543c..53af6e873d12 100644 --- a/hadoop-ozone/client/pom.xml +++ b/hadoop-ozone/client/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-client + ozone-client 1.1.0-SNAPSHOT Apache Ozone Client Apache Ozone Client @@ -31,12 +31,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-ozone-common + ozone-common junit diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 6a43770a91f1..924a96f02a61 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-common + ozone-common 1.1.0-SNAPSHOT Apache Ozone Common Apache Ozone Common @@ -36,20 +36,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-hdds-client + hdds-client org.apache.ozone - hadoop-ozone-interface-client + ozone-interface-client junit @@ -58,7 +58,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index ba109a2db278..cbc897a6edbc 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -19,10 +19,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-csi + ozone-csi 1.1.0-SNAPSHOT Apache Ozone CSI service Apache Ozone CSI service @@ -42,7 +42,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-config + hdds-config org.apache.hadoop @@ -105,7 +105,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-client + ozone-client com.google.guava diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml index a7229c1f6d35..25fc1cdc3608 100644 --- a/hadoop-ozone/datanode/pom.xml +++ b/hadoop-ozone/datanode/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-datanode + ozone-datanode Apache Ozone Datanode jar 1.1.0-SNAPSHOT @@ -33,7 +33,7 @@ org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server compile @@ -44,7 +44,7 @@ org.apache.ozone - hadoop-hdds-container-service + hdds-container-service com.sun.xml.bind diff --git a/hadoop-ozone/dev-support/checks/integration.sh b/hadoop-ozone/dev-support/checks/integration.sh index 367351873f21..a8142efb0fa3 100755 --- a/hadoop-ozone/dev-support/checks/integration.sh +++ b/hadoop-ozone/dev-support/checks/integration.sh @@ -16,4 +16,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" CHECK=integration -source "${DIR}/junit.sh" -pl :hadoop-ozone-integration-test,:mini-chaos-tests "$@" +source "${DIR}/junit.sh" -pl :ozone-integration-test,:mini-chaos-tests "$@" diff --git a/hadoop-ozone/dev-support/checks/unit.sh b/hadoop-ozone/dev-support/checks/unit.sh index 22139b5e40b9..b3c46a94baec 100755 --- a/hadoop-ozone/dev-support/checks/unit.sh +++ b/hadoop-ozone/dev-support/checks/unit.sh @@ -16,4 +16,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" CHECK=unit -source "${DIR}/junit.sh" -pl \!:hadoop-ozone-integration-test,\!:mini-chaos-tests "$@" +source "${DIR}/junit.sh" -pl \!:ozone-integration-test,\!:mini-chaos-tests "$@" diff --git a/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching b/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching index 408233afda12..c94e7d0eb6ea 100755 --- a/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching +++ b/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching @@ -38,8 +38,8 @@ function run() fi } -run tar -c -f "hadoop-ozone-${VERSION}.tar" "ozone-${VERSION}" -run gzip -f "hadoop-ozone-${VERSION}.tar" +run tar -c -f "ozone-${VERSION}.tar" "ozone-${VERSION}" +run gzip -f "ozone-${VERSION}.tar" echo -echo "Ozone dist tar available at: ${BASEDIR}/hadoop-ozone-${VERSION}.tar.gz" +echo "Ozone dist tar available at: ${BASEDIR}/ozone-${VERSION}.tar.gz" echo diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml index 3b08fedca809..150af4e52517 100644 --- a/hadoop-ozone/dist/pom.xml +++ b/hadoop-ozone/dist/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-dist + ozone-dist Apache Ozone Distribution jar 1.1.0-SNAPSHOT @@ -73,8 +73,8 @@ *.classpath - hadoop-hdds-server-scm,hadoop-ozone-common,hadoop-ozone-csi,hadoop-ozone-datanode,hadoop-ozone-insight, - hadoop-ozone-ozone-manager,hadoop-ozone-recon,hadoop-ozone-s3gateway,hadoop-ozone-tools + hdds-server-scm,ozone-common,ozone-csi,ozone-datanode,ozone-insight, + ozone-manager,ozone-recon,ozone-s3gateway,ozone-tools @@ -180,47 +180,47 @@ org.apache.ozone - hadoop-hdds-tools + hdds-tools org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm org.apache.ozone - hadoop-hdds-container-service + hdds-container-service org.apache.ozone - hadoop-ozone-s3gateway + ozone-s3gateway org.apache.ozone - hadoop-ozone-csi + ozone-csi org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager org.apache.ozone - hadoop-ozone-tools + ozone-tools org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.ozone - hadoop-ozone-datanode + ozone-datanode org.apache.ozone - hadoop-hdds-docs + hdds-docs org.apache.ozone - hadoop-ozone-insight + ozone-insight @@ -234,11 +234,11 @@ org.apache.ozone - hadoop-ozone-filesystem-hadoop2 + ozone-filesystem-hadoop2 org.apache.ozone - hadoop-ozone-filesystem-hadoop3 + ozone-filesystem-hadoop3 @@ -253,7 +253,7 @@ org.apache.ozone - hadoop-ozone-recon + ozone-recon @@ -301,7 +301,7 @@ org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils @@ -334,7 +334,7 @@ ../.. false false - hadoop-ozone-${project.version}-src + ozone-${project.version}-src target ${project.basedir}/../.. 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 fcb9e887b3e8..2609418068ea 100644 --- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml +++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml @@ -18,7 +18,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - hadoop-ozone-fault-injection-test + ozone-fault-injection-test org.apache.ozone 1.1.0-SNAPSHOT @@ -35,22 +35,22 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-ozone-filesystem + ozone-filesystem org.apache.ozone - hadoop-ozone-integration-test + ozone-integration-test test test-jar org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/fault-injection-test/network-tests/pom.xml b/hadoop-ozone/fault-injection-test/network-tests/pom.xml index 3ef72ac9c12c..6fd837d9843b 100644 --- a/hadoop-ozone/fault-injection-test/network-tests/pom.xml +++ b/hadoop-ozone/fault-injection-test/network-tests/pom.xml @@ -19,10 +19,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone-fault-injection-test + ozone-fault-injection-test 1.1.0-SNAPSHOT - hadoop-ozone-network-tests + ozone-network-tests Apache Ozone Network Tests Apache Ozone Network Tests jar diff --git a/hadoop-ozone/fault-injection-test/pom.xml b/hadoop-ozone/fault-injection-test/pom.xml index b54845129b5f..df31367cff0c 100644 --- a/hadoop-ozone/fault-injection-test/pom.xml +++ b/hadoop-ozone/fault-injection-test/pom.xml @@ -19,10 +19,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-fault-injection-test + ozone-fault-injection-test 1.1.0-SNAPSHOT Apache Ozone Fault Injection Tests Apache Ozone Fault Injection Tests diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml index 23a31456d282..e2c21b8984e5 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-insight + ozone-insight 1.1.0-SNAPSHOT Apache Ozone Insight Tool Apache Ozone Insight Tool @@ -31,37 +31,37 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.ozone - hadoop-ozone-filesystem + ozone-filesystem org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-hdds-tools + hdds-tools com.sun.xml.bind @@ -91,7 +91,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index 263fde776b0c..e7513e89633d 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-integration-test + ozone-integration-test 1.1.0-SNAPSHOT Apache Ozone Integration Tests Apache Ozone Integration Tests @@ -32,20 +32,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager org.apache.hadoop @@ -55,31 +55,31 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-s3gateway + ozone-s3gateway org.apache.ozone - hadoop-ozone-csi + ozone-csi org.apache.ozone - hadoop-ozone-recon + ozone-recon org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.ozone - hadoop-ozone-filesystem + ozone-filesystem org.apache.ozone - hadoop-ozone-tools + ozone-tools org.apache.ozone - hadoop-hdds-tools + hdds-tools org.apache.commons @@ -88,13 +88,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager test test-jar org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test @@ -152,19 +152,19 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm test test-jar org.apache.ozone - hadoop-hdds-container-service + hdds-container-service test test-jar org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml index c44e0787fe94..9458ded7d973 100644 --- a/hadoop-ozone/interface-client/pom.xml +++ b/hadoop-ozone/interface-client/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-interface-client + ozone-interface-client 1.1.0-SNAPSHOT Apache Ozone Client interface Apache Ozone Client Interface @@ -35,7 +35,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml index 97968caa16fb..12b129439222 100644 --- a/hadoop-ozone/interface-storage/pom.xml +++ b/hadoop-ozone/interface-storage/pom.xml @@ -19,10 +19,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-interface-storage + ozone-interface-storage 1.1.0-SNAPSHOT Apache Ozone Storage Interface Apache Ozone Storage Interface @@ -31,7 +31,7 @@ org.apache.ozone - hadoop-ozone-common + ozone-common @@ -41,29 +41,29 @@ org.apache.ozone - hadoop-ozone-interface-client + ozone-interface-client org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm test-jar test org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index 3da53a0400f4..1fda1a82ab76 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-ozone-manager + ozone-manager 1.1.0-SNAPSHOT Apache Ozone Manager Server Apache Ozone Manager Server @@ -32,43 +32,43 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.ozone - hadoop-hdds-docs + hdds-docs provided org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client org.apache.ozone - hadoop-ozone-interface-storage + ozone-interface-storage org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server @@ -88,18 +88,18 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm test test-jar @@ -140,14 +140,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* org.apache.ozone - hadoop-hdds-docs + hdds-docs ${project.build.outputDirectory}/webapps/ozoneManager docs/**/*.* @@ -167,7 +167,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - ${basedir}/../../hadoop-hdds/common/src/main/resources + ${basedir}/../../hdds/common/src/main/resources ${basedir}/src/test/resources diff --git a/hadoop-ozone/ozonefs-common/pom.xml b/hadoop-ozone/ozonefs-common/pom.xml index 8f26d9cca938..683e47025d4c 100644 --- a/hadoop-ozone/ozonefs-common/pom.xml +++ b/hadoop-ozone/ozonefs-common/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem-common + ozone-filesystem-common Apache Ozone FileSystem Common jar 1.1.0-SNAPSHOT @@ -39,7 +39,7 @@ org.apache.ozone - hadoop-hdds-hadoop-dependency-client + hdds-hadoop-dependency-client com.github.spotbugs @@ -48,39 +48,39 @@ org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.ozone - hadoop-hdds-common + hdds-common org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm test org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework test org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager test org.apache.ozone - hadoop-hdds-container-service + hdds-container-service test diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml index 3af1d87151e8..87da2575abf0 100644 --- a/hadoop-ozone/ozonefs-hadoop2/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem-hadoop2 + ozone-filesystem-hadoop2 Apache Ozone FS Hadoop 2.x compatibility jar 1.1.0-SNAPSHOT @@ -31,7 +31,7 @@ org.apache.ozone - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded true @@ -94,7 +94,7 @@ org.apache.ozone - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded ${project.version} diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml index 43df463df9a0..b43ef5ec4db8 100644 --- a/hadoop-ozone/ozonefs-hadoop3/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem-hadoop3 + ozone-filesystem-hadoop3 Apache Ozone FS Hadoop 3.x compatibility jar 1.1.0-SNAPSHOT @@ -31,7 +31,7 @@ org.apache.ozone - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded true @@ -77,7 +77,7 @@ org.apache.ozone - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded ${project.version} diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml index 71263b4063c7..8eeefe970b05 100644 --- a/hadoop-ozone/ozonefs-shaded/pom.xml +++ b/hadoop-ozone/ozonefs-shaded/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded Apache Ozone FileSystem Shaded jar 1.1.0-SNAPSHOT @@ -33,7 +33,7 @@ org.apache.ozone - hadoop-ozone-filesystem-common + ozone-filesystem-common org.apache.hadoop diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml index 833ee1ce302d..1514e59c7180 100644 --- a/hadoop-ozone/ozonefs/pom.xml +++ b/hadoop-ozone/ozonefs/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem + ozone-filesystem Apache Ozone FileSystem jar 1.1.0-SNAPSHOT @@ -78,11 +78,11 @@ org.apache.ozone - hadoop-ozone-filesystem-common + ozone-filesystem-common org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.hadoop diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 92e92d3012e1..0b728f4996dc 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -15,10 +15,10 @@ 4.0.0 org.apache.ozone - hadoop-main-ozone + ozone-main 1.1.0-SNAPSHOT - hadoop-ozone + ozone 1.1.0-SNAPSHOT Apache Ozone Project Apache Ozone @@ -59,179 +59,179 @@ org.apache.ozone - hadoop-ozone-common + ozone-common ${ozone.version} org.apache.ozone - hadoop-ozone-client + ozone-client ${ozone.version} org.apache.ozone - hadoop-ozone-interface-client + ozone-interface-client ${ozone.version} org.apache.ozone - hadoop-ozone-interface-storage + ozone-interface-storage ${ozone.version} org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager ${ozone.version} org.apache.ozone - hadoop-ozone-s3gateway + ozone-s3gateway ${ozone.version} org.apache.ozone - hadoop-ozone-csi + ozone-csi ${ozone.version} org.apache.ozone - hadoop-ozone-datanode + ozone-datanode ${ozone.version} org.apache.ozone - hadoop-ozone-tools + ozone-tools ${ozone.version} org.apache.ozone - hadoop-ozone-filesystem + ozone-filesystem ${ozone.version} org.apache.ozone - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded ${ozone.version} org.apache.ozone - hadoop-ozone-filesystem-common + ozone-filesystem-common ${ozone.version} org.apache.ozone - hadoop-ozone-filesystem-hadoop3 + ozone-filesystem-hadoop3 ${ozone.version} org.apache.ozone - hadoop-ozone-filesystem-hadoop2 + ozone-filesystem-hadoop2 ${ozone.version} org.apache.ozone - hadoop-hdds-config + hdds-config ${hdds.version} org.apache.ozone - hadoop-hdds-interface-client + hdds-interface-client ${hdds.version} org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils ${hdds.version} test org.apache.ozone - hadoop-hdds-hadoop-dependency-client + hdds-hadoop-dependency-client ${hdds.version} org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server ${hdds.version} org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test ${hdds.version} test org.apache.ozone - hadoop-hdds-common + hdds-common ${hdds.version} test-jar test org.apache.ozone - hadoop-ozone-integration-test + ozone-integration-test ${ozone.version} test-jar org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager ${ozone.version} test-jar org.apache.ozone - hadoop-hdds-common + hdds-common ${hdds.version} org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework ${hdds.version} org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm ${hdds.version} org.apache.ozone - hadoop-hdds-docs + hdds-docs ${hdds.version} org.apache.ozone - hadoop-hdds-container-service + hdds-container-service ${hdds.version} org.apache.ozone - hadoop-hdds-client + hdds-client ${hdds.version} org.apache.ozone - hadoop-hdds-tools + hdds-tools ${hdds.version} org.apache.ozone - hadoop-ozone-insight + ozone-insight ${hdds.version} org.apache.ozone - hadoop-ozone-recon + ozone-recon ${ozone.version} org.apache.ozone - hadoop-hdds-container-service + hdds-container-service ${hdds.version} test-jar org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm test-jar ${hdds.version} diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml index 7502be611840..fdf787ccaf26 100644 --- a/hadoop-ozone/recon-codegen/pom.xml +++ b/hadoop-ozone/recon-codegen/pom.xml @@ -16,17 +16,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - hadoop-ozone + ozone org.apache.ozone 1.1.0-SNAPSHOT 4.0.0 - hadoop-ozone-reconcodegen + ozone-reconcodegen Apache Ozone Recon CodeGen org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.derby diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index 72a3de7b19f9..05f959900cb5 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -17,12 +17,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT Apache Ozone Recon 4.0.0 - hadoop-ozone-recon + ozone-recon @@ -175,7 +175,7 @@ org.apache.ozone - hadoop-ozone-common + ozone-common jersey-server @@ -193,12 +193,12 @@ org.apache.ozone - hadoop-ozone-reconcodegen + ozone-reconcodegen ${ozone.version} org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager com.sun.jersey @@ -208,13 +208,13 @@ org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-tools + hdds-tools * @@ -224,7 +224,7 @@ org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm com.google.inject @@ -264,7 +264,7 @@ org.apache.ozone - hadoop-hdds-common + hdds-common test-jar test @@ -280,7 +280,7 @@ org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index 06dfde535eac..d6ba095698d5 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -18,10 +18,10 @@ 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-s3gateway + ozone-s3gateway Apache Ozone S3 Gateway jar 1.1.0-SNAPSHOT @@ -33,17 +33,17 @@ org.apache.ozone - hadoop-ozone-common + ozone-common compile org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.jboss.weld.servlet @@ -92,7 +92,7 @@ org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server com.sun.jersey @@ -114,7 +114,7 @@ org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test @@ -161,11 +161,11 @@ org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.ozone - hadoop-hdds-docs + hdds-docs provided @@ -201,14 +201,14 @@ org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* org.apache.ozone - hadoop-hdds-docs + hdds-docs ${project.build.outputDirectory}/webapps/static diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 4632684019bd..ce7adad79ddc 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -19,10 +19,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-tools + ozone-tools 1.1.0-SNAPSHOT Apache Ozone Tools Apache Ozone Tools @@ -31,41 +31,41 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-ozone-ozone-manager + ozone-manager org.apache.ozone - hadoop-ozone-common + ozone-common org.apache.ozone - hadoop-hdds-test-utils + hdds-test-utils test org.apache.ozone - hadoop-hdds-server-scm + hdds-server-scm org.apache.ozone - hadoop-hdds-tools + hdds-tools org.apache.ozone - hadoop-ozone-client + ozone-client org.apache.ozone - hadoop-ozone-filesystem + ozone-filesystem org.apache.ozone - hadoop-hdds-server-framework + hdds-server-framework org.apache.ozone - hadoop-ozone-recon + ozone-recon org.springframework @@ -75,7 +75,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-server + hdds-hadoop-dependency-server org.apache.ratis @@ -131,7 +131,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone - hadoop-hdds-hadoop-dependency-test + hdds-hadoop-dependency-test test diff --git a/pom.xml b/pom.xml index 7fc4eb16f5fa..40bdaaf82218 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.ozone - hadoop-main-ozone + ozone-main 1.1.0-SNAPSHOT Apache Ozone Main Apache Ozone Main @@ -2002,7 +2002,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs hadoop-hdds/dev-support/checkstyle/checkstyle.xml - hadoop-hdds/dev-support/checkstyle/suppressions.xml + hdds/dev-support/checkstyle/suppressions.xml true false xml From 74871656160aba9c4b4fbe54790a952f63297c73 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 12 May 2021 19:07:05 +0200 Subject: [PATCH 11/15] Fix tarball name for dependency check --- .github/workflows/post-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml index f619fdc842d5..2849dea47b32 100644 --- a/.github/workflows/post-commit.yml +++ b/.github/workflows/post-commit.yml @@ -130,7 +130,7 @@ jobs: - name: Untar binaries run: | mkdir dist - tar -C dist --strip-components 1 -xzf hadoop-ozone*.tar.gz + tar -C dist --strip-components 1 -xzf ozone*.tar.gz - name: Execute tests run: | export OZONE_DIST_DIR=`pwd`/dist From e53ee9993b5a613560810fd9cf9d094b4027147b Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 12 May 2021 20:25:13 +0200 Subject: [PATCH 12/15] Fix update-jar-report.sh --- hadoop-ozone/dist/src/main/license/update-jar-report.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/license/update-jar-report.sh b/hadoop-ozone/dist/src/main/license/update-jar-report.sh index 0d2aa5c75803..9e0d9c4336b7 100755 --- a/hadoop-ozone/dist/src/main/license/update-jar-report.sh +++ b/hadoop-ozone/dist/src/main/license/update-jar-report.sh @@ -30,4 +30,4 @@ cd "$OZONE_DIST_DIR" #sed expression removes the version. Usually license is not changed with version bumps #jacoco and test dependencies are excluded -find . -type f -name "*.jar" | cut -c3- | perl -wpl -e 's/-[0-9]+(.[0-9]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g' | grep -v jacoco | grep -v hadoop-hdds-test-utils | sort > "$SCRIPTDIR"/$REPORT_NAME +find . -type f -name "*.jar" | cut -c3- | perl -wpl -e 's/-[0-9]+(.[0-9]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g' | grep -v -e jacoco -e hdds-test-utils | sort > "$SCRIPTDIR"/$REPORT_NAME From 7333bc3404cbf2443b460e74126f97369fdd75ba Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Thu, 27 May 2021 10:15:46 +0200 Subject: [PATCH 13/15] Fix tarball name in kubernetes check --- .github/workflows/post-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml index 4c31bac172b0..49046cf6a77d 100644 --- a/.github/workflows/post-commit.yml +++ b/.github/workflows/post-commit.yml @@ -210,7 +210,7 @@ jobs: - name: Untar binaries run: | mkdir -p /mnt/ozone/hadoop-ozone/dist/target - tar xzvf hadoop-ozone*.tar.gz -C /mnt/ozone/hadoop-ozone/dist/target + tar xzvf ozone*.tar.gz -C /mnt/ozone/hadoop-ozone/dist/target - name: Execute tests run: | cd /mnt/ozone/hadoop-ozone/dist/target/ozone-* && sudo mkdir .aws && sudo chmod 777 .aws && sudo chown 1000 .aws From 4abff67dbc667b09636fbdd42ce9af05a0cab682 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Thu, 27 May 2021 12:48:04 +0200 Subject: [PATCH 14/15] Fix path in cache cleanup --- .github/workflows/post-commit.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml index 49046cf6a77d..44a8cce1cbb1 100644 --- a/.github/workflows/post-commit.yml +++ b/.github/workflows/post-commit.yml @@ -264,8 +264,8 @@ jobs: - name: Delete temporary build artifacts before caching run: | #Never cache local artifacts - rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-hdds* - rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-ozone* + rm -rf ~/.m2/repository/org/apache/ozone/hdds* + rm -rf ~/.m2/repository/org/apache/ozone/ozone* if: always() coverage: runs-on: ubuntu-18.04 @@ -315,6 +315,6 @@ jobs: - name: Delete temporary build artifacts before caching run: | #Never cache local artifacts - rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-hdds* - rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-ozone* + rm -rf ~/.m2/repository/org/apache/ozone/hdds* + rm -rf ~/.m2/repository/org/apache/ozone/ozone* if: always() From 7d5a6feea4f3fb98c640169d7387a3977dc84f00 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Thu, 27 May 2021 15:24:44 +0200 Subject: [PATCH 15/15] trigger new CI check