From 8e4c51b30361b0af54b96dc4c8bcfee1442b9da0 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 6 Jan 2022 10:36:45 +0000 Subject: [PATCH] ACS-2382 Upload CSV license report to S3. --- _ci/prepare_release_deploy.sh | 8 +++----- _ci/prepare_staging_deploy.sh | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/_ci/prepare_release_deploy.sh b/_ci/prepare_release_deploy.sh index 7ea6308b..abf63d91 100644 --- a/_ci/prepare_release_deploy.sh +++ b/_ci/prepare_release_deploy.sh @@ -10,11 +10,9 @@ export VERSION=$(git describe --abbrev=0 --tags) mkdir -p deploy_dir -# Download the WhiteSource report -# mvn -B org.alfresco:whitesource-downloader-plugin:inventoryReport \ -# -N \ -# "-Dorg.whitesource.product=Transform Service" \ -# -DsaveReportAs=deploy_dir/3rd-party.xlsx +# Create third party license csv file and add it to the deploy directory. +git clone --depth=1 https://github.com/Alfresco/third-party-license-overrides.git +python3 ./third-party-license-overrides/thirdPartyLicenseCSVCreator.py --project "`pwd`" --version "${VERSION}" --combined --output "deploy_dir" echo "Local deploy directory content:" ls -lA deploy_dir diff --git a/_ci/prepare_staging_deploy.sh b/_ci/prepare_staging_deploy.sh index 82237779..32dbb8c9 100644 --- a/_ci/prepare_staging_deploy.sh +++ b/_ci/prepare_staging_deploy.sh @@ -10,11 +10,9 @@ export VERSION=$(git describe --abbrev=0 --tags) mkdir -p deploy_dir -# Download the WhiteSource report -# mvn -B org.alfresco:whitesource-downloader-plugin:inventoryReport \ -# -N \ -# "-Dorg.whitesource.product=Transform Service" \ -# -DsaveReportAs=deploy_dir/3rd-party.xlsx +# Create third party license csv file and add it to the deploy directory. +git clone --depth=1 https://github.com/Alfresco/third-party-license-overrides.git +python3 ./third-party-license-overrides/thirdPartyLicenseCSVCreator.py --project "`pwd`" --version "${VERSION}" --combined --output "deploy_dir" echo "Local deploy directory content:" ls -lA deploy_dir