jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-09-16 09:26:22 +02:00
Code Issues Releases Activity

Update version of org.cyclonedx:cyclonedx-maven-plugin (#5156)

Browse Source 
* Update version of org.cyclonedx:cyclonedx-maven-plugin

* Update version of org.cyclonedx:cyclonedx-maven-plugin

---------

Co-authored-by: Googlom <36107508+Googlom@users.noreply.github.com>
This commit is contained in:
Vyacheslav Starostin
2024-10-25 14:07:28 +05:00
committed by GitHub
parent f9dc47e47e
commit d6aaf43fae
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/mavenBuild.go
View File

@@ -66,7 +66,7 @@ func runMakeBOMGoal(config *mavenBuildOptions, utils maven.Utils) error {
}
defines = append(defines, createBOMConfig...)
goals := []string{"org.cyclonedx:cyclonedx-maven-plugin:2.7.8:makeBom"}
goals := []string{"org.cyclonedx:cyclonedx-maven-plugin:2.7.9:makeBom"}
if config.Flatten {
goals = append(goals, "flatten:flatten")
@@ -88,7 +88,7 @@ func runMakeBOMGoal(config *mavenBuildOptions, utils maven.Utils) error {
return err
}
func runMavenBuild(config *mavenBuildOptions, telemetryData *telemetry.CustomData, utils maven.Utils, commonPipelineEnvironment *mavenBuildCommonPipelineEnvironment) error {
func runMavenBuild(config *mavenBuildOptions, _ *telemetry.CustomData, utils maven.Utils, commonPipelineEnvironment *mavenBuildCommonPipelineEnvironment) error {
var flags = []string{"-update-snapshots", "--batch-mode"}
@@ -111,7 +111,7 @@ func runMavenBuild(config *mavenBuildOptions, telemetryData *telemetry.CustomDat
if config.CreateBOM {
// Append the makeAggregateBOM goal to the rest of the goals
goals = append(goals, "org.cyclonedx:cyclonedx-maven-plugin:2.7.8:makeAggregateBom")
goals = append(goals, "org.cyclonedx:cyclonedx-maven-plugin:2.7.9:makeAggregateBom")
createBOMConfig := []string{
"-DschemaVersion=1.4",
"-DincludeBomSerialNumber=true",

2
cmd/mavenBuild_test.go
View File

@@ -55,7 +55,7 @@ func TestMavenBuild(t *testing.T) {
assert.Nil(t, err)
if assert.Equal(t, 2, len(mockedUtils.Calls), "Expected two Maven invocations (default + makeAggregateBom)") {
assert.Equal(t, "mvn", mockedUtils.Calls[1].Exec)
assert.Contains(t, mockedUtils.Calls[0].Params, "org.cyclonedx:cyclonedx-maven-plugin:2.7.8:makeAggregateBom")
assert.Contains(t, mockedUtils.Calls[0].Params, "org.cyclonedx:cyclonedx-maven-plugin:2.7.9:makeAggregateBom")
assert.Contains(t, mockedUtils.Calls[0].Params, "-DoutputName=bom-maven")
}
})