From f4eae4290238dddf4b781034b27f5b09928e4cfc Mon Sep 17 00:00:00 2001 From: Joe Di Pol Date: Wed, 28 Jun 2023 09:38:51 -0700 Subject: [PATCH 1/2] Replace use of PIPELINE env variable --- etc/scripts/owasp-dependency-check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/scripts/owasp-dependency-check.sh b/etc/scripts/owasp-dependency-check.sh index 5c8ecfadf43..9d470abb63c 100755 --- a/etc/scripts/owasp-dependency-check.sh +++ b/etc/scripts/owasp-dependency-check.sh @@ -28,7 +28,7 @@ readonly RESULT_FILE=$(mktemp -t XXXdependency-check-result) die() { cat ${RESULT_FILE} ; echo "Dependency report in ${WS_DIR}/target" ; echo "${1}" ; exit 1 ;} -if [ "${PIPELINE}" = "true" ] ; then +if [ -n "${JENKINS_HOME}" ] || [ "${GITHUB_ACTIONS}" = "true" ]; then # If in pipeline do a priming build before scan mvn ${MAVEN_ARGS} -f ${WS_DIR}/pom.xml clean install -DskipTests fi From a6a25c71f31c0d8d7b4a2a7034c9201ce3ccd260 Mon Sep 17 00:00:00 2001 From: Joe Di Pol Date: Wed, 28 Jun 2023 09:43:26 -0700 Subject: [PATCH 2/2] Fix copyright --- etc/scripts/owasp-dependency-check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/scripts/owasp-dependency-check.sh b/etc/scripts/owasp-dependency-check.sh index 9d470abb63c..bfa3ab9db90 100755 --- a/etc/scripts/owasp-dependency-check.sh +++ b/etc/scripts/owasp-dependency-check.sh @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright (c) 2020, 2022 Oracle and/or its affiliates. +# Copyright (c) 2020, 2023 Oracle and/or its affiliates. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.