diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index d276331ab8b..8e822af139a 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -22,9 +22,6 @@ Trunk (unreleased changes)
MAPREDUCE-2836. Provide option to fail jobs when submitted to non-existent
fair scheduler pools. (Ahmed Radwan via todd)
- MAPREDUCE-3003. Publish Yarn and MapReduce artifacts to Maven snapshot
- repository. (tucu)
-
BUG FIXES
MAPREDUCE-2950. [Gridmix] TestUserResolve fails in trunk.
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 c032c645193..0f12598fc17 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
@@ -16,12 +16,11 @@
hadoop-mapreduce-client
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${hadoop-mapreduce.version}
4.0.0
org.apache.hadoop
hadoop-mapreduce-client-app
- 0.24.0-SNAPSHOT
hadoop-mapreduce-client-app
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 ab004129465..d367a9ead20 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
@@ -16,12 +16,11 @@
hadoop-mapreduce-client
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${hadoop-mapreduce.version}
4.0.0
org.apache.hadoop
hadoop-mapreduce-client-common
- 0.24.0-SNAPSHOT
hadoop-mapreduce-client-common
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 67a8f9976d6..be98eb7cdf9 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
@@ -16,12 +16,11 @@
hadoop-mapreduce-client
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${hadoop-mapreduce.version}
4.0.0
org.apache.hadoop
hadoop-mapreduce-client-core
- 0.24.0-SNAPSHOT
hadoop-mapreduce-client-core
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 de199f2891a..b9e409cad67 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
@@ -16,12 +16,11 @@
hadoop-mapreduce-client
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${hadoop-mapreduce.version}
4.0.0
org.apache.hadoop
hadoop-mapreduce-client-hs
- 0.24.0-SNAPSHOT
hadoop-mapreduce-client-hs
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 168302a2b15..ef388fcd86a 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
@@ -16,12 +16,11 @@
hadoop-mapreduce-client
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${hadoop-mapreduce.version}
4.0.0
org.apache.hadoop
hadoop-mapreduce-client-jobclient
- 0.24.0-SNAPSHOT
hadoop-mapreduce-client-jobclient
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 0f97a160874..20a27eebd62 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
@@ -16,12 +16,11 @@
hadoop-mapreduce-client
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${hadoop-mapreduce.version}
4.0.0
org.apache.hadoop
hadoop-mapreduce-client-shuffle
- 0.24.0-SNAPSHOT
hadoop-mapreduce-client-shuffle
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
index 9ca4fc282b4..2a5cef3cbc9 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
@@ -17,11 +17,10 @@
org.apache.hadoop
hadoop-mapreduce
- 0.24.0-SNAPSHOT
+ ${hadoop-mapreduce.version}
org.apache.hadoop
hadoop-mapreduce-client
- 0.24.0-SNAPSHOT
hadoop-mapreduce-client
pom
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 86881775247..52fe416f468 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml
@@ -16,12 +16,11 @@
hadoop-yarn
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${yarn.version}
4.0.0
org.apache.hadoop
hadoop-yarn-api
- 0.24.0-SNAPSHOT
hadoop-yarn-api
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 dfdd694d100..406ec436d5a 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
@@ -16,12 +16,11 @@
hadoop-yarn-applications
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${yarn.version}
4.0.0
org.apache.hadoop
hadoop-yarn-applications-distributedshell
- 0.24.0-SNAPSHOT
hadoop-yarn-applications-distributedshell
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 ecd886bb96d..713731004f6 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
@@ -16,12 +16,11 @@
hadoop-yarn
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${yarn.version}
4.0.0
org.apache.hadoop
hadoop-yarn-applications
- 0.24.0-SNAPSHOT
hadoop-yarn-applications
pom
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 40441ae78d7..a2f6bbfccab 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml
@@ -16,12 +16,11 @@
hadoop-yarn
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${yarn.version}
4.0.0
org.apache.hadoop
hadoop-yarn-common
- 0.24.0-SNAPSHOT
hadoop-yarn-common
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 17128699a2e..ed6c3b5a4d1 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
@@ -16,12 +16,11 @@
hadoop-yarn-server
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${yarn.version}
4.0.0
org.apache.hadoop
hadoop-yarn-server-common
- 0.24.0-SNAPSHOT
hadoop-yarn-server-common
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 a252db2443e..558d4a9a987 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
@@ -16,12 +16,11 @@
hadoop-yarn-server
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${yarn.version}
4.0.0
org.apache.hadoop
hadoop-yarn-server-nodemanager
- 0.24.0-SNAPSHOT
hadoop-yarn-server-nodemanager
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 0946af7111f..d94f5973144 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
@@ -16,12 +16,11 @@
hadoop-yarn-server
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${yarn.version}
4.0.0
org.apache.hadoop
hadoop-yarn-server-resourcemanager
- 0.24.0-SNAPSHOT
hadoop-yarn-server-resourcemanager
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 b4fcf9a3baf..e3b44bd0a46 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
@@ -16,11 +16,10 @@
hadoop-yarn-server
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${yarn.version}
org.apache.hadoop
hadoop-yarn-server-tests
- 0.24.0-SNAPSHOT
hadoop-yarn-server-tests
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 9997cb22ab8..12d7226c1e5 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/pom.xml
@@ -16,12 +16,11 @@
hadoop-yarn
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${yarn.version}
4.0.0
org.apache.hadoop
hadoop-yarn-server
- 0.24.0-SNAPSHOT
hadoop-yarn-server
pom
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 51a7de381a0..83d7c29a28f 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml
@@ -16,12 +16,11 @@
hadoop-yarn
org.apache.hadoop
- 0.24.0-SNAPSHOT
+ ${yarn.version}
4.0.0
org.apache.hadoop
hadoop-yarn-site
- 0.24.0-SNAPSHOT
hadoop-yarn-site
diff --git a/hadoop-mapreduce-project/hadoop-yarn/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/pom.xml
index 25480df3af7..051134904cf 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/pom.xml
@@ -14,15 +14,9 @@
-->
4.0.0
-
- org.apache.hadoop
- hadoop-project
- 0.24.0-SNAPSHOT
- ../../hadoop-project
-
org.apache.hadoop
hadoop-yarn
- 0.24.0-SNAPSHOT
+ ${yarn.version}
pom
hadoop-yarn
http://hadoop.apache.org/mapreduce
@@ -38,19 +32,6 @@
${install.pom}
${basedir}
-
-
-
- apache.releases.https
- Apache Release Distribution Repository
- https://repository.apache.org/service/local/staging/deploy/maven2
-
-
- apache.snapshots.https
- Apache Development Snapshot Repository
- https://repository.apache.org/content/repositories/snapshots
-
-
diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml
index 38c0f88dffe..2ad5b3dec0f 100644
--- a/hadoop-mapreduce-project/pom.xml
+++ b/hadoop-mapreduce-project/pom.xml
@@ -15,15 +15,9 @@
4.0.0
-
- org.apache.hadoop
- hadoop-project
- 0.24.0-SNAPSHOT
- ../hadoop-project
-
org.apache.hadoop
hadoop-mapreduce
- 0.24.0-SNAPSHOT
+ ${hadoop-mapreduce.version}
pom
hadoop-mapreduce
http://hadoop.apache.org/mapreduce/
@@ -42,19 +36,6 @@
${basedir}
-
-
- apache.releases.https
- Apache Release Distribution Repository
- https://repository.apache.org/service/local/staging/deploy/maven2
-
-
- apache.snapshots.https
- Apache Development Snapshot Repository
- https://repository.apache.org/content/repositories/snapshots
-
-
-
repository.jboss.org
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index edf3dee46d1..aa9b43f7fd6 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -14,11 +14,6 @@
-->
4.0.0
-
- org.apache.hadoop
- hadoop-main
- 0.24.0-SNAPSHOT
-
org.apache.hadoop
hadoop-project
0.24.0-SNAPSHOT
@@ -26,6 +21,39 @@
Apache Hadoop Project POM
pom
+
+
+ apache.releases.https
+ Apache Release Distribution Repository
+ https://repository.apache.org/service/local/staging/deploy/maven2
+
+
+ apache.snapshots.https
+ ${distMgmtSnapshotsName}
+ ${distMgmtSnapshotsUrl}
+
+
+
+
+
+ apache.snapshots.https
+ ${distMgmtSnapshotsName}
+ ${distMgmtSnapshotsUrl}
+
+
+
+
+
+ The Apache Software License, Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+
+
+ Apache Software Foundation
+ http://www.apache.org
+
+
false
true
@@ -37,13 +65,16 @@
UTF-8
UTF-8
-
-
+
+
${project.version}
1.0.9
${project.version}
+ Apache Development Snapshot Repository
+ https://repository.apache.org/content/repositories/snapshots
+
1.0.3
${project.build.directory}/test-dir
@@ -369,6 +400,11 @@
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ 1.0
+
org.apache.maven.plugins
maven-compiler-plugin
@@ -429,6 +465,11 @@
maven-checkstyle-plugin
2.6
+
+ org.apache.rat
+ apache-rat-plugin
+ 0.7
+
org.codehaus.mojo
native-maven-plugin
@@ -444,6 +485,11 @@
maven-source-plugin
2.1.2
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ 2.5
+
org.apache.avro
avro-maven-plugin
@@ -473,6 +519,44 @@
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ false
+
+
+
+ [3.0.0,)
+
+
+ 1.6
+
+
+
+
+
+ clean
+
+ enforce
+
+ pre-clean
+
+
+ default
+
+ enforce
+
+ validate
+
+
+ site
+
+ enforce
+
+ pre-site
+
+
+
org.apache.maven.plugins
maven-antrun-plugin
diff --git a/pom.xml b/pom.xml
index 16fd48d5f60..29adbe95be4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,27 +21,6 @@
Apache Hadoop Main
pom
-
-
- apache.releases.https
- Apache Release Distribution Repository
- https://repository.apache.org/service/local/staging/deploy/maven2
-
-
- apache.snapshots.https
- ${distMgmtSnapshotsName}
- ${distMgmtSnapshotsUrl}
-
-
-
-
-
- apache.snapshots.https
- ${distMgmtSnapshotsName}
- ${distMgmtSnapshotsUrl}
-
-
-
The Apache Software License, Version 2.0
@@ -54,11 +33,6 @@
http://www.apache.org
-
- Apache Development Snapshot Repository
- https://repository.apache.org/content/repositories/snapshots
-
-
hadoop-project
hadoop-project-dist
@@ -77,6 +51,11 @@
maven-enforcer-plugin
1.0
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+ 2.2-beta-3
+
org.apache.maven.plugins
maven-deploy-plugin
@@ -129,6 +108,12 @@
+
+ maven-deploy-plugin
+
+ true
+
+
org.apache.rat
apache-rat-plugin