From 1f804b5d2031ddbae4f6ce17dbae3e950ecdde10 Mon Sep 17 00:00:00 2001 From: Harsh J Date: Mon, 28 May 2012 14:58:13 +0000 Subject: [PATCH] svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-assemblies/pom.xml | 5 ++++- .../hadoop-annotations/pom.xml | 5 ++++- .../hadoop-auth-examples/pom.xml | 5 ++++- hadoop-common-project/hadoop-auth/pom.xml | 5 ++++- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-common-project/hadoop-common/pom.xml | 17 ++++++++++------- hadoop-common-project/pom.xml | 5 ++++- hadoop-dist/pom.xml | 5 ++++- hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 9 ++++++--- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 11 +++++++---- .../hadoop-hdfs/src/contrib/bkjournal/pom.xml | 5 ++++- .../hadoop-hdfs/src/contrib/fuse-dfs/pom.xml | 5 ++++- hadoop-hdfs-project/pom.xml | 5 ++++- .../hadoop-mapreduce-client-app/pom.xml | 5 ++++- .../hadoop-mapreduce-client-common/pom.xml | 5 ++++- .../hadoop-mapreduce-client-core/pom.xml | 5 ++++- .../hadoop-mapreduce-client-hs/pom.xml | 5 ++++- .../hadoop-mapreduce-client-jobclient/pom.xml | 5 ++++- .../hadoop-mapreduce-client-shuffle/pom.xml | 5 ++++- .../hadoop-mapreduce-client/pom.xml | 5 ++++- .../hadoop-mapreduce-examples/pom.xml | 5 ++++- .../hadoop-yarn/hadoop-yarn-api/pom.xml | 5 ++++- .../pom.xml | 5 ++++- .../hadoop-yarn-applications/pom.xml | 5 ++++- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 5 ++++- .../hadoop-yarn-server-common/pom.xml | 5 ++++- .../hadoop-yarn-server-nodemanager/pom.xml | 5 ++++- .../hadoop-yarn-server-resourcemanager/pom.xml | 5 ++++- .../hadoop-yarn-server-tests/pom.xml | 5 ++++- .../hadoop-yarn-server-web-proxy/pom.xml | 5 ++++- .../hadoop-yarn/hadoop-yarn-server/pom.xml | 5 ++++- .../hadoop-yarn/hadoop-yarn-site/pom.xml | 5 ++++- hadoop-mapreduce-project/pom.xml | 2 +- hadoop-project-dist/pom.xml | 9 ++++++--- hadoop-project/pom.xml | 5 ++++- hadoop-tools/hadoop-archives/pom.xml | 5 ++++- hadoop-tools/hadoop-distcp/pom.xml | 5 ++++- hadoop-tools/hadoop-extras/pom.xml | 5 ++++- hadoop-tools/hadoop-rumen/pom.xml | 5 ++++- hadoop-tools/hadoop-streaming/pom.xml | 5 ++++- hadoop-tools/hadoop-tools-dist/pom.xml | 5 ++++- hadoop-tools/pom.xml | 5 ++++- pom.xml | 4 +++- 43 files changed, 180 insertions(+), 55 deletions(-) diff --git a/hadoop-assemblies/pom.xml b/hadoop-assemblies/pom.xml index 70423467993..3e45a8c3e44 100644 --- a/hadoop-assemblies/pom.xml +++ b/hadoop-assemblies/pom.xml @@ -15,7 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml index 116cc9fe507..be3d0c15b11 100644 --- a/hadoop-common-project/hadoop-annotations/pom.xml +++ b/hadoop-common-project/hadoop-annotations/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-common-project/hadoop-auth-examples/pom.xml b/hadoop-common-project/hadoop-auth-examples/pom.xml index b084f3173fb..bb819896396 100644 --- a/hadoop-common-project/hadoop-auth-examples/pom.xml +++ b/hadoop-common-project/hadoop-auth-examples/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml index 00c9b492d7b..89e0dddf1d7 100644 --- a/hadoop-common-project/hadoop-auth/pom.xml +++ b/hadoop-common-project/hadoop-auth/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f318b431f85..1b6ab40c82c 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -47,6 +47,9 @@ Release 2.0.1-alpha - UNRELEASED HADOOP-8329. Build fails with Java 7. (eli) + HADOOP-8268. A few pom.xml across Hadoop project + may fail XML validation. (Radim Kolar via harsh) + Release 2.0.0-alpha - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 219b6d8025e..ba798495545 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop @@ -331,7 +334,7 @@ PROTO_DIR=src/main/proto JAVA_DIR=target/generated-sources/java - which cygpath 2> /dev/null + which cygpath 2> /dev/null if [ $? = 1 ]; then IS_WIN=false else @@ -339,8 +342,8 @@ WIN_PROTO_DIR=`cygpath --windows $PROTO_DIR` WIN_JAVA_DIR=`cygpath --windows $JAVA_DIR` fi - mkdir -p $JAVA_DIR 2> /dev/null - for PROTO_FILE in `ls $PROTO_DIR/*.proto 2> /dev/null` + mkdir -p $JAVA_DIR 2> /dev/null + for PROTO_FILE in `ls $PROTO_DIR/*.proto 2> /dev/null` do if [ "$IS_WIN" = "true" ]; then protoc -I$WIN_PROTO_DIR --java_out=$WIN_JAVA_DIR $PROTO_FILE @@ -366,7 +369,7 @@ PROTO_DIR=src/test/proto JAVA_DIR=target/generated-test-sources/java - which cygpath 2> /dev/null + which cygpath 2> /dev/null if [ $? = 1 ]; then IS_WIN=false else @@ -374,8 +377,8 @@ WIN_PROTO_DIR=`cygpath --windows $PROTO_DIR` WIN_JAVA_DIR=`cygpath --windows $JAVA_DIR` fi - mkdir -p $JAVA_DIR 2> /dev/null - for PROTO_FILE in `ls $PROTO_DIR/*.proto 2> /dev/null` + mkdir -p $JAVA_DIR 2> /dev/null + for PROTO_FILE in `ls $PROTO_DIR/*.proto 2> /dev/null` do if [ "$IS_WIN" = "true" ]; then protoc -I$WIN_PROTO_DIR --java_out=$WIN_JAVA_DIR $PROTO_FILE diff --git a/hadoop-common-project/pom.xml b/hadoop-common-project/pom.xml index 2420f7e67fb..342c9051a13 100644 --- a/hadoop-common-project/pom.xml +++ b/hadoop-common-project/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml index 38eb8e1a49a..edda8d7c7b7 100644 --- a/hadoop-dist/pom.xml +++ b/hadoop-dist/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml index 0622da9ddf0..9b2a944019e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml @@ -14,7 +14,10 @@ --> - + 4.0.0 org.apache.hadoop @@ -474,7 +477,7 @@ - which cygpath 2> /dev/null + which cygpath 2> /dev/null if [ $? = 1 ]; then BUILD_DIR="${project.build.directory}" else @@ -517,7 +520,7 @@ - which cygpath 2> /dev/null + which cygpath 2> /dev/null if [ $? = 1 ]; then BUILD_DIR="${project.build.directory}" else diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index 7499ccc1c79..238a738702c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop @@ -217,7 +220,7 @@ PROTO_DIR=src/main/proto JAVA_DIR=target/generated-sources/java - which cygpath 2> /dev/null + which cygpath 2> /dev/null if [ $? = 1 ]; then IS_WIN=false else @@ -225,8 +228,8 @@ WIN_PROTO_DIR=`cygpath --windows $PROTO_DIR` WIN_JAVA_DIR=`cygpath --windows $JAVA_DIR` fi - mkdir -p $JAVA_DIR 2> /dev/null - for PROTO_FILE in `ls $PROTO_DIR/*.proto 2> /dev/null` + mkdir -p $JAVA_DIR 2> /dev/null + for PROTO_FILE in `ls $PROTO_DIR/*.proto 2> /dev/null` do if [ "$IS_WIN" = "true" ]; then protoc -I$WIN_PROTO_DIR --java_out=$WIN_JAVA_DIR $PROTO_FILE diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml index 8c4c69703e2..b6cd293c33c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/pom.xml index f2b6d83951e..9b074ff107e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/pom.xml @@ -14,7 +14,10 @@ --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-hdfs-project/pom.xml b/hadoop-hdfs-project/pom.xml index 541ecd588c6..984e460b4d0 100644 --- a/hadoop-hdfs-project/pom.xml +++ b/hadoop-hdfs-project/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml index 01a4751906f..1df746b52ea 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-mapreduce-client org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml index 4371eb77c77..660ce5c26fc 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-mapreduce-client org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml index 735dd85add5..7ef4d1bbfee 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-mapreduce-client org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml index 80d6a74499b..4e76ab5cc5a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-mapreduce-client org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml index 6ba9f26b9b5..5343a241079 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-mapreduce-client org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml index aee31c5c982..cb5f9030bd2 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-mapreduce-client org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index eab69ca7eb2..bd0ac0a9b61 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml index 0c0ff3ef0b9..8f3e57d5d55 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml index 6d9885cf864..9a5eeb71335 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-yarn org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml index cd10e115948..6f522f03f20 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-yarn-applications org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/pom.xml index 38799bd7a04..2558119ec8c 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-yarn org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml index 40307242ee0..b0aaa5254b0 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-yarn org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml index 0a5abaaee22..6957fc827bc 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-yarn-server org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml index 5a40185ebcc..c745db8a27f 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-yarn-server org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index 1073d87bc9e..a4980806943 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-yarn-server org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml index 048c9390d6a..9b299fcfaad 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml @@ -11,7 +11,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 hadoop-yarn-server diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml index dfd99e25a80..71c5bfa4227 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-yarn-server org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/pom.xml index a41cf2370af..637bef22321 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-yarn org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml index 946e63260d2..c38e8a8a933 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + hadoop-yarn org.apache.hadoop diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml index 094bc80bee6..76651e39a0c 100644 --- a/hadoop-mapreduce-project/pom.xml +++ b/hadoop-mapreduce-project/pom.xml @@ -184,7 +184,7 @@ - which cygpath 2> /dev/null + which cygpath 2> /dev/null if [ $? = 1 ]; then BUILD_DIR="${project.build.directory}" else diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml index 282ef3a5eb0..22618093d5d 100644 --- a/hadoop-project-dist/pom.xml +++ b/hadoop-project-dist/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop @@ -340,7 +343,7 @@ - which cygpath 2> /dev/null + which cygpath 2> /dev/null if [ $? = 1 ]; then BUILD_DIR="${project.build.directory}" else @@ -377,7 +380,7 @@ - which cygpath 2> /dev/null + which cygpath 2> /dev/null if [ $? = 1 ]; then BUILD_DIR="${project.build.directory}" else diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 68026850857..f3b9ea8d69e 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-tools/hadoop-archives/pom.xml b/hadoop-tools/hadoop-archives/pom.xml index 402b2162372..05ed7e836fa 100644 --- a/hadoop-tools/hadoop-archives/pom.xml +++ b/hadoop-tools/hadoop-archives/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-tools/hadoop-distcp/pom.xml b/hadoop-tools/hadoop-distcp/pom.xml index 0aed5b7c3b0..200f71f520b 100644 --- a/hadoop-tools/hadoop-distcp/pom.xml +++ b/hadoop-tools/hadoop-distcp/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-tools/hadoop-extras/pom.xml b/hadoop-tools/hadoop-extras/pom.xml index 4549bfd8692..b60250c38ea 100644 --- a/hadoop-tools/hadoop-extras/pom.xml +++ b/hadoop-tools/hadoop-extras/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-tools/hadoop-rumen/pom.xml b/hadoop-tools/hadoop-rumen/pom.xml index febb5181d4a..3a9d397f980 100644 --- a/hadoop-tools/hadoop-rumen/pom.xml +++ b/hadoop-tools/hadoop-rumen/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-tools/hadoop-streaming/pom.xml b/hadoop-tools/hadoop-streaming/pom.xml index 69e10ce2350..286fc539532 100644 --- a/hadoop-tools/hadoop-streaming/pom.xml +++ b/hadoop-tools/hadoop-streaming/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml index 9ce8bd5fd0e..e7268ae559c 100644 --- a/hadoop-tools/hadoop-tools-dist/pom.xml +++ b/hadoop-tools/hadoop-tools-dist/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml index 304efbbc255..77500096c5e 100644 --- a/hadoop-tools/pom.xml +++ b/hadoop-tools/pom.xml @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop diff --git a/pom.xml b/pom.xml index e7c890ee2ec..7496b7a314e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop hadoop-main