Merge remote-tracking branch 'upstream/dev' into dev

build/gradle.go

@@ -21,8 +21,8 @@ const (
  gradleExtractorFileName = "build-info-extractor-gradle-%s-uber.jar"
  gradleInitScriptTemplate = "gradle.init"
  gradleExtractorRemotePath = "org/jfrog/buildinfo/build-info-extractor-gradle/%s"
- gradleExtractor4DependencyVersion = "4.33.13"
- gradleExtractor5DependencyVersion = "5.2.0"
+ gradleExtractor4DependencyVersion = "4.33.20"
+ gradleExtractor5DependencyVersion = "5.2.3"
  projectPropertiesFlag = "-P"
  systemPropertiesFlag = "-D"
 )

build/maven.go

@@ -20,7 +20,7 @@ const (
  classworldsConfFileName = "classworlds.conf"
  PropertiesTempFolderName = "properties"
  MavenExtractorRemotePath = "org/jfrog/buildinfo/build-info-extractor-maven3/%s"
- MavenExtractorDependencyVersion = "2.41.16"
+ MavenExtractorDependencyVersion = "2.41.21"
 
  ClassworldsConf = `main is org.apache.maven.cli.MavenCli from plexus.core
 

entities/buildinfo.go

@@ -408,6 +408,10 @@ type Artifact struct {
  Name string `json:"name,omitempty"`
  Type string `json:"type,omitempty"`
  Path string `json:"path,omitempty"`
+ // The target repository to which the artifact was deployed to.
+ // Named 'original' because the repository might change throughout the lifecycle of the build.
+ // This field is not recognized by Artifactory, and is used for internal purposes only.
+ OriginalDeploymentRepo string `json:"originalDeploymentRepo,omitempty"`
  Checksum
 }
 

go.mod

@@ -6,7 +6,7 @@ require (
  github.com/BurntSushi/toml v1.4.0
  github.com/CycloneDX/cyclonedx-go v0.9.0
  github.com/buger/jsonparser v1.1.1
- github.com/jfrog/gofrog v1.7.3
+ github.com/jfrog/gofrog v1.7.4
  github.com/minio/sha256-simd v1.0.1
  github.com/stretchr/testify v1.9.0
  github.com/urfave/cli/v2 v2.27.2
@@ -17,11 +17,13 @@ require (
 require (
  github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/gookit/color v1.5.4 // indirect
  github.com/klauspost/cpuid/v2 v2.2.3 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
  github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+ github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
  github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
  golang.org/x/sync v0.7.0 // indirect
  golang.org/x/sys v0.17.0 // indirect

go.sum

@@ -11,8 +11,10 @@ github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jfrog/gofrog v1.7.3 h1:34iaAZP9qY1dkjb8a0g0jn0u9/2k8RROx4hgnZNTAQw=
-github.com/jfrog/gofrog v1.7.3/go.mod h1:4MH6RLH0XF96Y3PK7Cy9u8YvxN9cbe0VJHlzEfMpJDA=
+github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
+github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
+github.com/jfrog/gofrog v1.7.4 h1:on4AeWef5LJUhGCigSjTS4Ez3n9l8+NiZlXH6UYp05c=
+github.com/jfrog/gofrog v1.7.4/go.mod h1:jyGiCgiqSSR7k86hcUSu67XVvmvkkgWTmPsH25wI298=
 github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU=
 github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
@@ -35,6 +37,8 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
 github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw=
 github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk=
 golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w=