Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10115. Exclude duplicate jars in hadoop package under different component's lib (Vinayakumar B via aw)

This commit is contained in:
Allen Wittenauer 2015-03-09 21:44:06 -07:00
parent 54639c7d7a
commit 47f7f18d4c
2 changed files with 78 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -187,6 +187,9 @@ Trunk (Unreleased)
HADOOP-11673. Skip using JUnit Assume in TestCodec. (Brahma Reddy Battula HADOOP-11673. Skip using JUnit Assume in TestCodec. (Brahma Reddy Battula
via cdouglas) via cdouglas)
HADOOP-10115. Exclude duplicate jars in hadoop package under different
component's lib (Vinayakumar B via aw)
BUG FIXES BUG FIXES
HADOOP-11473. test-patch says "-1 overall" even when all checks are +1 HADOOP-11473. test-patch says "-1 overall" even when all checks are +1

89
hadoop-dist/pom.xml
View File

@ -107,25 +107,86 @@
fi fi
} }
ROOT=`cd ../..;pwd` findFileInDir(){
local file="$1";
local dir="${2:-./share}";
local count=$(find "$dir" -iname "$file"|wc -l)
echo "$count";
}
copyIfNotExists(){
local src="$1"
local srcName=$(basename "$src")
local dest="$2";
if [ -f "$src" ]; then
if [[ "$srcName" != *.jar ]] || [ $(findFileInDir "$srcName") -eq "0" ]; then
local destDir=$(dirname "$dest")
mkdir -p "$destDir"
cp "$src" "$dest"
fi
else
for childPath in "$src"/* ;
do
child=$(basename "$childPath");
if [ "$child" == "doc" ] || [ "$child" == "webapps" ]; then
mkdir -p "$dest"/"$child"
cp -r "$src"/"$child"/* "$dest"/"$child"
continue;
fi
copyIfNotExists "$src"/"$child" "$dest"/"$child"
done
fi
}
#Copy all contents as is except the lib.
#for libs check for existence in share directory, if not exist then only copy.
copy(){
local src="$1";
local dest="$2";
if [ -d "$src" ]; then
for childPath in "$src"/* ;
do
child=$(basename "$childPath");
if [ "$child" == "share" ]; then
copyIfNotExists "$src"/"$child" "$dest"/"$child"
else
if [ -d "$src"/"$child" ]; then
mkdir -p "$dest"/"$child"
cp -r "$src"/"$child"/* "$dest"/"$child"
else
cp -r "$src"/"$child" "$dest"/"$child"
fi
fi
done
fi
}
# Shellcheck SC2086
ROOT=$(cd "${project.build.directory}"/../..;pwd)
echo echo
echo "Current directory `pwd`" echo "Current directory $(pwd)"
echo echo
run rm -rf hadoop-${project.version} run rm -rf hadoop-${project.version}
run mkdir hadoop-${project.version} run mkdir hadoop-${project.version}
run cd hadoop-${project.version} run cd hadoop-${project.version}
run cp $ROOT/LICENSE.txt . run cp "$ROOT"/LICENSE.txt .
run cp $ROOT/NOTICE.txt . run cp "$ROOT"/NOTICE.txt .
run cp $ROOT/README.txt . run cp "$ROOT"/README.txt .
run cp -r $ROOT/hadoop-common-project/hadoop-common/target/hadoop-common-${project.version}/* .
run cp -r $ROOT/hadoop-common-project/hadoop-nfs/target/hadoop-nfs-${project.version}/* . # Copy hadoop-common first so that it have always have all dependencies.
run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs/target/hadoop-hdfs-${project.version}/* . # Remaining projects will copy only libraries which are not present already in 'share' directory.
run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs-httpfs/target/hadoop-hdfs-httpfs-${project.version}/* . run copy "$ROOT"/hadoop-common-project/hadoop-common/target/hadoop-common-${project.version} .
run cp -r $ROOT/hadoop-common-project/hadoop-kms/target/hadoop-kms-${project.version}/* . run copy "$ROOT"/hadoop-common-project/hadoop-nfs/target/hadoop-nfs-${project.version} .
run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs-nfs/target/hadoop-hdfs-nfs-${project.version}/* . run copy "$ROOT"/hadoop-hdfs-project/hadoop-hdfs/target/hadoop-hdfs-${project.version} .
run cp -r $ROOT/hadoop-yarn-project/target/hadoop-yarn-project-${project.version}/* . run copy "$ROOT"/hadoop-hdfs-project/hadoop-hdfs-nfs/target/hadoop-hdfs-nfs-${project.version} .
run cp -r $ROOT/hadoop-mapreduce-project/target/hadoop-mapreduce-${project.version}/* . run copy "$ROOT"/hadoop-yarn-project/target/hadoop-yarn-project-${project.version} .
run cp -r $ROOT/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${project.version}/* . run copy "$ROOT"/hadoop-mapreduce-project/target/hadoop-mapreduce-${project.version} .
run copy "$ROOT"/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${project.version} .
#copy httpfs and kms as is
run cp -r "$ROOT"/hadoop-hdfs-project/hadoop-hdfs-httpfs/target/hadoop-hdfs-httpfs-${project.version}/* .
run cp -r "$ROOT"/hadoop-common-project/hadoop-kms/target/hadoop-kms-${project.version}/* .
echo echo
echo "Hadoop dist layout available at: ${project.build.directory}/hadoop-${project.version}" echo "Hadoop dist layout available at: ${project.build.directory}/hadoop-${project.version}"
echo echo