This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new e722e4d HDDS-2290. Rename pom.ozone.xml to pom.xml
e722e4d is described below
commit e722e4d3a73b4eb6f92b678be83ba32590edc085
Author: Nanda kumar <na...@apache.org>
AuthorDate: Mon Oct 14 10:01:24 2019 +0200
HDDS-2290. Rename pom.ozone.xml to pom.xml
Closes #10
---
hadoop-hdds/docs/content/beyond/Containers.md | 2 +-
hadoop-hdds/docs/content/start/FromSource.md | 2 +-
hadoop-hdds/pom.xml | 1 -
hadoop-ozone/dev-support/checks/build.sh | 2 +-
hadoop-ozone/dev-support/checks/checkstyle.sh | 2 +-
hadoop-ozone/dev-support/checks/findbugs.sh | 4 ++--
hadoop-ozone/dev-support/checks/integration.sh | 4 ++--
hadoop-ozone/dev-support/checks/unit.sh | 2 +-
hadoop-ozone/dist/src/main/assemblies/ozone-src.xml | 7 +------
hadoop-ozone/pom.xml | 1 -
pom.ozone.xml => pom.xml | 0
11 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/hadoop-hdds/docs/content/beyond/Containers.md
b/hadoop-hdds/docs/content/beyond/Containers.md
index ea7e3b1..154d94d 100644
--- a/hadoop-hdds/docs/content/beyond/Containers.md
+++ b/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)
diff --git a/hadoop-hdds/docs/content/start/FromSource.md
b/hadoop-hdds/docs/content/start/FromSource.md
index 1e920d9..9ce0cc4 100644
--- a/hadoop-hdds/docs/content/start/FromSource.md
+++ b/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.
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index a174337..e38d107 100644
--- a/hadoop-hdds/pom.xml
+++ b/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>
diff --git a/hadoop-ozone/dev-support/checks/build.sh
b/hadoop-ozone/dev-support/checks/build.sh
index 1197330..f461da1 100755
--- a/hadoop-ozone/dev-support/checks/build.sh
+++ b/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 $?
diff --git a/hadoop-ozone/dev-support/checks/checkstyle.sh
b/hadoop-ozone/dev-support/checks/checkstyle.sh
index 685bf14..bdae1d6 100755
--- a/hadoop-ozone/dev-support/checks/checkstyle.sh
+++ b/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 \
diff --git a/hadoop-ozone/dev-support/checks/findbugs.sh
b/hadoop-ozone/dev-support/checks/findbugs.sh
index ccbf2ed..9809684 100755
--- a/hadoop-ozone/dev-support/checks/findbugs.sh
+++ b/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"
diff --git a/hadoop-ozone/dev-support/checks/integration.sh
b/hadoop-ozone/dev-support/checks/integration.sh
index 52e3576..f522224 100755
--- a/hadoop-ozone/dev-support/checks/integration.sh
+++ b/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"}
diff --git a/hadoop-ozone/dev-support/checks/unit.sh
b/hadoop-ozone/dev-support/checks/unit.sh
index 6a12412..44b6d0b 100755
--- a/hadoop-ozone/dev-support/checks/unit.sh
+++ b/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"
diff --git a/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
b/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
index 25e35c8..a9060d2 100644
--- a/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
+++ b/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
@@ -25,11 +25,6 @@
<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>
</file>
@@ -62,7 +57,7 @@
<fileSet>
<directory>.</directory>
<includes>
- <include>pom.ozone.xml</include>
+ <include>pom.xml</include>
<include>README.txt</include>
</includes>
</fileSet>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 825e65c..716e175 100644
--- a/hadoop-ozone/pom.xml
+++ b/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>
diff --git a/pom.ozone.xml b/pom.xml
similarity index 100%
rename from pom.ozone.xml
rename to pom.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: hdfs-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: hdfs-commits-h...@hadoop.apache.org
