diff --git a/BUILDING.txt b/BUILDING.txt index 4a4bc9998b9..662bd2577a3 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -49,6 +49,7 @@ Maven build goals: * Run Rat : mvn apache-rat:check * Build javadocs : mvn javadoc:javadoc * Build distribution : mvn package [-Pdist][-Pdocs][-Psrc][-Pnative][-Dtar] + * Change Hadoop version : mvn versions:set -DnewVersion=NEWVERSION Build options: diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 3a4aac49c8a..1c2cfd26df3 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -1806,6 +1806,8 @@ Release 0.23.0 - Unreleased MAPREDUCE-3183. hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml missing license header. (Hitesh Shah via tucu). + MAPREDUCE-3003. Publish MR JARs to Maven snapshot repository. (tucu) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES 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 896dcefa22b..5deedd65465 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,15 +16,15 @@ hadoop-mapreduce-client org.apache.hadoop - ${hadoop-mapreduce.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-mapreduce-client-app + 0.23.0-SNAPSHOT hadoop-mapreduce-client-app - ${project.artifact.file} ${project.build.directory}/${project.name} ${project.parent.parent.basedir} 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 d367a9ead20..afe50d441a6 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,15 +16,15 @@ hadoop-mapreduce-client org.apache.hadoop - ${hadoop-mapreduce.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-mapreduce-client-common + 0.23.0-SNAPSHOT hadoop-mapreduce-client-common - ${project.artifact.file} ${project.parent.parent.basedir} 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 be98eb7cdf9..47cbac0bbfa 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,15 +16,15 @@ hadoop-mapreduce-client org.apache.hadoop - ${hadoop-mapreduce.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-mapreduce-client-core + 0.23.0-SNAPSHOT hadoop-mapreduce-client-core - ${project.artifact.file} ${project.parent.parent.basedir} 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 b9e409cad67..daa205e7303 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,15 +16,15 @@ hadoop-mapreduce-client org.apache.hadoop - ${hadoop-mapreduce.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-mapreduce-client-hs + 0.23.0-SNAPSHOT hadoop-mapreduce-client-hs - ${project.artifact.file} ${project.parent.parent.basedir} 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 ef388fcd86a..f2f4e624ad1 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,15 +16,15 @@ hadoop-mapreduce-client org.apache.hadoop - ${hadoop-mapreduce.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-mapreduce-client-jobclient + 0.23.0-SNAPSHOT hadoop-mapreduce-client-jobclient - ${project.artifact.file} always ${project.parent.parent.basedir} 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 20a27eebd62..c755cbfe08f 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,15 +16,15 @@ hadoop-mapreduce-client org.apache.hadoop - ${hadoop-mapreduce.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-mapreduce-client-shuffle + 0.23.0-SNAPSHOT hadoop-mapreduce-client-shuffle - ${project.artifact.file} ${project.parent.parent.basedir} diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index 6178f43356f..206bf77cf6c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -16,11 +16,13 @@ 4.0.0 org.apache.hadoop - hadoop-mapreduce - ${hadoop-mapreduce.version} + hadoop-project + 0.23.0-SNAPSHOT + ../../hadoop-project org.apache.hadoop hadoop-mapreduce-client + 0.23.0-SNAPSHOT hadoop-mapreduce-client pom @@ -35,18 +37,18 @@ org.apache.hadoop hadoop-yarn - ${yarn.version} + ${project.version} pom org.apache.hadoop hadoop-yarn-api - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-yarn-server - ${yarn.version} + ${project.version} pom @@ -57,82 +59,205 @@ org.apache.hadoop hadoop-yarn-server-common - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-hdfs - ${hadoop-hdfs.version} + ${project.version} org.apache.hadoop hadoop-yarn-common - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-yarn-common - ${yarn.version} + ${project.version} test-jar org.apache.hadoop hadoop-yarn-server-tests - ${yarn.version} + ${project.version} test-jar org.apache.hadoop hadoop-yarn-server-nodemanager - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-resourcemanager - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-resourcemanager - ${yarn.version} + ${project.version} test-jar org.apache.hadoop hadoop-mapreduce-client-core - ${hadoop-mapreduce.version} + ${project.version} org.apache.hadoop hadoop-mapreduce-client-common - ${hadoop-mapreduce.version} + ${project.version} org.apache.hadoop hadoop-mapreduce-client-app - ${hadoop-mapreduce.version} + ${project.version} org.apache.hadoop hadoop-mapreduce-client-app - ${hadoop-mapreduce.version} + ${project.version} test-jar org.apache.hadoop hadoop-mapreduce-client-hs - ${hadoop-mapreduce.version} + ${project.version} org.apache.hadoop hadoop-mapreduce-client-shuffle - ${hadoop-mapreduce.version} + ${project.version} + + + com.google.protobuf + protobuf-java + 2.4.0a + + + org.apache.avro + avro + 1.5.3 + + + org.mortbay.jetty + jetty + + + org.apache.ant + ant + + + org.jboss.netty + netty + + + org.apache.velocity + velocity + + + org.slf4j + slf4j-api + + + paranamer-ant + com.thoughtworks.paranamer + + + + + org.apache.hadoop + hadoop-common + ${project.version} + provided + + + commons-el + commons-el + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + org.mortbay.jetty + jsp-2.1-jetty + + + hsqldb + hsqldb + + + + + + org.slf4j + slf4j-api + 1.6.1 + + + org.slf4j + slf4j-log4j12 + 1.6.1 + + + org.apache.hadoop + hadoop-annotations + ${project.version} + + + org.mockito + mockito-all + 1.8.5 + test + + + org.apache.hadoop + hadoop-common + ${project.version} + test-jar + test + + + org.apache.hadoop + + hadoop-hdfs + ${project.version} + + + com.google.inject.extensions + guice-servlet + 2.0 + + + junit + junit + 4.8.2 + + + org.jboss.netty + netty + 3.2.3.Final + + + com.cenqua.clover + clover + 3.0.2 + + + + hadoop-mapreduce-client-core hadoop-mapreduce-client-common 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 52fe416f468..91dbbae1d67 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml @@ -16,15 +16,15 @@ hadoop-yarn org.apache.hadoop - ${yarn.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-yarn-api + 0.23.0-SNAPSHOT hadoop-yarn-api - ${project.artifact.file} ${project.parent.basedir} 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 406ec436d5a..4ac81b470f5 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,15 +16,15 @@ hadoop-yarn-applications org.apache.hadoop - ${yarn.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-yarn-applications-distributedshell + 0.23.0-SNAPSHOT hadoop-yarn-applications-distributedshell - ${project.artifact.file} ${project.parent.parent.basedir} @@ -32,37 +32,37 @@ org.apache.hadoop hadoop-yarn-api - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-yarn-common - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-nodemanager test - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-resourcemanager test - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-common test - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-tests test-jar test - ${yarn.version} + ${project.version} 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 713731004f6..32b85a60580 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/pom.xml @@ -16,11 +16,12 @@ hadoop-yarn org.apache.hadoop - ${yarn.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-yarn-applications + 0.23.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 a2f6bbfccab..15d49f5594b 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -16,15 +16,15 @@ hadoop-yarn org.apache.hadoop - ${yarn.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-yarn-common + 0.23.0-SNAPSHOT hadoop-yarn-common - ${project.artifact.file} ${project.parent.basedir} @@ -109,7 +109,7 @@ scripts/saveVersion.sh - ${yarn.version} + ${project.version} ${project.build.directory} 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 ed6c3b5a4d1..e3505135f29 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,15 +16,15 @@ hadoop-yarn-server org.apache.hadoop - ${yarn.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-yarn-server-common + 0.23.0-SNAPSHOT hadoop-yarn-server-common - ${project.artifact.file} ${project.parent.parent.basedir} 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 7017342993c..b35a10c2ed7 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,15 +16,15 @@ hadoop-yarn-server org.apache.hadoop - ${yarn.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-yarn-server-nodemanager + 0.23.0-SNAPSHOT hadoop-yarn-server-nodemanager - ${project.artifact.file} ${project.parent.parent.basedir} /etc/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 9191205e671..f614cc5ae36 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,15 +16,15 @@ hadoop-yarn-server org.apache.hadoop - ${yarn.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-yarn-server-resourcemanager + 0.23.0-SNAPSHOT hadoop-yarn-server-resourcemanager - ${project.artifact.file} always ${project.parent.parent.basedir} 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 e3b44bd0a46..3bcce962cc9 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,14 +16,14 @@ hadoop-yarn-server org.apache.hadoop - ${yarn.version} + 0.23.0-SNAPSHOT org.apache.hadoop hadoop-yarn-server-tests + 0.23.0-SNAPSHOT hadoop-yarn-server-tests - ${project.artifact.file} ${project.parent.parent.basedir} 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 392af1bfbf2..b0facf7c5ea 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 @@ -16,7 +16,7 @@ hadoop-yarn-server org.apache.hadoop - ${yarn.version} + 0.23.0-SNAPSHOT 4.0.0 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 29fc37f31d5..92fbd64ac79 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/pom.xml @@ -16,11 +16,12 @@ hadoop-yarn org.apache.hadoop - ${yarn.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-yarn-server + 0.23.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 83d7c29a28f..a6cf930552e 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml @@ -16,15 +16,15 @@ hadoop-yarn org.apache.hadoop - ${yarn.version} + 0.23.0-SNAPSHOT 4.0.0 org.apache.hadoop hadoop-yarn-site + 0.23.0-SNAPSHOT hadoop-yarn-site - ${project.artifact.file} ${project.parent.parent.basedir} diff --git a/hadoop-mapreduce-project/hadoop-yarn/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/pom.xml index 687f2ee2348..7dab2046bb8 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/pom.xml @@ -14,9 +14,15 @@ --> 4.0.0 + + org.apache.hadoop + hadoop-project + 0.23.0-SNAPSHOT + ../../hadoop-project + org.apache.hadoop hadoop-yarn - ${yarn.version} + 0.23.0-SNAPSHOT pom hadoop-yarn http://hadoop.apache.org/mapreduce @@ -25,12 +31,6 @@ UTF-8 true 600000 - ${project.version} - 0.23.0-SNAPSHOT - 0.23.0-SNAPSHOT - 0.23.0-SNAPSHOT - ${project.build.directory}/saner-pom.xml - ${install.pom} once ${basedir} @@ -54,7 +54,140 @@ + + + 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 + + + + + com.google.protobuf + protobuf-java + 2.4.0a + + + org.apache.avro + avro + 1.5.3 + + + org.mortbay.jetty + jetty + + + org.apache.ant + ant + + + org.jboss.netty + netty + + + org.apache.velocity + velocity + + + org.slf4j + slf4j-api + + + paranamer-ant + com.thoughtworks.paranamer + + + + + org.apache.hadoop + hadoop-common + ${project.version} + provided + + + commons-el + commons-el + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + org.mortbay.jetty + jsp-2.1-jetty + + + hsqldb + hsqldb + + + + + + org.slf4j + slf4j-api + 1.6.1 + + + org.slf4j + slf4j-log4j12 + 1.6.1 + + + org.apache.hadoop + hadoop-annotations + ${project.version} + + + org.mockito + mockito-all + 1.8.5 + test + + + org.apache.hadoop + hadoop-common + ${project.version} + test-jar + test + + + org.apache.hadoop + + hadoop-hdfs + ${project.version} + + + com.google.inject.extensions + guice-servlet + 2.0 + + + junit + junit + 4.8.2 + + + org.jboss.netty + netty + 3.2.3.Final + + + com.cenqua.clover + clover + 3.0.2 + + org.apache.avro avro @@ -94,7 +227,7 @@ org.apache.hadoop hadoop-common - ${hadoop-common.version} + ${project.version} org.apache.avro @@ -125,7 +258,7 @@ org.apache.hadoop hadoop-annotations - ${hadoop-common.version} + ${project.version} junit @@ -147,14 +280,14 @@ org.apache.hadoop hadoop-common - ${hadoop-common.version} + ${project.version} test-jar test org.apache.hadoop hadoop-hdfs - ${hadoop-hdfs.version} + ${project.version} runtime @@ -189,23 +322,23 @@ org.apache.hadoop hadoop-yarn-api - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-yarn-common - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-yarn-common - ${yarn.version} + ${project.version} test-jar org.apache.hadoop hadoop-yarn-server-common - ${yarn.version} + ${project.version} org.apache.hadoop @@ -215,12 +348,12 @@ org.apache.hadoop hadoop-yarn-server-resourcemanager - ${yarn.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-nodemanager - ${yarn.version} + ${project.version} org.apache.zookeeper @@ -329,86 +462,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - org.apache.hadoop - hadoop-assemblies - ${hadoop.assemblies.version} - - - - gnu - false - false - ${project.artifactId}-${project.version} - - hadoop-mapreduce-dist - - - - - tar - package - - single - - - - - - maven-antrun-plugin - - - santize-pom - package - - - - - - - - - - - - - - - - - run - - - - - - maven-install-plugin - - - install-sanitized-pom - - ${install.file} - ${install.pom} - - install - - install-file - - - - org.codehaus.mojo findbugs-maven-plugin diff --git a/hadoop-mapreduce-project/ivy.xml b/hadoop-mapreduce-project/ivy.xml index 02152e25c52..9f0cfb8d8f0 100644 --- a/hadoop-mapreduce-project/ivy.xml +++ b/hadoop-mapreduce-project/ivy.xml @@ -148,6 +148,7 @@ + diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml index e791fe9f2e3..3c55c0d9a66 100644 --- a/hadoop-mapreduce-project/pom.xml +++ b/hadoop-mapreduce-project/pom.xml @@ -15,9 +15,15 @@ 4.0.0 + + org.apache.hadoop + hadoop-project + 0.23.0-SNAPSHOT + ../hadoop-project + org.apache.hadoop hadoop-mapreduce - ${hadoop-mapreduce.version} + 0.23.0-SNAPSHOT pom hadoop-mapreduce http://hadoop.apache.org/mapreduce/ @@ -26,36 +32,15 @@ UTF-8 true 600000 - ${project.version} - 0.23.0-SNAPSHOT - 0.23.0-SNAPSHOT - 0.23.0-SNAPSHOT - 0.23.0-SNAPSHOT - ${project.build.directory}/saner-pom.xml - ${install.pom} once ${basedir} - - - - repository.jboss.org - http://repository.jboss.org/nexus/content/groups/public/ - - false - - - - apache.snapshots - http://repository.apache.org/snapshots - - - - true - - - - + + + hadoop-yarn + hadoop-mapreduce-client + + com.google.protobuf @@ -96,7 +81,7 @@ org.apache.hadoop hadoop-common - ${hadoop-common.version} + ${project.version} provided @@ -121,7 +106,7 @@ - + org.slf4j slf4j-api @@ -135,7 +120,7 @@ org.apache.hadoop hadoop-annotations - ${hadoop-common.version} + ${project.version} org.mockito @@ -146,7 +131,7 @@ org.apache.hadoop hadoop-common - ${hadoop-common.version} + ${project.version} test-jar test @@ -154,7 +139,7 @@ org.apache.hadoop hadoop-hdfs - ${hadoop-hdfs.version} + ${project.version} com.google.inject.extensions @@ -181,9 +166,9 @@ clover 3.0.2 - + - + @@ -276,37 +261,6 @@ maven-antrun-plugin - - santize-pom - package - - - - - - - - - - - - - - - - - run - - tar package @@ -336,22 +290,6 @@ - - maven-install-plugin - - - install-sanitized-pom - - ${install.file} - ${install.pom} - - install - - install-file - - - - com.atlassian.maven.plugins maven-clover2-plugin @@ -447,10 +385,6 @@ - - hadoop-yarn - hadoop-mapreduce-client - diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml index 9ae44367db4..014ee3ad87a 100644 --- a/hadoop-project-dist/pom.xml +++ b/hadoop-project-dist/pom.xml @@ -400,7 +400,7 @@ org.apache.hadoop hadoop-assemblies - ${hadoop.assemblies.version} + ${project.version} diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 8df59bbbefb..55185d61c5e 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -14,6 +14,11 @@ --> 4.0.0 + + org.apache.hadoop + hadoop-main + 0.23.0-SNAPSHOT + org.apache.hadoop hadoop-project 0.23.0-SNAPSHOT @@ -21,39 +26,6 @@ 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 @@ -65,16 +37,13 @@ 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 @@ -88,7 +57,7 @@ org.apache.hadoop hadoop-assemblies - ${hadoop.assemblies.version} + ${project.version} org.apache.hadoop @@ -412,11 +381,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - 1.0 - org.apache.maven.plugins maven-compiler-plugin @@ -477,11 +441,6 @@ maven-checkstyle-plugin 2.6 - - org.apache.rat - apache-rat-plugin - 0.7 - org.codehaus.mojo native-maven-plugin @@ -497,11 +456,6 @@ maven-source-plugin 2.1.2 - - org.apache.maven.plugins - maven-deploy-plugin - 2.5 - org.apache.avro avro-maven-plugin diff --git a/pom.xml b/pom.xml index 7a747dfc753..d99c723a1d6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,34 @@ 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} + + + repository.jboss.org + http://repository.jboss.org/nexus/content/groups/public/ + + false + + + + The Apache Software License, Version 2.0 @@ -33,6 +61,11 @@ http://www.apache.org + + Apache Development Snapshot Repository + https://repository.apache.org/content/repositories/snapshots + + hadoop-project hadoop-project-dist @@ -52,11 +85,6 @@ maven-enforcer-plugin 1.0 - - org.apache.maven.plugins - maven-assembly-plugin - 2.2-beta-3 - org.apache.maven.plugins maven-deploy-plugin @@ -114,12 +142,6 @@ - - maven-deploy-plugin - - true - - org.apache.rat apache-rat-plugin