This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
The following commit(s) were added to refs/heads/master by this push:
new a3119db minor tweaks to scripts to do licensing and version changes
a3119db is described below
commit a3119db6b6823fa21632bd618ef34ae5198a5f19
Author: Alex Heneveld <[email protected]>
AuthorDate: Fri Oct 23 20:38:01 2020 +0100
minor tweaks to scripts to do licensing and version changes
---
dist/licensing/generate-all.sh | 2 +-
dist/licensing/generate-license-and-notice.sh | 7 ++++---
release/change-version.sh | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dist/licensing/generate-all.sh b/dist/licensing/generate-all.sh
index 58f90ef..2792b68 100755
--- a/dist/licensing/generate-all.sh
+++ b/dist/licensing/generate-all.sh
@@ -55,7 +55,7 @@ prefix_and_join_array() {
PREFIX=$2
JOIN_BEFORE_PREFIX=$1
JOIN_AFTER_PREFIX=$3
- echo -n ${PREFIX}$4
+ echo -n "${PREFIX}$4"
shift 4
while (($# >= 1)) ; do
echo -n "${JOIN_BEFORE_PREFIX}${PREFIX}${JOIN_AFTER_PREFIX}$1"
diff --git a/dist/licensing/generate-license-and-notice.sh
b/dist/licensing/generate-license-and-notice.sh
index 4fda600..9273e60 100755
--- a/dist/licensing/generate-license-and-notice.sh
+++ b/dist/licensing/generate-license-and-notice.sh
@@ -71,6 +71,7 @@ LICENSES=()
NOTICE_SECTION_TYPE=()
NOTICE_SECTION_ARG=()
LIBRARIES=()
+LICENSE_MVN_OPTS=""
while [ ! -z "$*" ] ; do
@@ -150,15 +151,15 @@ fi
process_dependencies() {
echo running mvn license-audit-maven-plugin:notices
- echo mvn -X org.heneveld.maven:license-audit-maven-plugin:notices \
+ echo mvn ${LICENSE_MVN_OPTS}
org.heneveld.maven:license-audit-maven-plugin:notices \
-DlicensesPreferred="$PREFERRED_LICENSES" \
-DoverridesFile=$TEMP_METADATA_FILE \
-DoutputYaml=true \
-DoutputFile=$TEMP_NOTICE_DATA_FILE \
$@
- echo writing to $TEMP_MVN_OUT
+ echo writing to $TEMP_MVN_OUT with LICENSE_MVN_OPTS \"${LICENSE_MVN_OPTS}\"
- mvn -X org.heneveld.maven:license-audit-maven-plugin:notices \
+ mvn ${LICENSE_MVN_OPTS}
org.heneveld.maven:license-audit-maven-plugin:notices \
-DlicensesPreferred="$PREFERRED_LICENSES" \
-DoverridesFile=$TEMP_METADATA_FILE \
-DoutputYaml=true \
diff --git a/release/change-version.sh b/release/change-version.sh
index 41cd0cd..9928cb0 100755
--- a/release/change-version.sh
+++ b/release/change-version.sh
@@ -51,7 +51,7 @@ NEW_VERSION=$2
# pass /dev/null as the first file to search in, so the command doesn't fail
if find doesn't match any files;
# add || true for the case where grep doesn't have matches, so the script
doesn't halt
# If there's an error "Argument list too long" add -n20 to xargs arguments and
loop over $FILE around sed
-FILES=`find . -type d \( -name ignored -or -name target -or \( -name .?\* -and
-not -name .mvn \) \) -prune \
+FILES=`find . -type d \( -name ignored -or -name target -or -name node_modules
-or \( -name .?\* -and -not -name .mvn \) \) -prune \
-o -type f -not \( -name \*.log -or -name '*.war' -or -name '*.min.js'
-or -name '*.min.css' -or -name '*.swp' \) -print0 | \
xargs -0 grep -l "${VERSION_MARKER}\|${VERSION_MARKER_NL}" /dev/null ||
true`
