This is an automated email from the ASF dual-hosted git repository.
aboda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new 7e00bc7 MINIFICPP-961 - Update Apache RAT to 0.13
7e00bc7 is described below
commit 7e00bc7102bb36b8c386956fc7027720bd0a297b
Author: Arpad Boda <[email protected]>
AuthorDate: Wed Jul 10 12:46:07 2019 +0200
MINIFICPP-961 - Update Apache RAT to 0.13
Signed-off-by: Arpad Boda <[email protected]>
This closes #608
Approved by apiri on GH
---
CMakeLists.txt | 2 +-
cmake/RunApacheRAT.cmake | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d996fe0..006107a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -729,6 +729,6 @@ endif(NOT WIN32)
add_custom_target(
apache-rat
${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/RunApacheRAT.cmake
- COMMAND java -jar
${CMAKE_SOURCE_DIR}/thirdparty/apache-rat/apache-rat-0.12/apache-rat-0.12.jar
-E ${CMAKE_SOURCE_DIR}/thirdparty/apache-rat/.rat-excludes -d
${CMAKE_SOURCE_DIR} | grep -B 1 -A 15 Summary )
+ COMMAND java -jar
${CMAKE_SOURCE_DIR}/thirdparty/apache-rat/apache-rat-0.13/apache-rat-0.13.jar
-E ${CMAKE_SOURCE_DIR}/thirdparty/apache-rat/.rat-excludes -d
${CMAKE_SOURCE_DIR} | grep -B 1 -A 15 Summary )
feature_summary(WHAT ALL FILENAME ${CMAKE_BINARY_DIR}/all.log)
diff --git a/cmake/RunApacheRAT.cmake b/cmake/RunApacheRAT.cmake
index 76e329b..362a43b 100644
--- a/cmake/RunApacheRAT.cmake
+++ b/cmake/RunApacheRAT.cmake
@@ -28,14 +28,16 @@ execute_process(COMMAND curl -s
https://www.apache.org/dyn/closer.lua/?asjson=1
# Make use of parent thirdparty by adjusting relative to the source of this
CMake file
set(PARENT_THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/../thirdparty")
-set(RAT_BASENAME "apache-rat-0.12")
+set(RAT_BASENAME "apache-rat-0.13")
set(RAT_DIR "${PARENT_THIRDPARTY_DIR}/apache-rat")
set(RAT_BINARY "${RAT_DIR}/${RAT_BASENAME}-bin/${RAT_BASENAME}.jar")
file(DOWNLOAD
"${MIRROR_URL}creadur/${RAT_BASENAME}/${RAT_BASENAME}-bin.tar.gz"
"${RAT_DIR}/${RAT_BASENAME}-bin.tar.gz"
- EXPECTED_HASH
SHA512=460d53fa3e1546d960bd03ebd97c930a39306cffd98c9ebc09bf22f9e50a9723578b98c4e7dc71dd6f19dfb6dae00811cb11a4eabce70c21502a6cef2d9fd2fa
)
+ EXPECTED_HASH
SHA512=2C1E12EACE7B80A9B6373C2F5080FBF63D3FA8D9248F3A17BD05DE961CD3CA3C4549817B8B7320A84F0C323194EDAD0ABDB86BDFEC3976227A228E2143E14A54
)
+
+
execute_process(
COMMAND tar xf "${RAT_DIR}/${RAT_BASENAME}-bin.tar.gz" -C "${RAT_DIR}"