diff --git a/buildscripts/download-jars.sh b/buildscripts/download-jars.sh index 89c022ed2..3fdf32adc 100755 --- a/buildscripts/download-jars.sh +++ b/buildscripts/download-jars.sh @@ -9,7 +9,7 @@ # Once you have updated the versions mentioned below, please execute this script from the root directory of the jfrog-cli-core to ensure the JAR files are updated. GRADLE_DEP_TREE_VERSION="3.0.4" # Changing this version also requires a change in mavenDepTreeVersion within utils/java/mvn.go. -MAVEN_DEP_TREE_VERSION="1.1.3" +MAVEN_DEP_TREE_VERSION="1.1.5" curl -fL https://releases.jfrog.io/artifactory/oss-release-local/com/jfrog/gradle-dep-tree/${GRADLE_DEP_TREE_VERSION}/gradle-dep-tree-${GRADLE_DEP_TREE_VERSION}.jar -o sca/bom/buildinfo/technologies/java/resources/gradle-dep-tree.jar curl -fL https://releases.jfrog.io/artifactory/oss-release-local/com/jfrog/maven-dep-tree/${MAVEN_DEP_TREE_VERSION}/maven-dep-tree-${MAVEN_DEP_TREE_VERSION}.jar -o sca/bom/buildinfo/technologies/java/resources/maven-dep-tree.jar diff --git a/commands/curation/curationaudit_test.go b/commands/curation/curationaudit_test.go index 86ed6d6d2..00ae80530 100644 --- a/commands/curation/curationaudit_test.go +++ b/commands/curation/curationaudit_test.go @@ -16,6 +16,7 @@ import ( "sync" "testing" + "github.com/jfrog/jfrog-cli-security/sca/bom/buildinfo/technologies/java" "github.com/jfrog/jfrog-cli-security/utils/formats" biutils "github.com/jfrog/build-info-go/utils" @@ -833,7 +834,7 @@ func getTestCasesForDoCurationAudit() []testCase { curationCache, err := utils.GetCurationCacheFolderByTech(techutils.Maven) require.NoError(t, err) cleanUpTestDirChange() - return []string{"com.jfrog:maven-dep-tree:tree", "-DdepsTreeOutputFile=output", "-Dmaven.repo.local=" + curationCache} + return []string{"com.jfrog:maven-dep-tree:" + java.GetMavenDepTreeVersion() + ":tree", "-DdepsTreeOutputFile=output", "-Dmaven.repo.local=" + curationCache} }, expectedBuildRequest: map[string]bool{ "/api/curation/audit/maven-remote/org/webjars/npm/underscore/1.13.6/underscore-1.13.6.pom": false, diff --git a/sca/bom/buildinfo/technologies/java/mvn.go b/sca/bom/buildinfo/technologies/java/mvn.go index 4279153e6..6083c8208 100644 --- a/sca/bom/buildinfo/technologies/java/mvn.go +++ b/sca/bom/buildinfo/technologies/java/mvn.go @@ -28,7 +28,7 @@ const ( mavenDepTreeJarFile = "maven-dep-tree.jar" mavenDepTreeOutputFile = "mavendeptree.out" // Changing this version also requires a change in MAVEN_DEP_TREE_VERSION within buildscripts/download_jars.sh - mavenDepTreeVersion = "1.1.3" + mavenDepTreeVersion = "1.1.5" settingsXmlFile = "settings.xml" ) @@ -124,6 +124,10 @@ func GetMavenPluginInstallationGoals(pluginPath string) []string { return []string{"org.apache.maven.plugins:maven-install-plugin:3.1.1:install-file", "-Dfile=" + pluginPath, "-B"} } +func GetMavenDepTreeVersion() string { + return mavenDepTreeVersion +} + func (mdt *MavenDepTreeManager) execMavenDepTree(depTreeExecDir string) (string, error) { if mdt.cmdName == Tree { return mdt.runTreeCmd(depTreeExecDir) diff --git a/sca/bom/buildinfo/technologies/java/resources/maven-dep-tree.jar b/sca/bom/buildinfo/technologies/java/resources/maven-dep-tree.jar index b3a48f7d6..a11bb30de 100644 Binary files a/sca/bom/buildinfo/technologies/java/resources/maven-dep-tree.jar and b/sca/bom/buildinfo/technologies/java/resources/maven-dep-tree.jar differ