You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/10/17 13:09:32 UTC

[flink] 02/03: [FLINK-14008][release] Generate binary licensing during release

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch release-1.8
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 8997f85b608a09b8b1eab2d38529f50f9310a692
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Wed Oct 9 10:20:57 2019 +0200

    [FLINK-14008][release] Generate binary licensing during release
---
 tools/releasing/collect_license_files.sh | 5 ++---
 tools/releasing/create_binary_release.sh | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/releasing/collect_license_files.sh b/tools/releasing/collect_license_files.sh
index 5aa7585..754b5e8 100755
--- a/tools/releasing/collect_license_files.sh
+++ b/tools/releasing/collect_license_files.sh
@@ -49,15 +49,14 @@ do
 	(cd "${DIR}" && jar xf ${JAR} META-INF/NOTICE META-INF/licenses)
 done
 
-NOTICE="${DST}/NOTICE-binary"
+NOTICE="${DST}/NOTICE"
 [ -f "${NOTICE}" ] && rm "${NOTICE}"
 cp "${NOTICE_BINARY_PREAMBLE}" "${NOTICE}"
 (export LC_ALL=C; find "${TMP}" -name "NOTICE" | sort | xargs cat >> "${NOTICE}")
 
-LICENSES="${DST}/licenses-binary"
+LICENSES="${DST}/licenses"
 [ -f "${LICENSES}" ] && rm -r "${LICENSES}"
 find "${TMP}" -name "licenses" -type d -exec cp -r -- "{}" "${DST}" \;
-mv "${DST}/licenses" "${LICENSES}"
 cp "${SLF4J_LICENSE}" "${LICENSES}"
 
 rm -r "${TMP}"
diff --git a/tools/releasing/create_binary_release.sh b/tools/releasing/create_binary_release.sh
index fac4a1a..163d754 100755
--- a/tools/releasing/create_binary_release.sh
+++ b/tools/releasing/create_binary_release.sh
@@ -81,6 +81,7 @@ make_binary_release() {
   $MVN clean package $FLAGS -Prelease -pl flink-dist -am -Dgpg.skip -Dcheckstyle.skip=true -DskipTests
 
   cd flink-dist/target/flink-${RELEASE_VERSION}-bin
+  ${FLINK_DIR}/tools/releasing/collect_license_files.sh ./flink-${RELEASE_VERSION} ./flink-${RELEASE_VERSION}
   tar czf "${dir_name}.tgz" flink-*
 
   cp flink-*.tgz ${RELEASE_DIR}