Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move buildCyclonedxLib to Build the CycloneDX Java library and app used for SBoM generation from build.sh to sbom.sh #3209

Closed
wants to merge 10 commits into from
+29 −15
Closed

move buildCyclonedxLib to Build the CycloneDX Java library and app used for SBoM generation from build.sh to sbom.sh #3209

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
77edde6
move buildCyclonedxLib to Build the CycloneDX Java library and app us…
julian55455 Jan 10, 2023
481c2f6
fixed lint
julian55455 Jan 16, 2023
8d34d40
Trigger rebuild
julian55455 Jan 23, 2023
92ee3c2
resolve conflicts
julian55455 Jan 31, 2023
df2638f
resolve conflicts
julian55455 Jan 31, 2023
3329dc6
Merge branch 'master' into one
julian55455 Jan 31, 2023
895a957
resolve conflicts
julian55455 Jan 31, 2023
24a0756
Refactor code
julian55455 Feb 1, 2023
83188df
make the script obtain jdk-19
julian55455 Feb 1, 2023
40c86d0
make the script build with jdk17
julian55455 Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
make the script obtain jdk-19
@julian55455
julian55455 committed Feb 1, 2023
commit 83188df40ef149debc1f30a19c874f360bb20b90
3 changes: 3 additions & 0 deletions sbin/common/sbom.sh
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@
# Build the CycloneDX Java library and app used for SBoM generation
buildCyclonedxLib() {
local javaHome="${1}"
# Download jdk-19 if JAVA_HOME is not set or is older than jdk-19
if [[ -z "${JAVA_HOME}" ]] || [[ "$(${JAVA_HOME}/bin/java -version 2>&1 | awk -F '"' '/version/ {print $2}')" < "1.9" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

an empty block?

fi

# Make Ant aware of cygwin path
if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then