From cbdfd8e0245660789dae130f4f4de9027e4076d2 Mon Sep 17 00:00:00 2001 From: C5345921 Date: Wed, 27 Mar 2024 16:32:32 +0300 Subject: [PATCH 01/13] added-parameter --- cmd/detectExecuteScan.go | 25 +++++++++++++++++++++++ cmd/detectExecuteScan_generated.go | 11 ++++++++++ resources/metadata/detectExecuteScan.yaml | 9 ++++++++ 3 files changed, 45 insertions(+) diff --git a/cmd/detectExecuteScan.go b/cmd/detectExecuteScan.go index 106708ded1..6796e6290d 100644 --- a/cmd/detectExecuteScan.go +++ b/cmd/detectExecuteScan.go @@ -213,6 +213,18 @@ func runDetect(ctx context.Context, config detectExecuteScanOptions, utils detec } } + // for MTA + if config.BuildMTA { + log.Entry().Infof("running MTA Build") + mtaConfig := setMTAConfig(config) + mtaUtils := newMtaBuildUtilsBundle() + + err := runMtaBuild(mtaConfig, &mtaBuildCommonPipelineEnvironment{}, mtaUtils) + if err != nil { + return err + } + } + blackduckSystem := newBlackduckSystem(config) args := []string{"./detect.sh"} @@ -1037,6 +1049,19 @@ func setMavenConfig(config detectExecuteScanOptions) mavenBuildOptions { return mavenConfig } +func setMTAConfig(config detectExecuteScanOptions) mtaBuildOptions { + mtaConfig := mtaBuildOptions{ + ProjectSettingsFile: config.ProjectSettingsFile, + GlobalSettingsFile: config.GlobalSettingsFile, + M2Path: config.M2Path, + InstallArtifacts: false, + CreateBOM: false, + } + + return mtaConfig + +} + func logConfigInVerboseMode(config detectExecuteScanOptions) { config.Token = "********" config.GithubToken = "********" diff --git a/cmd/detectExecuteScan_generated.go b/cmd/detectExecuteScan_generated.go index 0250f6ce38..3d0fed02ed 100644 --- a/cmd/detectExecuteScan_generated.go +++ b/cmd/detectExecuteScan_generated.go @@ -41,6 +41,7 @@ type detectExecuteScanOptions struct { M2Path string `json:"m2Path,omitempty"` InstallArtifacts bool `json:"installArtifacts,omitempty"` BuildMaven bool `json:"buildMaven,omitempty"` + BuildMTA bool `json:"buildMTA,omitempty"` PomPath string `json:"pomPath,omitempty"` IncludedPackageManagers []string `json:"includedPackageManagers,omitempty"` ExcludedPackageManagers []string `json:"excludedPackageManagers,omitempty"` @@ -292,6 +293,7 @@ func addDetectExecuteScanFlags(cmd *cobra.Command, stepConfig *detectExecuteScan cmd.Flags().StringVar(&stepConfig.M2Path, "m2Path", os.Getenv("PIPER_m2Path"), "Path to the location of the local repository that should be used.") cmd.Flags().BoolVar(&stepConfig.InstallArtifacts, "installArtifacts", false, "If enabled, it will install all artifacts to the local maven repository to make them available before running detect. This is required if any maven module has dependencies to other modules in the repository and they were not installed before.") cmd.Flags().BoolVar(&stepConfig.BuildMaven, "buildMaven", false, "Experiment parameter for maven multi-modules projects building") + cmd.Flags().BoolVar(&stepConfig.BuildMTA, "buildMTA", false, "Experiment parameter for MTA projects building") cmd.Flags().StringVar(&stepConfig.PomPath, "pomPath", `pom.xml`, "Path to the pom file which should be installed including all children.") cmd.Flags().StringSliceVar(&stepConfig.IncludedPackageManagers, "includedPackageManagers", []string{}, "The package managers that need to be included for this scan. Providing the package manager names with this parameter will ensure that the build descriptor file of that package manager will be searched in the scan folder For the complete list of possible values for this parameter, please refer [Synopsys detect documentation](https://community.synopsys.com/s/document-item?bundleId=integrations-detect&topicId=properties%2Fconfiguration%2Fdetector.html&_LANG=enus&anchor=detector-types-included-advanced)") cmd.Flags().StringSliceVar(&stepConfig.ExcludedPackageManagers, "excludedPackageManagers", []string{}, "The package managers that need to be excluded for this scan. Providing the package manager names with this parameter will ensure that the build descriptor file of that package manager will be ignored in the scan folder For the complete list of possible values for this parameter, please refer [Synopsys detect documentation](https://community.synopsys.com/s/document-item?bundleId=integrations-detect&topicId=properties%2Fconfiguration%2Fdetector.html&_LANG=enus&anchor=detector-types-excluded-advanced)") @@ -533,6 +535,15 @@ func detectExecuteScanMetadata() config.StepData { Aliases: []config.Alias{}, Default: false, }, + { + Name: "buildMTA", + ResourceRef: []config.ResourceReference{}, + Scope: []string{"STEPS", "STAGES", "PARAMETERS"}, + Type: "bool", + Mandatory: false, + Aliases: []config.Alias{}, + Default: false, + }, { Name: "pomPath", ResourceRef: []config.ResourceReference{}, diff --git a/resources/metadata/detectExecuteScan.yaml b/resources/metadata/detectExecuteScan.yaml index 2110312a2e..36e88209ca 100644 --- a/resources/metadata/detectExecuteScan.yaml +++ b/resources/metadata/detectExecuteScan.yaml @@ -257,6 +257,15 @@ spec: - STEPS - STAGES - PARAMETERS + - name: buildMTA + type: bool + default: false + description: + "Experiment parameter for MTA projects building" + scope: + - STEPS + - STAGES + - PARAMETERS - name: pomPath type: string description: Path to the pom file which should be installed including all children. From 43eb87176f964ff4b5c0f769a23a01db7cfb2be6 Mon Sep 17 00:00:00 2001 From: C5345921 Date: Tue, 2 Apr 2024 16:45:15 +0300 Subject: [PATCH 02/13] added-platform-param-for-mta-build --- cmd/detectExecuteScan.go | 6 ++++++ cmd/detectExecuteScan_generated.go | 11 +++++++++++ resources/metadata/detectExecuteScan.yaml | 8 ++++++++ 3 files changed, 25 insertions(+) diff --git a/cmd/detectExecuteScan.go b/cmd/detectExecuteScan.go index 6796e6290d..15e00bc099 100644 --- a/cmd/detectExecuteScan.go +++ b/cmd/detectExecuteScan.go @@ -1050,10 +1050,16 @@ func setMavenConfig(config detectExecuteScanOptions) mavenBuildOptions { } func setMTAConfig(config detectExecuteScanOptions) mtaBuildOptions { + + if config.M2Path == "" { + config.M2Path = "/.m2" + } + mtaConfig := mtaBuildOptions{ ProjectSettingsFile: config.ProjectSettingsFile, GlobalSettingsFile: config.GlobalSettingsFile, M2Path: config.M2Path, + Platform: config.MtaPlatform, InstallArtifacts: false, CreateBOM: false, } diff --git a/cmd/detectExecuteScan_generated.go b/cmd/detectExecuteScan_generated.go index 3d0fed02ed..6393c2d1cc 100644 --- a/cmd/detectExecuteScan_generated.go +++ b/cmd/detectExecuteScan_generated.go @@ -42,6 +42,7 @@ type detectExecuteScanOptions struct { InstallArtifacts bool `json:"installArtifacts,omitempty"` BuildMaven bool `json:"buildMaven,omitempty"` BuildMTA bool `json:"buildMTA,omitempty"` + MtaPlatform string `json:"mtaPlatform,omitempty"` PomPath string `json:"pomPath,omitempty"` IncludedPackageManagers []string `json:"includedPackageManagers,omitempty"` ExcludedPackageManagers []string `json:"excludedPackageManagers,omitempty"` @@ -294,6 +295,7 @@ func addDetectExecuteScanFlags(cmd *cobra.Command, stepConfig *detectExecuteScan cmd.Flags().BoolVar(&stepConfig.InstallArtifacts, "installArtifacts", false, "If enabled, it will install all artifacts to the local maven repository to make them available before running detect. This is required if any maven module has dependencies to other modules in the repository and they were not installed before.") cmd.Flags().BoolVar(&stepConfig.BuildMaven, "buildMaven", false, "Experiment parameter for maven multi-modules projects building") cmd.Flags().BoolVar(&stepConfig.BuildMTA, "buildMTA", false, "Experiment parameter for MTA projects building") + cmd.Flags().StringVar(&stepConfig.MtaPlatform, "mtaPlatform", `CF`, "The platform of the MTA project") cmd.Flags().StringVar(&stepConfig.PomPath, "pomPath", `pom.xml`, "Path to the pom file which should be installed including all children.") cmd.Flags().StringSliceVar(&stepConfig.IncludedPackageManagers, "includedPackageManagers", []string{}, "The package managers that need to be included for this scan. Providing the package manager names with this parameter will ensure that the build descriptor file of that package manager will be searched in the scan folder For the complete list of possible values for this parameter, please refer [Synopsys detect documentation](https://community.synopsys.com/s/document-item?bundleId=integrations-detect&topicId=properties%2Fconfiguration%2Fdetector.html&_LANG=enus&anchor=detector-types-included-advanced)") cmd.Flags().StringSliceVar(&stepConfig.ExcludedPackageManagers, "excludedPackageManagers", []string{}, "The package managers that need to be excluded for this scan. Providing the package manager names with this parameter will ensure that the build descriptor file of that package manager will be ignored in the scan folder For the complete list of possible values for this parameter, please refer [Synopsys detect documentation](https://community.synopsys.com/s/document-item?bundleId=integrations-detect&topicId=properties%2Fconfiguration%2Fdetector.html&_LANG=enus&anchor=detector-types-excluded-advanced)") @@ -544,6 +546,15 @@ func detectExecuteScanMetadata() config.StepData { Aliases: []config.Alias{}, Default: false, }, + { + Name: "mtaPlatform", + ResourceRef: []config.ResourceReference{}, + Scope: []string{"PARAMETERS", "STAGES", "STEPS"}, + Type: "string", + Mandatory: false, + Aliases: []config.Alias{}, + Default: `CF`, + }, { Name: "pomPath", ResourceRef: []config.ResourceReference{}, diff --git a/resources/metadata/detectExecuteScan.yaml b/resources/metadata/detectExecuteScan.yaml index 36e88209ca..201e0ff1dc 100644 --- a/resources/metadata/detectExecuteScan.yaml +++ b/resources/metadata/detectExecuteScan.yaml @@ -266,6 +266,14 @@ spec: - STEPS - STAGES - PARAMETERS + - name: mtaPlatform + type: string + description: "The platform of the MTA project" + default: "CF" + scope: + - PARAMETERS + - STAGES + - STEPS - name: pomPath type: string description: Path to the pom file which should be installed including all children. From b86e2f5eb4f3791bb4d64ccb23bf182f6623c93f Mon Sep 17 00:00:00 2001 From: C5345921 Date: Mon, 8 Apr 2024 16:39:18 +0300 Subject: [PATCH 03/13] add-verbose-build-config-output --- cmd/detectExecuteScan.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmd/detectExecuteScan.go b/cmd/detectExecuteScan.go index 15e00bc099..d44efecf59 100644 --- a/cmd/detectExecuteScan.go +++ b/cmd/detectExecuteScan.go @@ -1046,6 +1046,9 @@ func setMavenConfig(config detectExecuteScanOptions) mavenBuildOptions { Publish: false, } + // Print the mavenBuildOptions configuration in verbose mode + log.Entry().Debugf("Maven configuration: %v", mavenConfig) + return mavenConfig } @@ -1064,6 +1067,10 @@ func setMTAConfig(config detectExecuteScanOptions) mtaBuildOptions { CreateBOM: false, } + // Print the mtaBuildOptions configuration in verbose mode + + log.Entry().Debugf("MTA configuration: %v", mtaConfig) + return mtaConfig } From d216bac2af739ab7b509a6103ba5b6df3d357fbc Mon Sep 17 00:00:00 2001 From: C5345921 Date: Tue, 16 Apr 2024 12:46:30 +0300 Subject: [PATCH 04/13] set-install-artifacts-true --- cmd/detectExecuteScan.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/detectExecuteScan.go b/cmd/detectExecuteScan.go index d44efecf59..7eba3adbf4 100644 --- a/cmd/detectExecuteScan.go +++ b/cmd/detectExecuteScan.go @@ -1063,7 +1063,7 @@ func setMTAConfig(config detectExecuteScanOptions) mtaBuildOptions { GlobalSettingsFile: config.GlobalSettingsFile, M2Path: config.M2Path, Platform: config.MtaPlatform, - InstallArtifacts: false, + InstallArtifacts: true, CreateBOM: false, } From 097fedf570af086882f63cb19a3e4ed87ca33bba Mon Sep 17 00:00:00 2001 From: C5345921 Date: Tue, 16 Apr 2024 13:53:35 +0300 Subject: [PATCH 05/13] comment-m2-defaults --- cmd/detectExecuteScan.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/detectExecuteScan.go b/cmd/detectExecuteScan.go index 7eba3adbf4..a1c2ffa7b4 100644 --- a/cmd/detectExecuteScan.go +++ b/cmd/detectExecuteScan.go @@ -1054,9 +1054,9 @@ func setMavenConfig(config detectExecuteScanOptions) mavenBuildOptions { func setMTAConfig(config detectExecuteScanOptions) mtaBuildOptions { - if config.M2Path == "" { - config.M2Path = "/.m2" - } + // if config.M2Path == "" { + // config.M2Path = ".m2" + // } mtaConfig := mtaBuildOptions{ ProjectSettingsFile: config.ProjectSettingsFile, From 8f8b68bab189f6edc5b103526425b47a6fba6af4 Mon Sep 17 00:00:00 2001 From: C5345921 Date: Tue, 16 Apr 2024 16:38:35 +0300 Subject: [PATCH 06/13] returned-m2-param --- cmd/detectExecuteScan.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/detectExecuteScan.go b/cmd/detectExecuteScan.go index a1c2ffa7b4..7eba3adbf4 100644 --- a/cmd/detectExecuteScan.go +++ b/cmd/detectExecuteScan.go @@ -1054,9 +1054,9 @@ func setMavenConfig(config detectExecuteScanOptions) mavenBuildOptions { func setMTAConfig(config detectExecuteScanOptions) mtaBuildOptions { - // if config.M2Path == "" { - // config.M2Path = ".m2" - // } + if config.M2Path == "" { + config.M2Path = "/.m2" + } mtaConfig := mtaBuildOptions{ ProjectSettingsFile: config.ProjectSettingsFile, From d7be3d3c29dae213eb1f5f77ac59f292351ae3a5 Mon Sep 17 00:00:00 2001 From: C5345921 Date: Wed, 15 May 2024 15:56:21 +0300 Subject: [PATCH 07/13] synced-with-master --- cmd/detectExecuteScan_generated.go | 16 ++++++++++++---- resources/metadata/detectExecuteScan.yaml | 2 -- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/cmd/detectExecuteScan_generated.go b/cmd/detectExecuteScan_generated.go index b2ff56d530..32c6241a91 100644 --- a/cmd/detectExecuteScan_generated.go +++ b/cmd/detectExecuteScan_generated.go @@ -22,7 +22,6 @@ import ( ) type detectExecuteScanOptions struct { - Token string `json:"token,omitempty"` CodeLocation string `json:"codeLocation,omitempty"` ProjectName string `json:"projectName,omitempty"` @@ -42,8 +41,9 @@ type detectExecuteScanOptions struct { M2Path string `json:"m2Path,omitempty"` InstallArtifacts bool `json:"installArtifacts,omitempty"` BuildMaven bool `json:"buildMaven,omitempty"` - BuildMTA bool `json:"buildMTA,omitempty"` + BuildMTA bool `json:"buildMTA,omitempty"` GenerateReportsForEmptyProjects bool `json:"generateReportsForEmptyProjects,omitempty"` + MtaPlatform string `json:"mtaPlatform,omitempty"` PomPath string `json:"pomPath,omitempty"` IncludedPackageManagers []string `json:"includedPackageManagers,omitempty"` ExcludedPackageManagers []string `json:"excludedPackageManagers,omitempty"` @@ -297,8 +297,8 @@ func addDetectExecuteScanFlags(cmd *cobra.Command, stepConfig *detectExecuteScan cmd.Flags().BoolVar(&stepConfig.InstallArtifacts, "installArtifacts", false, "If enabled, it will install all artifacts to the local maven repository to make them available before running detect. This is required if any maven module has dependencies to other modules in the repository and they were not installed before.") cmd.Flags().BoolVar(&stepConfig.BuildMaven, "buildMaven", false, "Experiment parameter for maven multi-modules projects building") cmd.Flags().BoolVar(&stepConfig.BuildMTA, "buildMTA", false, "Experiment parameter for MTA projects building") - cmd.Flags().StringVar(&stepConfig.MtaPlatform, "mtaPlatform", `CF`, "The platform of the MTA project") cmd.Flags().BoolVar(&stepConfig.GenerateReportsForEmptyProjects, "generateReportsForEmptyProjects", false, "If enabled, it will generate reports for empty projects. This could be useful to see the compliance reports in Sirius") + cmd.Flags().StringVar(&stepConfig.MtaPlatform, "mtaPlatform", `CF`, "The platform of the MTA project") cmd.Flags().StringVar(&stepConfig.PomPath, "pomPath", `pom.xml`, "Path to the pom file which should be installed including all children.") cmd.Flags().StringSliceVar(&stepConfig.IncludedPackageManagers, "includedPackageManagers", []string{}, "The package managers that need to be included for this scan. Providing the package manager names with this parameter will ensure that the build descriptor file of that package manager will be searched in the scan folder For the complete list of possible values for this parameter, please refer [Synopsys detect documentation](https://community.synopsys.com/s/document-item?bundleId=integrations-detect&topicId=properties%2Fconfiguration%2Fdetector.html&_LANG=enus&anchor=detector-types-included-advanced)") cmd.Flags().StringSliceVar(&stepConfig.ExcludedPackageManagers, "excludedPackageManagers", []string{}, "The package managers that need to be excluded for this scan. Providing the package manager names with this parameter will ensure that the build descriptor file of that package manager will be ignored in the scan folder For the complete list of possible values for this parameter, please refer [Synopsys detect documentation](https://community.synopsys.com/s/document-item?bundleId=integrations-detect&topicId=properties%2Fconfiguration%2Fdetector.html&_LANG=enus&anchor=detector-types-excluded-advanced)") @@ -541,6 +541,15 @@ func detectExecuteScanMetadata() config.StepData { Aliases: []config.Alias{}, Default: false, }, + { + Name: "buildMTA", + ResourceRef: []config.ResourceReference{}, + Scope: []string{}, + Type: "bool", + Mandatory: false, + Aliases: []config.Alias{}, + Default: false, + }, { Name: "generateReportsForEmptyProjects", ResourceRef: []config.ResourceReference{}, @@ -551,7 +560,6 @@ func detectExecuteScanMetadata() config.StepData { Default: false, }, { - Name: "mtaPlatform", ResourceRef: []config.ResourceReference{}, Scope: []string{"PARAMETERS", "STAGES", "STEPS"}, diff --git a/resources/metadata/detectExecuteScan.yaml b/resources/metadata/detectExecuteScan.yaml index 19ea833f39..5dd2bdfe01 100644 --- a/resources/metadata/detectExecuteScan.yaml +++ b/resources/metadata/detectExecuteScan.yaml @@ -257,7 +257,6 @@ spec: - STEPS - STAGES - PARAMETERS - - name: buildMTA type: bool default: false @@ -272,7 +271,6 @@ spec: - STEPS - STAGES - PARAMETERS - - name: mtaPlatform type: string description: "The platform of the MTA project" From 67ad17fe4748b489471edfde8032a3d0a989c341 Mon Sep 17 00:00:00 2001 From: C5345921 Date: Mon, 20 May 2024 11:57:27 +0300 Subject: [PATCH 08/13] fix-yaml --- cmd/detectExecuteScan_generated.go | 2 +- resources/metadata/detectExecuteScan.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/detectExecuteScan_generated.go b/cmd/detectExecuteScan_generated.go index 32c6241a91..356bfe4d29 100644 --- a/cmd/detectExecuteScan_generated.go +++ b/cmd/detectExecuteScan_generated.go @@ -544,7 +544,7 @@ func detectExecuteScanMetadata() config.StepData { { Name: "buildMTA", ResourceRef: []config.ResourceReference{}, - Scope: []string{}, + Scope: []string{"STEPS", "STAGES", "PARAMETERS"}, Type: "bool", Mandatory: false, Aliases: []config.Alias{}, diff --git a/resources/metadata/detectExecuteScan.yaml b/resources/metadata/detectExecuteScan.yaml index 5dd2bdfe01..52b89db042 100644 --- a/resources/metadata/detectExecuteScan.yaml +++ b/resources/metadata/detectExecuteScan.yaml @@ -262,6 +262,10 @@ spec: default: false description: "Experiment parameter for MTA projects building" + scope: + - STEPS + - STAGES + - PARAMETERS - name: generateReportsForEmptyProjects type: bool default: false From db0e92fad8972dcc3fd86ebd257ca209f15cc951 Mon Sep 17 00:00:00 2001 From: C5345921 Date: Mon, 20 May 2024 12:00:49 +0300 Subject: [PATCH 09/13] fix-yaml2 --- resources/metadata/detectExecuteScan.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/metadata/detectExecuteScan.yaml b/resources/metadata/detectExecuteScan.yaml index 52b89db042..a4acbd22ef 100644 --- a/resources/metadata/detectExecuteScan.yaml +++ b/resources/metadata/detectExecuteScan.yaml @@ -275,7 +275,7 @@ spec: - STEPS - STAGES - PARAMETERS - - name: mtaPlatform + - name: mtaPlatform type: string description: "The platform of the MTA project" default: "CF" @@ -716,4 +716,4 @@ spec: - conditionRef: strings-equal params: - name: scanContainerDistro - value: centos + value: centos \ No newline at end of file From 21bfc0c97d7394627d68c4f77e88d2bbe01de7e9 Mon Sep 17 00:00:00 2001 From: C5345921 Date: Mon, 20 May 2024 12:02:14 +0300 Subject: [PATCH 10/13] fix-yaml3 --- resources/metadata/detectExecuteScan.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/metadata/detectExecuteScan.yaml b/resources/metadata/detectExecuteScan.yaml index a4acbd22ef..091271fa5a 100644 --- a/resources/metadata/detectExecuteScan.yaml +++ b/resources/metadata/detectExecuteScan.yaml @@ -716,4 +716,5 @@ spec: - conditionRef: strings-equal params: - name: scanContainerDistro - value: centos \ No newline at end of file + value: centos + \ No newline at end of file From 811a248b8d6508a96c60da6e8eec832dcac62fd3 Mon Sep 17 00:00:00 2001 From: C5345921 Date: Mon, 20 May 2024 12:03:32 +0300 Subject: [PATCH 11/13] fix-yaml3 --- resources/metadata/detectExecuteScan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/metadata/detectExecuteScan.yaml b/resources/metadata/detectExecuteScan.yaml index 091271fa5a..4b9cd1a880 100644 --- a/resources/metadata/detectExecuteScan.yaml +++ b/resources/metadata/detectExecuteScan.yaml @@ -717,4 +717,4 @@ spec: params: - name: scanContainerDistro value: centos - \ No newline at end of file + From e5c23f87fdb11e7919fc0261d0953078e001752f Mon Sep 17 00:00:00 2001 From: C5345921 Date: Mon, 20 May 2024 12:04:32 +0300 Subject: [PATCH 12/13] fix-yaml4 --- resources/metadata/detectExecuteScan.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/metadata/detectExecuteScan.yaml b/resources/metadata/detectExecuteScan.yaml index 4b9cd1a880..636e688914 100644 --- a/resources/metadata/detectExecuteScan.yaml +++ b/resources/metadata/detectExecuteScan.yaml @@ -717,4 +717,3 @@ spec: params: - name: scanContainerDistro value: centos - From afd162c7d4d3b823047ec32aeb38340464154ef8 Mon Sep 17 00:00:00 2001 From: C5345921 Date: Fri, 24 May 2024 10:09:12 +0300 Subject: [PATCH 13/13] returned-m2path-in-folder --- cmd/detectExecuteScan.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/detectExecuteScan.go b/cmd/detectExecuteScan.go index ee9ab3dd74..3d6e89e02d 100644 --- a/cmd/detectExecuteScan.go +++ b/cmd/detectExecuteScan.go @@ -1061,7 +1061,7 @@ func setMavenConfig(config detectExecuteScanOptions) mavenBuildOptions { func setMTAConfig(config detectExecuteScanOptions) mtaBuildOptions { if config.M2Path == "" { - config.M2Path = "/.m2" + config.M2Path = ".m2" } mtaConfig := mtaBuildOptions{