From d6aaf43fae2621413e1cd01604c0d6c9325475ed Mon Sep 17 00:00:00 2001 From: Vyacheslav Starostin <32613074+vstarostin@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:07:28 +0500 Subject: [PATCH] Update version of org.cyclonedx:cyclonedx-maven-plugin (#5156) * 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> --- cmd/mavenBuild.go | 6 +++--- cmd/mavenBuild_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/mavenBuild.go b/cmd/mavenBuild.go index 559e5c2188..a3cb22d86d 100644 --- a/cmd/mavenBuild.go +++ b/cmd/mavenBuild.go @@ -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", diff --git a/cmd/mavenBuild_test.go b/cmd/mavenBuild_test.go index ea5e9abdbc..36647bb3ba 100644 --- a/cmd/mavenBuild_test.go +++ b/cmd/mavenBuild_test.go @@ -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") } })