Repository: yetus Updated Branches: refs/heads/master ad5561ac9 -> 9b5b7261f
YETUS-236. Binary artifact LICENSE/NOTICE claims to include several third party dependencies that are not present. Signed-off-by: Sean Busbey <[email protected]> Signed-off-by: Chris Nauroth <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/yetus/repo Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/9b5b7261 Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/9b5b7261 Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/9b5b7261 Branch: refs/heads/master Commit: 9b5b7261f184fbce3c01208f0ac627b0c42e10ac Parents: ad5561a Author: Allen Wittenauer <[email protected]> Authored: Tue Jan 19 13:10:55 2016 -0800 Committer: Allen Wittenauer <[email protected]> Committed: Wed Feb 3 13:10:31 2016 -0800 ---------------------------------------------------------------------- LICENSE | 2 ++ NOTICE | 3 ++- build.sh | 13 ++++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/yetus/blob/9b5b7261/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index fcf6e65..5d33543 100644 --- a/LICENSE +++ b/LICENSE @@ -203,6 +203,8 @@ ---- +Additional licenses for the Apache Yetus Source/Website: +---- This project incorporates portions of the Bootstrap project available under the MIT license: http://git-wip-us.apache.org/repos/asf/yetus/blob/9b5b7261/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 772ac5f..a976ff3 100644 --- a/NOTICE +++ b/NOTICE @@ -5,7 +5,8 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). --- -This project includes portions of the following projects: +Additional licenses for the Apache Yetus Source/Website: +--- * Bootstrap: Copyright (c) 2011-2015 Twitter, Inc * GLYPHICONS FREE: Copyright (c) 2010-2015 Jan Kovarik http://git-wip-us.apache.org/repos/asf/yetus/blob/9b5b7261/build.sh ---------------------------------------------------------------------- diff --git a/build.sh b/build.sh index ccdebb2..f0545d1 100755 --- a/build.sh +++ b/build.sh @@ -130,7 +130,18 @@ bin_tarball="target/bin-dir/yetus-${YETUS_VERSION}" echo "creating staging area for convenience binary at '$(pwd)/${bin_tarball}'" rm -rf "${bin_tarball}" 2>/dev/null || true mkdir -p "${bin_tarball}" -cp LICENSE NOTICE target/RELEASENOTES.md target/CHANGES.md "${bin_tarball}" + +for i in LICENSE NOTICE; do + lines=$(grep -n 'Apache Yetus Source' "${i}" | cut -f1 -d:) + if [[ -z "${lines}" ]]; then + cp -p "${i}" "${bin_tarball}" + else + ((lines=lines-2)) + head -n "${lines}" "${i}" > "${bin_tarball}/${i}" + fi +done + +cp target/RELEASENOTES.md target/CHANGES.md "${bin_tarball}" cp -r asf-site-src/publish/documentation/in-progress "${bin_tarball}/docs" mkdir -p "${bin_tarball}/lib"
