diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml index c869a49d1c5f..fb1b354ba5e4 100644 --- a/.github/workflows/post-commit.yml +++ b/.github/workflows/post-commit.yml @@ -58,13 +58,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 @@ -215,7 +215,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 @@ -283,7 +283,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 @@ -321,7 +321,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 diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml index ee1d6fab5ca6..32296d4940a6 100644 --- a/hadoop-hdds/client/pom.xml +++ b/hadoop-hdds/client/pom.xml @@ -18,12 +18,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + 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 @@ -31,17 +31,17 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common test-jar test @@ -52,8 +52,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + hdds-hadoop-dependency-test test diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index 7c2f5db5a846..bc6dde7cac58 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + hdds 1.1.0-SNAPSHOT - hadoop-hdds-common + hdds-common 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Common Apache Ozone HDDS Common @@ -30,8 +30,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-hadoop-dependency-client + org.apache.ozone + hdds-hadoop-dependency-client info.picocli @@ -67,12 +67,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> jackson-annotations - org.apache.hadoop - hadoop-hdds-config + org.apache.ozone + hdds-config - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test @@ -189,12 +189,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop - hadoop-hdds-interface-client + org.apache.ozone + hdds-interface-client - org.apache.hadoop - hadoop-hdds-interface-admin + org.apache.ozone + hdds-interface-admin org.hamcrest diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml index 1a185787b99f..98266a60aa1f 100644 --- a/hadoop-hdds/config/pom.xml +++ b/hadoop-hdds/config/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + 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 @@ -38,8 +38,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> slf4j-api - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index ab9f488233da..0c6175f97b30 100644 --- a/hadoop-hdds/container-service/pom.xml +++ b/hadoop-hdds/container-service/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + 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 @@ -30,12 +30,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test @@ -43,18 +43,18 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> commons-compress - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common test-jar test - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework - org.apache.hadoop - hadoop-hdds-client + org.apache.ozone + hdds-client commons-codec @@ -77,8 +77,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-docs + org.apache.ozone + hdds-docs provided @@ -98,8 +98,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + hdds-hadoop-dependency-test test @@ -132,15 +132,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* - org.apache.hadoop - hadoop-hdds-docs + org.apache.ozone + hdds-docs ${project.build.outputDirectory}/webapps/hddsDatanode docs/**/*.* 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-hdds/docs/pom.xml b/hadoop-hdds/docs/pom.xml index 3a6aea0aa6c0..cd1536ee7ad7 100644 --- a/hadoop-hdds/docs/pom.xml +++ b/hadoop-hdds/docs/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + 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 a34ece50842a..f11a1cc0187f 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + hdds 1.1.0-SNAPSHOT - hadoop-hdds-server-framework + hdds-server-framework 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Server Framework @@ -31,25 +31,25 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-interface-server + org.apache.ozone + hdds-interface-server - org.apache.hadoop - hadoop-hdds-interface-admin + org.apache.ozone + hdds-interface-admin - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common - org.apache.hadoop - hadoop-hdds-hadoop-dependency-server + org.apache.ozone + hdds-hadoop-dependency-server org.eclipse.jetty @@ -107,8 +107,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + 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..76af0eb8af52 100644 --- a/hadoop-hdds/hadoop-dependency-client/pom.xml +++ b/hadoop-hdds/hadoop-dependency-client/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + 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 708bdb3153c4..1d1b8e52d6a3 100644 --- a/hadoop-hdds/hadoop-dependency-server/pom.xml +++ b/hadoop-hdds/hadoop-dependency-server/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + 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 6fd90a94b959..fcb466ae36d0 100644 --- a/hadoop-hdds/hadoop-dependency-test/pom.xml +++ b/hadoop-hdds/hadoop-dependency-test/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + 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 c509ee187654..cb62f70afbd0 100644 --- a/hadoop-hdds/interface-admin/pom.xml +++ b/hadoop-hdds/interface-admin/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + hdds 1.1.0-SNAPSHOT - hadoop-hdds-interface-admin + hdds-interface-admin 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Admin interface @@ -36,8 +36,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-interface-client + org.apache.ozone + hdds-interface-client diff --git a/hadoop-hdds/interface-client/pom.xml b/hadoop-hdds/interface-client/pom.xml index c72d45a37371..c0f564e0f6dc 100644 --- a/hadoop-hdds/interface-client/pom.xml +++ b/hadoop-hdds/interface-client/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + 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 bdac4bbf91a0..ee9d5d078d22 100644 --- a/hadoop-hdds/interface-server/pom.xml +++ b/hadoop-hdds/interface-server/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + hdds 1.1.0-SNAPSHOT - hadoop-hdds-interface-server + hdds-interface-server 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Server interface @@ -37,8 +37,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-interface-client + org.apache.ozone + hdds-interface-client diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index ad0c445f7652..75eb147e9b72 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -18,12 +18,12 @@ 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 - hadoop-main-ozone + org.apache.ozone + ozone-main 1.1.0-SNAPSHOT - hadoop-hdds + hdds 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Project Apache Ozone HDDS @@ -64,122 +64,122 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common ${hdds.version} - org.apache.hadoop - hadoop-hdds-hadoop-dependency-client + org.apache.ozone + hdds-hadoop-dependency-client ${hdds.version} - org.apache.hadoop - hadoop-hdds-hadoop-dependency-server + org.apache.ozone + hdds-hadoop-dependency-server ${hdds.version} - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + hdds-hadoop-dependency-test ${hdds.version} test - org.apache.hadoop - hadoop-hdds-interface-server + org.apache.ozone + hdds-interface-server ${hdds.version} - org.apache.hadoop - hadoop-hdds-interface-client + org.apache.ozone + hdds-interface-client ${hdds.version} - org.apache.hadoop - hadoop-hdds-interface-admin + org.apache.ozone + hdds-interface-admin ${hdds.version} - org.apache.hadoop - hadoop-hdds-client + org.apache.ozone + hdds-client ${hdds.version} - org.apache.hadoop - hadoop-hdds-tools + org.apache.ozone + hdds-tools ${hdds.version} - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework ${hdds.version} - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common ${hdds.version} - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + hdds-server-scm ${hdds.version} - org.apache.hadoop - hadoop-hdds-container-service + org.apache.ozone + hdds-container-service ${hdds.version} - org.apache.hadoop - hadoop-hdds-docs + org.apache.ozone + hdds-docs ${hdds.version} - org.apache.hadoop - hadoop-hdds-config + org.apache.ozone + hdds-config ${hdds.version} - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils ${hdds.version} test - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common ${hdds.version} test-jar test - org.apache.hadoop - hadoop-hdds-container-service + org.apache.ozone + hdds-container-service ${hdds.version} test-jar test - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + 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 9aeb67c30c1b..84c549ec8dbc 100644 --- a/hadoop-hdds/server-scm/pom.xml +++ b/hadoop-hdds/server-scm/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + 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 @@ -30,40 +30,40 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common - org.apache.hadoop - hadoop-hdds-container-service + org.apache.ozone + hdds-container-service - org.apache.hadoop - hadoop-hdds-client + org.apache.ozone + hdds-client - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common - org.apache.hadoop - hadoop-hdds-hadoop-dependency-server + org.apache.ozone + hdds-hadoop-dependency-server - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework - org.apache.hadoop - hadoop-hdds-docs + org.apache.ozone + hdds-docs provided @@ -89,14 +89,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-container-service + org.apache.ozone + hdds-container-service test test-jar - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common test-jar test @@ -135,8 +135,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> bcprov-jdk15on - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + hdds-hadoop-dependency-test test @@ -160,15 +160,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* - org.apache.hadoop - hadoop-hdds-docs + org.apache.ozone + hdds-docs ${project.build.outputDirectory}/webapps/scm docs/**/*.* @@ -189,7 +189,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 5151659b59ff..bf73b76eeff7 100644 --- a/hadoop-hdds/test-utils/pom.xml +++ b/hadoop-hdds/test-utils/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + 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 904c14b5a9fb..23c83fdb5970 100644 --- a/hadoop-hdds/tools/pom.xml +++ b/hadoop-hdds/tools/pom.xml @@ -18,12 +18,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-hdds + org.apache.ozone + hdds 1.1.0-SNAPSHOT - hadoop-hdds-tools + hdds-tools 1.1.0-SNAPSHOT Apache Ozone Distributed Data Store Tools Apache Ozone HDDS Tools @@ -31,25 +31,25 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework - org.apache.hadoop - hadoop-hdds-client + org.apache.ozone + hdds-client - org.apache.hadoop - hadoop-hdds-container-service + org.apache.ozone + hdds-container-service ratis-tools diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml index 794bd476cd22..53af6e873d12 100644 --- a/hadoop-ozone/client/pom.xml +++ b/hadoop-ozone/client/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-ozone + org.apache.ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-client + ozone-client 1.1.0-SNAPSHOT Apache Ozone Client Apache Ozone Client @@ -30,13 +30,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common junit diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 1c2cb3f08759..924a96f02a61 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-ozone + org.apache.ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-common + ozone-common 1.1.0-SNAPSHOT Apache Ozone Common Apache Ozone Common @@ -35,21 +35,21 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> commons-compress - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common - org.apache.hadoop - hadoop-hdds-client + org.apache.ozone + hdds-client - org.apache.hadoop - hadoop-ozone-interface-client + org.apache.ozone + ozone-interface-client junit @@ -57,8 +57,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index 3262a65ecd88..cbc897a6edbc 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -18,11 +18,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-ozone + org.apache.ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-csi + ozone-csi 1.1.0-SNAPSHOT Apache Ozone CSI service Apache Ozone CSI service @@ -41,8 +41,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-config + org.apache.ozone + hdds-config org.apache.hadoop @@ -104,8 +104,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> ${grpc-compile.version} - org.apache.hadoop - hadoop-ozone-client + org.apache.ozone + ozone-client com.google.guava diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml index 77c66bd4fb88..25fc1cdc3608 100644 --- a/hadoop-ozone/datanode/pom.xml +++ b/hadoop-ozone/datanode/pom.xml @@ -17,11 +17,11 @@ 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 - hadoop-ozone + org.apache.ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-datanode + ozone-datanode Apache Ozone Datanode jar 1.1.0-SNAPSHOT @@ -32,8 +32,8 @@ - org.apache.hadoop - hadoop-hdds-hadoop-dependency-server + org.apache.ozone + hdds-hadoop-dependency-server compile @@ -43,8 +43,8 @@ - org.apache.hadoop - hadoop-hdds-container-service + org.apache.ozone + hdds-container-service com.sun.xml.bind 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 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/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 - hadoop-hdds-test-utils + org.apache.ozone + 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/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..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 -------------------------------------------------------------------------------- -hadoop-hdds-server-scm, hadoop-ozone-ozone-manager, hadoop-ozone-s3gateway and hadoop-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/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 f1cd3d10a674..a9d738df274a 100755 --- a/hadoop-ozone/dist/src/shell/ozone/ozone +++ b/hadoop-ozone/dist/src/shell/ozone/ozone @@ -90,7 +90,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 @@ -115,7 +115,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}'" @@ -133,10 +133,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)" @@ -149,11 +149,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" @@ -162,18 +162,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-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" @@ -182,26 +182,26 @@ 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" ;; daemonlog) OZONE_CLASSNAME=org.apache.hadoop.log.LogLevel @@ -209,27 +209,27 @@ function ozonecmd_case ;; 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/fault-injection-test/mini-chaos-tests/pom.xml b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml index 1fd3b01520c2..7a6377576237 100644 --- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml +++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml @@ -18,8 +18,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - hadoop-ozone-fault-injection-test - org.apache.hadoop + ozone-fault-injection-test + org.apache.ozone 1.1.0-SNAPSHOT 1.1.0-SNAPSHOT @@ -34,29 +34,29 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-ozone-filesystem + org.apache.ozone + ozone-filesystem - org.apache.hadoop - hadoop-ozone-integration-test + org.apache.ozone + ozone-integration-test test test-jar - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + hdds-server-scm test test-jar - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + 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..6fd837d9843b 100644 --- a/hadoop-ozone/fault-injection-test/network-tests/pom.xml +++ b/hadoop-ozone/fault-injection-test/network-tests/pom.xml @@ -18,11 +18,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-ozone-fault-injection-test + org.apache.ozone + 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 4910f39d3930..df31367cff0c 100644 --- a/hadoop-ozone/fault-injection-test/pom.xml +++ b/hadoop-ozone/fault-injection-test/pom.xml @@ -18,11 +18,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-ozone + org.apache.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 5cfeaaff1b80..e2c21b8984e5 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-ozone + org.apache.ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-insight + ozone-insight 1.1.0-SNAPSHOT Apache Ozone Insight Tool Apache Ozone Insight Tool @@ -30,38 +30,38 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-ozone-ozone-manager + org.apache.ozone + ozone-manager - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + hdds-server-scm - org.apache.hadoop - hadoop-ozone-client + org.apache.ozone + ozone-client - org.apache.hadoop - hadoop-ozone-filesystem + org.apache.ozone + ozone-filesystem - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework - org.apache.hadoop - hadoop-hdds-tools + org.apache.ozone + hdds-tools com.sun.xml.bind @@ -90,8 +90,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index b3c263687735..e7513e89633d 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-ozone + org.apache.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 @@ -31,21 +31,21 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + hdds-server-scm - org.apache.hadoop - hadoop-ozone-ozone-manager + org.apache.ozone + ozone-manager org.apache.hadoop @@ -54,32 +54,32 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-ozone-s3gateway + org.apache.ozone + ozone-s3gateway - org.apache.hadoop - hadoop-ozone-csi + org.apache.ozone + ozone-csi - org.apache.hadoop - hadoop-ozone-recon + org.apache.ozone + ozone-recon - org.apache.hadoop - hadoop-ozone-client + org.apache.ozone + ozone-client - org.apache.hadoop - hadoop-ozone-filesystem + org.apache.ozone + ozone-filesystem - org.apache.hadoop - hadoop-ozone-tools + org.apache.ozone + ozone-tools - org.apache.hadoop - hadoop-hdds-tools + org.apache.ozone + hdds-tools org.apache.commons @@ -87,14 +87,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop - hadoop-ozone-ozone-manager + org.apache.ozone + ozone-manager test test-jar - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common test-jar test @@ -151,20 +151,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + hdds-server-scm test test-jar - org.apache.hadoop - hadoop-hdds-container-service + org.apache.ozone + hdds-container-service test test-jar - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml index a2827b89cf43..9458ded7d973 100644 --- a/hadoop-ozone/interface-client/pom.xml +++ b/hadoop-ozone/interface-client/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-ozone + org.apache.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 @@ -34,8 +34,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> protobuf-java - org.apache.hadoop - hadoop-hdds-interface-client + org.apache.ozone + hdds-interface-client diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml index 4d0daeccdb8f..12b129439222 100644 --- a/hadoop-ozone/interface-storage/pom.xml +++ b/hadoop-ozone/interface-storage/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-ozone + org.apache.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 @@ -30,8 +30,8 @@ - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common @@ -40,30 +40,30 @@ - org.apache.hadoop - hadoop-ozone-interface-client + org.apache.ozone + ozone-interface-client - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common test-jar test - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + hdds-server-scm test-jar test - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test 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: diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index 7c3edcb85af0..1fda1a82ab76 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-ozone + org.apache.ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-ozone-manager + ozone-manager 1.1.0-SNAPSHOT Apache Ozone Manager Server Apache Ozone Manager Server @@ -31,44 +31,44 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common - org.apache.hadoop - hadoop-ozone-client + org.apache.ozone + ozone-client - org.apache.hadoop - hadoop-hdds-docs + org.apache.ozone + hdds-docs provided - org.apache.hadoop - hadoop-hdds-interface-client + org.apache.ozone + hdds-interface-client - org.apache.hadoop - hadoop-ozone-interface-storage + org.apache.ozone + ozone-interface-storage - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework - org.apache.hadoop - hadoop-hdds-hadoop-dependency-server + org.apache.ozone + hdds-hadoop-dependency-server @@ -87,19 +87,19 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> provided - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common test-jar test - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + hdds-hadoop-dependency-test test - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + hdds-server-scm test test-jar @@ -139,15 +139,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* - org.apache.hadoop - hadoop-hdds-docs + org.apache.ozone + 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 47b2f660f616..683e47025d4c 100644 --- a/hadoop-ozone/ozonefs-common/pom.xml +++ b/hadoop-ozone/ozonefs-common/pom.xml @@ -17,11 +17,11 @@ 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 - hadoop-ozone + org.apache.ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem-common + ozone-filesystem-common Apache Ozone FileSystem Common jar 1.1.0-SNAPSHOT @@ -38,8 +38,8 @@ - org.apache.hadoop - hadoop-hdds-hadoop-dependency-client + org.apache.ozone + hdds-hadoop-dependency-client com.github.spotbugs @@ -47,40 +47,40 @@ provided - org.apache.hadoop - hadoop-ozone-client + org.apache.ozone + ozone-client - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + hdds-server-scm test - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework test - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-ozone-ozone-manager + org.apache.ozone + ozone-manager test - org.apache.hadoop - hadoop-hdds-container-service + org.apache.ozone + hdds-container-service test diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml index 4e7819ecd950..87da2575abf0 100644 --- a/hadoop-ozone/ozonefs-hadoop2/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml @@ -17,11 +17,11 @@ 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 - hadoop-ozone + org.apache.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 @@ -30,8 +30,8 @@ - org.apache.hadoop - hadoop-ozone-filesystem-shaded + org.apache.ozone + ozone-filesystem-shaded true @@ -39,7 +39,7 @@ hadoop-common - org.apache.hadoop + org.apache.ozone hadoop-hdfs-client @@ -93,8 +93,8 @@ META-INF/versions/**/*.* - org.apache.hadoop - hadoop-ozone-filesystem-shaded + org.apache.ozone + ozone-filesystem-shaded ${project.version} diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml index 7288eb9f6eea..b43ef5ec4db8 100644 --- a/hadoop-ozone/ozonefs-hadoop3/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml @@ -17,11 +17,11 @@ 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 - hadoop-ozone + org.apache.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 @@ -30,8 +30,8 @@ - org.apache.hadoop - hadoop-ozone-filesystem-shaded + org.apache.ozone + ozone-filesystem-shaded true @@ -76,8 +76,8 @@ META-INF/versions/**/*.* - org.apache.hadoop - hadoop-ozone-filesystem-shaded + org.apache.ozone + ozone-filesystem-shaded ${project.version} diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml index 62664ffaa8a9..8eeefe970b05 100644 --- a/hadoop-ozone/ozonefs-shaded/pom.xml +++ b/hadoop-ozone/ozonefs-shaded/pom.xml @@ -17,11 +17,11 @@ 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 - hadoop-ozone + org.apache.ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem-shaded + ozone-filesystem-shaded Apache Ozone FileSystem Shaded jar 1.1.0-SNAPSHOT @@ -32,8 +32,8 @@ - org.apache.hadoop - hadoop-ozone-filesystem-common + org.apache.ozone + ozone-filesystem-common org.apache.hadoop diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml index ef88a76e98ce..1514e59c7180 100644 --- a/hadoop-ozone/ozonefs/pom.xml +++ b/hadoop-ozone/ozonefs/pom.xml @@ -17,11 +17,11 @@ 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 - hadoop-ozone + org.apache.ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-filesystem + ozone-filesystem Apache Ozone FileSystem jar 1.1.0-SNAPSHOT @@ -77,12 +77,12 @@ - org.apache.hadoop - hadoop-ozone-filesystem-common + org.apache.ozone + ozone-filesystem-common - org.apache.hadoop - hadoop-ozone-client + org.apache.ozone + ozone-client org.apache.hadoop diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 94f47e8dbdf3..0b728f4996dc 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -14,11 +14,11 @@ --> 4.0.0 - org.apache.hadoop - hadoop-main-ozone + org.apache.ozone + ozone-main 1.1.0-SNAPSHOT - hadoop-ozone + ozone 1.1.0-SNAPSHOT Apache Ozone Project Apache Ozone @@ -58,180 +58,180 @@ - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common ${ozone.version} - org.apache.hadoop - hadoop-ozone-client + org.apache.ozone + ozone-client ${ozone.version} - org.apache.hadoop - hadoop-ozone-interface-client + org.apache.ozone + ozone-interface-client ${ozone.version} - org.apache.hadoop - hadoop-ozone-interface-storage + org.apache.ozone + ozone-interface-storage ${ozone.version} - org.apache.hadoop - hadoop-ozone-ozone-manager + org.apache.ozone + ozone-manager ${ozone.version} - org.apache.hadoop - hadoop-ozone-s3gateway + org.apache.ozone + ozone-s3gateway ${ozone.version} - org.apache.hadoop - hadoop-ozone-csi + org.apache.ozone + ozone-csi ${ozone.version} - org.apache.hadoop - hadoop-ozone-datanode + org.apache.ozone + ozone-datanode ${ozone.version} - org.apache.hadoop - hadoop-ozone-tools + org.apache.ozone + ozone-tools ${ozone.version} - org.apache.hadoop - hadoop-ozone-filesystem + org.apache.ozone + ozone-filesystem ${ozone.version} - org.apache.hadoop - hadoop-ozone-filesystem-shaded + org.apache.ozone + ozone-filesystem-shaded ${ozone.version} - org.apache.hadoop - hadoop-ozone-filesystem-common + org.apache.ozone + ozone-filesystem-common ${ozone.version} - org.apache.hadoop - hadoop-ozone-filesystem-hadoop3 + org.apache.ozone + ozone-filesystem-hadoop3 ${ozone.version} - org.apache.hadoop - hadoop-ozone-filesystem-hadoop2 + org.apache.ozone + ozone-filesystem-hadoop2 ${ozone.version} - org.apache.hadoop - hadoop-hdds-config + org.apache.ozone + hdds-config ${hdds.version} - org.apache.hadoop - hadoop-hdds-interface-client + org.apache.ozone + hdds-interface-client ${hdds.version} - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils ${hdds.version} test - org.apache.hadoop - hadoop-hdds-hadoop-dependency-client + org.apache.ozone + hdds-hadoop-dependency-client ${hdds.version} - org.apache.hadoop - hadoop-hdds-hadoop-dependency-server + org.apache.ozone + hdds-hadoop-dependency-server ${hdds.version} - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + hdds-hadoop-dependency-test ${hdds.version} test - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common ${hdds.version} test-jar test - org.apache.hadoop - hadoop-ozone-integration-test + org.apache.ozone + ozone-integration-test ${ozone.version} test-jar - org.apache.hadoop - hadoop-ozone-ozone-manager + org.apache.ozone + ozone-manager ${ozone.version} test-jar - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common ${hdds.version} - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework ${hdds.version} - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + hdds-server-scm ${hdds.version} - org.apache.hadoop - hadoop-hdds-docs + org.apache.ozone + hdds-docs ${hdds.version} - org.apache.hadoop - hadoop-hdds-container-service + org.apache.ozone + hdds-container-service ${hdds.version} - org.apache.hadoop - hadoop-hdds-client + org.apache.ozone + hdds-client ${hdds.version} - org.apache.hadoop - hadoop-hdds-tools + org.apache.ozone + hdds-tools ${hdds.version} - org.apache.hadoop - hadoop-ozone-insight + org.apache.ozone + ozone-insight ${hdds.version} - org.apache.hadoop - hadoop-ozone-recon + org.apache.ozone + ozone-recon ${ozone.version} - org.apache.hadoop - hadoop-hdds-container-service + org.apache.ozone + hdds-container-service ${hdds.version} test-jar - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + 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..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 - org.apache.hadoop + ozone + org.apache.ozone 1.1.0-SNAPSHOT 4.0.0 - hadoop-ozone-reconcodegen + ozone-reconcodegen Apache Ozone Recon CodeGen - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common org.apache.derby diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index 4c55e309aa16..05f959900cb5 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -16,13 +16,13 @@ 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 - hadoop-ozone + org.apache.ozone + ozone 1.1.0-SNAPSHOT Apache Ozone Recon 4.0.0 - hadoop-ozone-recon + ozone-recon @@ -174,8 +174,8 @@ - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common jersey-server @@ -192,13 +192,13 @@ - org.apache.hadoop - hadoop-ozone-reconcodegen + org.apache.ozone + ozone-reconcodegen ${ozone.version} - org.apache.hadoop - hadoop-ozone-ozone-manager + org.apache.ozone + ozone-manager com.sun.jersey @@ -207,14 +207,14 @@ - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-hdds-tools + org.apache.ozone + hdds-tools * @@ -223,8 +223,8 @@ - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + hdds-server-scm com.google.inject @@ -263,8 +263,8 @@ jersey-hk2 - org.apache.hadoop - hadoop-hdds-common + org.apache.ozone + hdds-common test-jar test @@ -279,8 +279,8 @@ test - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + hdds-hadoop-dependency-test test diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index 88bb0b58cc8d..d6ba095698d5 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -17,11 +17,11 @@ 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 - hadoop-ozone + org.apache.ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-s3gateway + ozone-s3gateway Apache Ozone S3 Gateway jar 1.1.0-SNAPSHOT @@ -32,18 +32,18 @@ - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common compile - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework org.jboss.weld.servlet @@ -91,8 +91,8 @@ - org.apache.hadoop - hadoop-hdds-hadoop-dependency-server + org.apache.ozone + hdds-hadoop-dependency-server com.sun.jersey @@ -113,8 +113,8 @@ - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + hdds-hadoop-dependency-test test @@ -160,12 +160,12 @@ - org.apache.hadoop - hadoop-ozone-client + org.apache.ozone + ozone-client - org.apache.hadoop - hadoop-hdds-docs + org.apache.ozone + hdds-docs provided @@ -200,15 +200,15 @@ - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework ${project.build.outputDirectory} webapps/static/**/*.* - org.apache.hadoop - hadoop-hdds-docs + org.apache.ozone + hdds-docs ${project.build.outputDirectory}/webapps/static diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 94b0a095cdc0..ce7adad79ddc 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -18,11 +18,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hadoop - hadoop-ozone + org.apache.ozone + ozone 1.1.0-SNAPSHOT - hadoop-ozone-tools + ozone-tools 1.1.0-SNAPSHOT Apache Ozone Tools Apache Ozone Tools @@ -30,42 +30,42 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-ozone-ozone-manager + org.apache.ozone + ozone-manager - org.apache.hadoop - hadoop-ozone-common + org.apache.ozone + ozone-common - org.apache.hadoop - hadoop-hdds-test-utils + org.apache.ozone + hdds-test-utils test - org.apache.hadoop - hadoop-hdds-server-scm + org.apache.ozone + hdds-server-scm - org.apache.hadoop - hadoop-hdds-tools + org.apache.ozone + hdds-tools - org.apache.hadoop - hadoop-ozone-client + org.apache.ozone + ozone-client - org.apache.hadoop - hadoop-ozone-filesystem + org.apache.ozone + ozone-filesystem - org.apache.hadoop - hadoop-hdds-server-framework + org.apache.ozone + hdds-server-framework - org.apache.hadoop - hadoop-ozone-recon + org.apache.ozone + ozone-recon org.springframework @@ -74,8 +74,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.hadoop - hadoop-hdds-hadoop-dependency-server + org.apache.ozone + hdds-hadoop-dependency-server org.apache.ratis @@ -130,8 +130,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.apache.hadoop - hadoop-hdds-hadoop-dependency-test + org.apache.ozone + hdds-hadoop-dependency-test test diff --git a/pom.xml b/pom.xml index fc9c13dea910..664172922f26 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,8 @@ 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 - hadoop-main-ozone + org.apache.ozone + ozone-main 1.1.0-SNAPSHOT Apache Ozone Main Apache Ozone Main