HDDS-2290. Rename pom.ozone.xml to pom.xml.

hadoop-hdds/docs/content/beyond/Containers.md

@@ -155,7 +155,7 @@ To test a development build you can create your own image and upload it to your
 
 
 ```bash
-mvn clean install -f pom.ozone.xml -DskipTests -Pdocker-build,docker-push -Ddocker.image=myregistry:9000/name/ozone
+mvn clean install -DskipTests -Pdocker-build,docker-push -Ddocker.image=myregistry:9000/name/ozone
 ```
 
 The configured image will be used in all the generated kubernetes resources files (`image:` keys are adjusted during the build)

hadoop-hdds/docs/content/start/FromSource.md

@@ -38,7 +38,7 @@ dependencies to build Hadoop on your build machine. If you need instructions
 on how to build Hadoop, please look at the Apache Hadoop Website.
 
 ```bash
-mvn -f pom.ozone.xml clean package -DskipTests=true
+mvn clean package -DskipTests=true
 ```
 
 This will build an ozone-\<version\>.tar.gz in your `hadoop-ozone/dist/target` directory.

hadoop-hdds/pom.xml

@@ -21,7 +21,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-main-ozone</artifactId>
     <version>0.5.0-SNAPSHOT</version>
-    <relativePath>../pom.ozone.xml</relativePath>
   </parent>
 
   <artifactId>hadoop-hdds</artifactId>

hadoop-ozone/dev-support/checks/build.sh

@@ -17,5 +17,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd "$DIR/../../.." || exit 1
 
 export MAVEN_OPTS="-Xmx4096m"
-mvn -B -f pom.ozone.xml -Dmaven.javadoc.skip=true -DskipTests clean install
+mvn -B -Dmaven.javadoc.skip=true -DskipTests clean install
 exit $?

hadoop-ozone/dev-support/checks/checkstyle.sh

@@ -21,7 +21,7 @@ REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/checkstyle"}
 mkdir -p "$REPORT_DIR"
 REPORT_FILE="$REPORT_DIR/summary.txt"
 
-mvn -B -fn checkstyle:check -f pom.ozone.xml
+mvn -B -fn checkstyle:check
 
 #Print out the exact violations with parsing XML results with sed
 find "." -name checkstyle-errors.xml -print0 \

hadoop-ozone/dev-support/checks/findbugs.sh

@@ -17,11 +17,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd "$DIR/../../.." || exit 1
 
 if ! type unionBugs >/dev/null 2>&1 || ! type convertXmlToText >/dev/null 2>&1; then
-  mvn -B -fae compile spotbugs:check -f pom.ozone.xml
+  mvn -B -fae compile spotbugs:check
   exit $?
 fi
 
-mvn -B -fae compile spotbugs:spotbugs -f pom.ozone.xml
+mvn -B -fae compile spotbugs:spotbugs
 
 REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/findbugs"}
 mkdir -p "$REPORT_DIR"

hadoop-ozone/dev-support/checks/integration.sh

@@ -17,8 +17,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd "$DIR/../../.." || exit 1
 
 export MAVEN_OPTS="-Xmx4096m"
-mvn -B install -f pom.ozone.xml -DskipTests
-mvn -B -fn test -f pom.ozone.xml -pl :hadoop-ozone-integration-test,:hadoop-ozone-filesystem,:hadoop-ozone-tools \
+mvn -B install -DskipTests
+mvn -B -fn test -pl :hadoop-ozone-integration-test,:hadoop-ozone-filesystem,:hadoop-ozone-tools \
   -Dtest=\!TestMiniChaosOzoneCluster "$@"
 
 REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/integration"}

hadoop-ozone/dev-support/checks/unit.sh

@@ -17,7 +17,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd "$DIR/../../.." || exit 1
 
 export MAVEN_OPTS="-Xmx4096m"
-mvn -B -fn test -f pom.ozone.xml -pl \!:hadoop-ozone-integration-test,\!:hadoop-ozone-filesystem,\!:hadoop-ozone-tools "$@"
+mvn -B -fn test -pl \!:hadoop-ozone-integration-test,\!:hadoop-ozone-filesystem,\!:hadoop-ozone-tools "$@"
 
 REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/unit"}
 mkdir -p "$REPORT_DIR"

hadoop-ozone/dist/src/main/assemblies/ozone-src.xml

@@ -24,11 +24,6 @@
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
   <files>
-    <file>
-      <source>pom.ozone.xml</source>
-      <outputDirectory>/</outputDirectory>
-      <destName>pom.xml</destName>
-    </file>
     <file>
       <source>hadoop-ozone/dist/src/main/license/src/LICENSE.txt</source>
       <outputDirectory>/</outputDirectory>
@@ -62,7 +57,7 @@
     <fileSet>
       <directory>.</directory>
       <includes>
-        <include>pom.ozone.xml</include>
+        <include>pom.xml</include>
         <include>README.txt</include>
       </includes>
     </fileSet>

hadoop-ozone/pom.xml

@@ -17,7 +17,6 @@
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-main-ozone</artifactId>
     <version>0.5.0-SNAPSHOT</version>
-    <relativePath>../pom.ozone.xml</relativePath>
   </parent>
   <artifactId>hadoop-ozone</artifactId>
   <version>0.5.0-SNAPSHOT</version>