Skip to content

XRAY-160045 - Use the Maven wrapper in the fix stage #1425

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

Draft
Jordanh1996 wants to merge 1 commit into
base: v2_main
Choose a base branch
from
Draft

XRAY-160045 - Use the Maven wrapper in the fix stage #1425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packagehandlers/mavenpackagehandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ func NewMavenPackageHandler(scanDetails *utils.ScanDetails) *MavenPackageHandler
depTreeParams := &java.DepTreeParams{
Server: scanDetails.ServerDetails,
DepsRepo: scanDetails.DepsRepo,
UseWrapper: scanDetails.UseWrapper != nil && *scanDetails.UseWrapper,
IsMavenDepTreeInstalled: true,
}
// The mvn-dep-tree plugin has already been installed during the audit dependency tree build phase,
Expand Down
18 changes: 18 additions & 0 deletions packagehandlers/packagehandlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/jfrog/build-info-go/tests"
biutils "github.com/jfrog/build-info-go/utils"
"github.com/jfrog/frogbot/v2/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
"github.com/jfrog/jfrog-cli-security/sca/bom/buildinfo/technologies/java"
"github.com/jfrog/jfrog-cli-security/utils/formats"
"github.com/jfrog/jfrog-cli-security/utils/techutils"
Expand Down Expand Up @@ -1091,3 +1092,20 @@ func TestPnpmFixVulnerabilityIfExists(t *testing.T) {
assert.NoError(t, err)
assert.False(t, nodeModulesExist)
}

func TestNewMavenPackageHandlerUsesWrapper(t *testing.T) {
tmpDir := t.TempDir()
if coreutils.IsWindows() {
assert.NoError(t, os.WriteFile(filepath.Join(tmpDir, "mvnw.cmd"), []byte("@echo wrapper-invoked\r\n"), 0700))
} else {
assert.NoError(t, os.WriteFile(filepath.Join(tmpDir, "mvnw"), []byte("#!/bin/sh\necho wrapper-invoked\n"), 0700))
}
restoreDir, err := utils.Chdir(tmpDir)
assert.NoError(t, err)
defer func() { assert.NoError(t, restoreDir()) }()

handler := NewMavenPackageHandler(&utils.ScanDetails{Project: &utils.Project{UseWrapper: &utils.TrueVal}})
output, err := handler.RunMvnCmd([]string{"-v"})
assert.NoError(t, err)
assert.Contains(t, string(output), "wrapper-invoked")
}
Loading