Skip to content

Commit

Permalink
Update version of org.cyclonedx:cyclonedx-maven-plugin (#5156)
Browse files Browse the repository at this point in the history
* Update version of org.cyclonedx:cyclonedx-maven-plugin

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

---------

Co-authored-by: Googlom <[email protected]>
  • Loading branch information
vstarostin and Googlom authored Oct 25, 2024
1 parent f9dc47e commit d6aaf43
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions cmd/mavenBuild.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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"}

Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion cmd/mavenBuild_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
})
Expand Down

0 comments on commit d6aaf43

Please sign in to comment.