From 42def64fec7b96c6eec0ae73e8a3657036c31e27 Mon Sep 17 00:00:00 2001 From: Omer Zidkoni Date: Tue, 2 May 2023 16:11:41 +0300 Subject: [PATCH 1/3] Update dependencies --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1dfc9832..a7a8bbfc 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/BurntSushi/toml v1.2.1 github.com/CycloneDX/cyclonedx-go v0.7.1 github.com/buger/jsonparser v1.1.1 - github.com/jfrog/gofrog v1.2.5 + github.com/jfrog/gofrog v1.3.0 github.com/minio/sha256-simd v1.0.1-0.20230222114820-6096f891a77b github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.8.2 diff --git a/go.sum b/go.sum index d08b972f..d4b71372 100644 --- a/go.sum +++ b/go.sum @@ -10,8 +10,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/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.2.5 h1:jCgJC0iGQ8bU7jCC+YEFJTNINyngApIrhd8BjZAVRIE= -github.com/jfrog/gofrog v1.2.5/go.mod h1:o00tSRff6IapTgaCMuX1Cs9MH08Y1JqnsKgRtx91Gc4= +github.com/jfrog/gofrog v1.3.0 h1:o4zgsBZE4QyDbz2M7D4K6fXPTBJht+8lE87mS9bw7Gk= +github.com/jfrog/gofrog v1.3.0/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0= 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-0.20230222114820-6096f891a77b h1:kr87H4ULRbe6LQNF5f3A+nGY8TQLgckmdG9BLJ/QB18= From 1a24eefc366a61cdfe018eb75d8763c1cfe4d901 Mon Sep 17 00:00:00 2001 From: Omer Zidkoni <50792403+omerzi@users.noreply.github.com> Date: Tue, 13 Aug 2024 11:14:29 +0300 Subject: [PATCH 2/3] Add 'Parent' field to the 'Module' entity --- entities/buildinfo.go | 1 + 1 file changed, 1 insertion(+) diff --git a/entities/buildinfo.go b/entities/buildinfo.go index bbd42279..e2973f52 100644 --- a/entities/buildinfo.go +++ b/entities/buildinfo.go @@ -343,6 +343,7 @@ type Module struct { Artifacts []Artifact `json:"artifacts,omitempty"` ExcludedArtifacts []Artifact `json:"excludedArtifacts,omitempty"` Dependencies []Dependency `json:"dependencies,omitempty"` + Parent string `json:"parent,omitempty"` // Used in aggregated builds - this field stores the checksums of the referenced build-info JSON. Checksum } From e2f265ea26be29a725ad934673f6f1770867b4ec Mon Sep 17 00:00:00 2001 From: Omer Zidkoni <50792403+omerzi@users.noreply.github.com> Date: Tue, 13 Aug 2024 11:40:49 +0300 Subject: [PATCH 3/3] CR --- entities/buildinfo.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/entities/buildinfo.go b/entities/buildinfo.go index e2973f52..6221dde3 100644 --- a/entities/buildinfo.go +++ b/entities/buildinfo.go @@ -343,7 +343,9 @@ type Module struct { Artifacts []Artifact `json:"artifacts,omitempty"` ExcludedArtifacts []Artifact `json:"excludedArtifacts,omitempty"` Dependencies []Dependency `json:"dependencies,omitempty"` - Parent string `json:"parent,omitempty"` + // Parent is used to store the parent module id, for multi-module projects. + // This field is not recognized by Artifactory, and is used for internal purposes only. + Parent string `json:"parent,omitempty"` // Used in aggregated builds - this field stores the checksums of the referenced build-info JSON. Checksum }