diff --git a/BUILDING.txt b/BUILDING.txt
index c2ac00255f..01b2a68424 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -43,7 +43,7 @@ Maven build goals:
* Run clover : mvn test -Pclover [-DcloverLicenseLocation=${user.name}/.clover.license]
* Run Rat : mvn apache-rat:check
* Build javadocs : mvn javadoc:javadoc
- * Build TAR : mvn package [-Ptar][-Pbintar][-Pdocs][-Psrc][-Pnative]
+ * Build TAR : mvn package [-Ptar][-Pdocs][-Psrc][-Pnative]
Build options:
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-bintar.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-bintar.xml
deleted file mode 100644
index 13babf4a73..0000000000
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-bintar.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
- hadoop-bintar
-
- dir
-
- false
-
-
- ${basedir}/src/main/bin
- /bin
-
- *.sh
-
- 0755
-
-
- ${basedir}/src/main/conf
- /etc/hadoop
-
-
- ${basedir}/src/main/bin
- /libexec
-
- *-config.sh
-
- 0755
-
-
- ${basedir}/src/main/bin
- /sbin
-
- *.sh
-
-
- hadoop-config.sh
-
- 0755
-
-
- ${basedir}/src/main/packages
- /sbin
-
- *.sh
-
- 0755
-
-
- ${basedir}
- /share/doc/hadoop/${hadoop.component}
-
- *.txt
-
-
-
- ${project.build.directory}/webapps
- /share/hadoop/${hadoop.component}/webapps
-
-
- ${basedir}/src/main/conf
- /share/hadoop/${hadoop.component}/templates
-
- *-site.xml
-
-
-
- ${project.build.directory}
- /share/hadoop/${hadoop.component}
-
- ${project.artifactId}-${project.version}.jar
- ${project.artifactId}-${project.version}-tests.jar
- ${project.artifactId}-${project.version}-sources.jar
- ${project.artifactId}-${project.version}-test-sources.jar
-
-
-
- ${basedir}/dev-support/jdiff
- /share/hadoop/${hadoop.component}/jdiff
-
-
- ${project.build.directory}/site/jdiff/xml
- /share/hadoop/${hadoop.component}/jdiff
-
-
-
-
- /share/hadoop/${hadoop.component}/lib
- false
- runtime
- false
-
- org.apache.ant:*:jar
- org.apache.hadoop:hadoop-*:jar
- jdiff:jdiff:jar
-
-
-
-
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml
index d68efa0044..88ed8b0edf 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml
@@ -15,27 +15,24 @@
limitations under the License.
-->
- hadoop-tar
+ hadoop-bintar
dir
false
-
- ${basedir}
- /
-
- *.txt
-
-
${basedir}/src/main/bin
/bin
-
- *
-
+
+ *.sh
+
0755
+
+ ${basedir}/src/main/conf
+ /etc/hadoop
+
${basedir}/src/main/bin
/libexec
@@ -45,49 +42,78 @@
0755
- ${basedir}/src/main/conf
- /conf
-
-
- ${basedir}/src/main/webapps
- /webapps
-
- proto-*-web.xml
-
-
-
- ${project.build.directory}/webapps
- /webapps
-
- proto-*-web.xml
-
-
-
- ${project.build.directory}/site
- /docs
-
-
- ${project.build.directory}
- /
+ ${basedir}/src/main/bin
+ /sbin
- ${project.artifactId}-${project.version}.jar
- ${project.artifactId}-${project.version}-tests.jar
+ *.sh
+
+
+ hadoop-config.sh
+
+ 0755
+
+
+ ${basedir}/src/main/packages
+ /sbin
+
+ *.sh
+
+ 0755
+
+
+ ${basedir}
+ /share/doc/hadoop/${hadoop.component}
+
+ *.txt
+
+ ${project.build.directory}/webapps
+ /share/hadoop/${hadoop.component}/webapps
+
+
+ ${basedir}/src/main/conf
+ /share/hadoop/${hadoop.component}/templates
+
+ *-site.xml
+
+
+
+ ${project.build.directory}
+ /share/hadoop/${hadoop.component}
+
+ ${project.artifactId}-${project.version}.jar
+ ${project.artifactId}-${project.version}-tests.jar
+ ${project.artifactId}-${project.version}-sources.jar
+ ${project.artifactId}-${project.version}-test-sources.jar
+
+
+
+ ${basedir}/dev-support/jdiff
+ /share/hadoop/${hadoop.component}/jdiff
+
+
+ ${project.build.directory}/site/jdiff/xml
+ /share/hadoop/${hadoop.component}/jdiff
+
+
+ ${project.build.directory}/site
+ /share/doc/hadoop/${hadoop.component}
+
${project.build.directory}/src
- /src
+ /share/hadoop/${hadoop.component}/src
- /lib
+ /share/hadoop/${hadoop.component}/lib
false
runtime
false
org.apache.ant:*:jar
- org.apache.hadoop:hadoop-*:*:*:*
+ org.apache.hadoop:hadoop-*:jar
jdiff:jdiff:jar
diff --git a/hadoop-common/CHANGES.txt b/hadoop-common/CHANGES.txt
index a33e246696..0485e37bef 100644
--- a/hadoop-common/CHANGES.txt
+++ b/hadoop-common/CHANGES.txt
@@ -334,6 +334,9 @@ Trunk (unreleased changes)
HADOOP-7264. Bump avro version to at least 1.4.1. (Alejandro Abdelnur via
tomwhite)
+ HADOOP-7498. Remove legacy TAR layout creation. (Alejandro Abdelnur via
+ tomwhite)
+
OPTIMIZATIONS
HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
diff --git a/hadoop-project-distro/pom.xml b/hadoop-project-distro/pom.xml
index 9e7fbc6272..761e116f61 100644
--- a/hadoop-project-distro/pom.xml
+++ b/hadoop-project-distro/pom.xml
@@ -387,7 +387,7 @@
UNTAR='tar xfBp -'
LIB_DIR="${BUILD_DIR}/native/target/usr/local/lib"
if [ -d $${LIB_DIR} ] ; then
- TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}/lib/native/${build.platform}"
+ TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}/lib"
mkdir -p $${TARGET_DIR}
cd $${LIB_DIR}
$$TAR lib* | (cd $${TARGET_DIR}/; $$UNTAR)
@@ -462,113 +462,5 @@
-
-
- bintar
-
- false
-
-
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
-
-
- pre-bintar
- prepare-package
-
- run
-
-
-
-
-
-
- which cygpath 2> /dev/null
- if [ $? = 1 ]; then
- BUILD_DIR="${project.build.directory}"
- else
- BUILD_DIR=`cygpath --unix '${project.build.directory}'`
- fi
- TAR='tar cf -'
- UNTAR='tar xfBp -'
- LIB_DIR="${BUILD_DIR}/native/target/usr/local/lib"
- if [ -d $${LIB_DIR} ] ; then
- TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}-bin/lib"
- mkdir -p $${TARGET_DIR}
- cd $${LIB_DIR}
- $$TAR lib* | (cd $${TARGET_DIR}/; $$UNTAR)
- if [ "${bundle.snappy}" = "true" ] ; then
- cd ${snappy.lib}
- $$TAR *snappy* | (cd $${TARGET_DIR}/; $$UNTAR)
- fi
- fi
-
-
-
-
-
-
-
-
- bintar
- package
-
- run
-
-
-
-
-
-
- which cygpath 2> /dev/null
- if [ $? = 1 ]; then
- BUILD_DIR="${project.build.directory}"
- else
- BUILD_DIR=`cygpath --unix '${project.build.directory}'`
- fi
- cd ${BUILD_DIR}
- tar czf ${project.artifactId}-${project.version}-bin.tar.gz ${project.artifactId}-${project.version}-bin
-
-
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- org.apache.hadoop
- hadoop-assemblies
- ${hadoop.assemblies.version}
-
-
-
-
- pre-bintar
- prepare-package
-
- single
-
-
- false
- false
- ${project.artifactId}-${project.version}-bin
-
- hadoop-bintar
-
-
-
-
-
-
-
-