From dab1ff07ed97bb140651d2880721b40d4c82b709 Mon Sep 17 00:00:00 2001 From: Yahav Itzhak Date: Wed, 19 Oct 2022 09:54:49 +0300 Subject: [PATCH] Update build-info dependencies to 2.37.2 / 4.29.2 (#109) --- build/gradle.go | 2 +- build/maven.go | 2 +- .../maven/expected_maven_buildinfo.json | 23 ++++++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/build/gradle.go b/build/gradle.go index 80e7b842..a90fa286 100644 --- a/build/gradle.go +++ b/build/gradle.go @@ -17,7 +17,7 @@ const ( GradleExtractorFileName = "build-info-extractor-gradle-%s-uber.jar" gradleInitScriptTemplate = "gradle.init" GradleExtractorRemotePath = "org/jfrog/buildinfo/build-info-extractor-gradle/%s" - GradleExtractorDependencyVersion = "4.28.2" + GradleExtractorDependencyVersion = "4.29.2" ) type GradleModule struct { diff --git a/build/maven.go b/build/maven.go index f3e1dc53..389a259a 100644 --- a/build/maven.go +++ b/build/maven.go @@ -21,7 +21,7 @@ const ( PropertiesTempfolderName = "properties" mavenExtractorRemotePath = "org/jfrog/buildinfo/build-info-extractor-maven3/%s" GeneratedBuildInfoTempPrefix = "generatedBuildInfo" - MavenExtractorDependencyVersion = "2.36.2" + MavenExtractorDependencyVersion = "2.37.2" ClassworldsConf = `main is org.apache.maven.cli.MavenCli from plexus.core diff --git a/build/testdata/maven/expected_maven_buildinfo.json b/build/testdata/maven/expected_maven_buildinfo.json index fac2ab07..09e67b4a 100644 --- a/build/testdata/maven/expected_maven_buildinfo.json +++ b/build/testdata/maven/expected_maven_buildinfo.json @@ -12,7 +12,14 @@ "maven.compiler.target": "1.8", "project.build.sourceEncoding": "UTF-8" }, - "id": "org.jfrog.test:multi2:3.7-SNAPSHOT" + "id": "org.jfrog.test:multi2:3.7-SNAPSHOT", + "artifacts": [ + { + "name": "multi2-3.7-SNAPSHOT.pom", + "type": "pom", + "path": "org/jfrog/test/multi2/3.7-SNAPSHOT" + } + ] }, { "type": "maven", @@ -22,6 +29,13 @@ "project.build.sourceEncoding": "UTF-8" }, "id": "org.jfrog.test:multi1:3.7-SNAPSHOT", + "artifacts": [ + { + "name": "multi1-3.7-SNAPSHOT.pom", + "type": "pom", + "path": "org/jfrog/test/multi1/3.7-SNAPSHOT" + } + ], "dependencies": [ { "id": "org.apache.commons:commons-email:1.1", @@ -220,6 +234,13 @@ "project.build.sourceEncoding": "UTF-8" }, "id": "org.jfrog.test:multi3:3.7-SNAPSHOT", + "artifacts": [ + { + "name": "multi3-3.7-SNAPSHOT.pom", + "type": "pom", + "path": "org/jfrog/test/multi3/3.7-SNAPSHOT" + } + ], "dependencies": [ { "id": "org.springframework:spring-beans:2.5.6",