Skip to content

Commit 7f3e889

Browse files
pxp928pxp928
authored
if LicenseRef is specified without an inline do not create a license node (#2164)
* if LicenseRef is specified without an inline do not create a license node Signed-off-by: pxp928 <[email protected]> * remove unused ignoreLR flag and move check for LicenseRef Signed-off-by: pxp928 <[email protected]> * add inline map to SPDX and reorg license fix Signed-off-by: pxp928 <[email protected]> --------- Signed-off-by: pxp928 <[email protected]>
1 parent e714df0 commit 7f3e889

File tree

8 files changed

+483
-62
lines changed

8 files changed

+483
-62
lines changed

‎internal/testing/testdata/exampledata/small-legal-cyclonedx-no-inline.json‎

Lines changed: 280 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,280 @@
1+
{
2+
"bomFormat" : "CycloneDX",
3+
"specVersion" : "1.4",
4+
"serialNumber" : "urn:uuid:0697952e-9848-4785-95bf-f81ff9731682",
5+
"version" : 1,
6+
"metadata" : {
7+
"timestamp" : "2022-11-09T11:14:31Z",
8+
"tools" : [
9+
{
10+
"vendor" : "OWASP Foundation",
11+
"name" : "CycloneDX Maven plugin",
12+
"version" : "2.7.1",
13+
"hashes" : [
14+
{
15+
"alg" : "SHA3-512",
16+
"content" : "72ea0ed8faa3cc4493db96d0223094842e7153890b091ff364040ad3ad89363157fc9d1bd852262124aec83134f0c19aa4fd0fa482031d38a76d74dfd36b7964"
17+
}
18+
]
19+
}
20+
],
21+
"component" : {
22+
"group" : "org.acme",
23+
"name" : "getting-started",
24+
"version" : "1.0.0-SNAPSHOT",
25+
"licenses": [
26+
{
27+
"license": {
28+
"id": "GPL-2.0"
29+
}
30+
},
31+
{
32+
"license": {
33+
"id": "LGPL-3.0-or-later"
34+
}
35+
}
36+
],
37+
"hashes" : [
38+
{
39+
"alg" : "SHA3-512",
40+
"content" : "85240ed8faa3cc4493db96d0223094842e7153890b091ff364040ad3ad89363157fc9d1bd852262124aec83134f0c19aa4fd0fa482031d38a76d74dfd36b7964"
41+
}
42+
],
43+
"purl" : "pkg:maven/org.acme/[email protected]?type=jar",
44+
"type" : "library",
45+
"bom-ref" : "pkg:maven/org.acme/[email protected]?type=jar"
46+
}
47+
},
48+
"components" : [
49+
{
50+
"publisher" : "JBoss by Red Hat",
51+
"group" : "io.quarkus",
52+
"name" : "quarkus-resteasy-reactive",
53+
"version" : "2.13.4.Final",
54+
"description" : "A JAX-RS implementation utilizing build time processing and Vert.x. This extension is not compatible with the quarkus-resteasy extension, or any of the extensions that depend on it.",
55+
"scope" : "optional",
56+
"hashes" : [
57+
{
58+
"alg" : "MD5",
59+
"content" : "bf39044af8c6ba66fc3beb034bc82ae8"
60+
},
61+
{
62+
"alg" : "SHA3-512",
63+
"content" : "615e56bdfeb591af8b5fdeadf019f8fa729643232d7e0768674411a7d959bb00e12e114280a6949f871514e1a86e01e0033372a0a826d15720050d7cffb80e69"
64+
}
65+
],
66+
"licenses" : [
67+
{
68+
"license" : {
69+
"id" : "Apache-2.0"
70+
}
71+
}
72+
],
73+
"purl" : "pkg:maven/io.quarkus/[email protected]?type=jar",
74+
"externalReferences" : [
75+
{
76+
"type" : "distribution",
77+
"url" : "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
78+
},
79+
{
80+
"type" : "issue-tracker",
81+
"url" : "https://github.com/quarkusio/quarkus/issues/"
82+
},
83+
{
84+
"type" : "vcs",
85+
"url" : "https://github.com/quarkusio/quarkus"
86+
},
87+
{
88+
"type" : "website",
89+
"url" : "http://www.jboss.org"
90+
},
91+
{
92+
"type" : "mailing-list",
93+
"url" : "http://lists.jboss.org/pipermail/jboss-user/"
94+
}
95+
],
96+
"type" : "library",
97+
"bom-ref" : "pkg:maven/io.quarkus/[email protected]?type=jar"
98+
},
99+
{
100+
"publisher" : "SmallRye",
101+
"group" : "io.smallrye.reactive",
102+
"name" : "smallrye-mutiny-vertx-uri-template",
103+
"version" : "2.27.0",
104+
"description" : "SmallRye Build Parent POM",
105+
"hashes" : [
106+
{
107+
"alg" : "MD5",
108+
"content" : "8756663af131035a2090d83f5f1b4054"
109+
}
110+
],
111+
"licenses" : [
112+
{
113+
"expression" : "Apache-2.0 AND (MIT OR GPL-2.0-only)"
114+
}
115+
],
116+
"purl" : "pkg:maven/io.smallrye.reactive/[email protected]?type=jar",
117+
"externalReferences" : [
118+
{
119+
"type" : "website",
120+
"url" : "https://wwww.smallrye.io"
121+
},
122+
{
123+
"type" : "issue-tracker",
124+
"url" : "https://github.com/smallrye/smallrye-mutiny-vertx-bindings/issues"
125+
},
126+
{
127+
"type" : "vcs",
128+
"url" : "https://github.com/smallrye/smallrye-mutiny-vertx-bindings"
129+
},
130+
{
131+
"type" : "distribution",
132+
"url" : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
133+
}
134+
],
135+
"type" : "library",
136+
"bom-ref" : "pkg:maven/io.smallrye.reactive/[email protected]?type=jar"
137+
},
138+
{
139+
"publisher" : "JBoss by Red Hat",
140+
"group" : "io.quarkus",
141+
"name" : "quarkus-resteasy-reactive-common",
142+
"version" : "2.13.4.Final",
143+
"description" : "Common runtime parts of Quarkus RESTEasy Reactive",
144+
"hashes" : [
145+
{
146+
"alg" : "SHA3-512",
147+
"content" : "54ffa51cb2fb25e70871e4b69489814ebb3d23d4f958e83ef1f811c00a8753c6c30c5bbc1b48b6427357eb70e5c35c7b357f5252e246fbfa00b90ee22ad095e1"
148+
}
149+
],
150+
"licenses" : [
151+
{
152+
"license": {
153+
"id": "Apache-2.0"
154+
}
155+
},
156+
{
157+
"license": {
158+
"name": "Custom license",
159+
"text": {
160+
"content": "This is the text of the custom license I wrote"
161+
}
162+
}
163+
},
164+
{
165+
"license": {
166+
"name": "Custom license 2"
167+
}
168+
}
169+
],
170+
"purl" : "pkg:maven/io.quarkus/[email protected]?type=jar",
171+
"externalReferences" : [
172+
{
173+
"type" : "mailing-list",
174+
"url" : "http://lists.jboss.org/pipermail/jboss-user/"
175+
}
176+
],
177+
"type" : "library",
178+
"bom-ref" : "pkg:maven/io.quarkus/[email protected]?type=jar"
179+
},
180+
{
181+
"publisher" : "JBoss by Red Hat",
182+
"group" : "io.quarkus",
183+
"name" : "netbase",
184+
"version" : ".3",
185+
"description" : "Common runtime parts of Quarkus RESTEasy Reactive",
186+
"hashes" : [
187+
{
188+
"alg" : "SHA3-512",
189+
"content" : "87gna51cb2fb25e70871e4b69489814ebb3d23d4f958e83ef1f811c00a8753c6c30c5bbc1b48b6427357eb70e5c35c7b357f5252e246fbfa00b90ee22ad095e1"
190+
}
191+
],
192+
"licenses" : [
193+
{
194+
"license": {
195+
"id": "Apache-2.0"
196+
}
197+
},
198+
{
199+
"license": {
200+
"name": "Custom license",
201+
"text": {
202+
"content": "This is the text of the custom license I wrote"
203+
}
204+
}
205+
}
206+
],
207+
"purl" : "pkg:deb/debian/[email protected]?arch=all\u0026distro=debian-11",
208+
"externalReferences" : [
209+
{
210+
"type" : "mailing-list",
211+
"url" : "http://lists.jboss.org/pipermail/jboss-user/"
212+
}
213+
],
214+
"type" : "library",
215+
"bom-ref" : "pkg:deb/debian/[email protected]?arch=all\u0026distro=debian-11\u0026package-id=913906225fd3778b"
216+
},
217+
{
218+
"publisher" : "Eclipse Foundation",
219+
"group" : "org.eclipse.microprofile.context-propagation",
220+
"name" : "microprofile-context-propagation-api",
221+
"version" : "1.2",
222+
"description" : "MicroProfile Context Propagation :: API",
223+
"hashes" : [
224+
{
225+
"alg" : "SHA-256",
226+
"content" : "1576e21f3bf9cc3a3092e7cd40e9c9fef70532223af98a9218c1c9c885a71251"
227+
}
228+
],
229+
"licenses" : [
230+
{
231+
"license": {
232+
"name": "Custom license",
233+
"bom-ref" : "LicenseRef-a7fb6b15"
234+
}
235+
},
236+
{
237+
"license": {
238+
"name": "Custom license 2",
239+
"bom-ref" : "LicenseRef-59a01e67"
240+
}
241+
}
242+
],
243+
"purl" : "pkg:maven/org.eclipse.microprofile.context-propagation/[email protected]?type=jar",
244+
"externalReferences" : [
245+
{
246+
"type" : "website",
247+
"url" : "http://www.eclipse.org/"
248+
},
249+
{
250+
"type" : "distribution",
251+
"url" : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
252+
},
253+
{
254+
"type" : "issue-tracker",
255+
"url" : "https://github.com/eclipse/microprofile-context-propagation/issues"
256+
},
257+
{
258+
"type" : "vcs",
259+
"url" : "https://github.com/eclipse/microprofile-context-propagation"
260+
}
261+
],
262+
"type" : "library",
263+
"bom-ref" : "pkg:maven/org.eclipse.microprofile.context-propagation/[email protected]?type=jar"
264+
}
265+
],
266+
"dependencies" : [
267+
{
268+
"ref" : "pkg:maven/org.acme/[email protected]?type=jar",
269+
"dependsOn" : [
270+
"pkg:maven/io.quarkus/[email protected]?type=jar"
271+
]
272+
},
273+
{
274+
"ref" : "pkg:maven/io.quarkus/[email protected]?type=jar",
275+
"dependsOn" : [
276+
"pkg:maven/io.quarkus/[email protected]?type=jar"
277+
]
278+
}
279+
]
280+
}

0 commit comments

Comments
 (0)