This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch support-ivy-as-component-source
in repository https://gitbox.apache.org/repos/asf/ant-antlibs-cyclonedx.git
The following commit(s) were added to
refs/heads/support-ivy-as-component-source by this push:
new f06c63f make templateComponent work for referenced components
f06c63f is described below
commit f06c63f300476a74b18b5311b420938c069e761b
Author: Stefan Bodewig <[email protected]>
AuthorDate: Sun Aug 16 07:43:07 2026 +0200
make templateComponent work for referenced components
---
example/ant-cyclonedx-0.2alpha.cdx.diff | 284 +++++++----------------
example/ant-cyclonedx-0.2alpha.cdx.json | 32 +--
example/ant-cyclonedx-0.2alpha.ivy.cdx.json | 136 +++++++++--
src/main/org/apache/ant/cyclonedx/Component.java | 3 +
4 files changed, 220 insertions(+), 235 deletions(-)
diff --git a/example/ant-cyclonedx-0.2alpha.cdx.diff
b/example/ant-cyclonedx-0.2alpha.cdx.diff
index 6bf9d08..b8b809e 100644
--- a/example/ant-cyclonedx-0.2alpha.cdx.diff
+++ b/example/ant-cyclonedx-0.2alpha.cdx.diff
@@ -1,5 +1,5 @@
---- ant-cyclonedx-0.2alpha.cdx.json 2026-08-15 20:25:55.771468081 +0200
-+++ ant-cyclonedx-0.2alpha.ivy.cdx.json 2026-08-15 20:25:49.100344456
+0200
+--- ant-cyclonedx-0.2alpha.cdx.json 2026-08-16 07:37:00.362354025 +0200
++++ ant-cyclonedx-0.2alpha.ivy.cdx.json 2026-08-16 07:36:53.586777324
+0200
@@ -253,36 +253,64 @@
"components" : [
{
@@ -246,18 +246,18 @@
- "url" : "https://github.com/FasterXML/jackson-dataformat-xml";
+ "alg" : "SHA-256",
+ "content" :
"cc3a0e540791a9a1cbcd7584767b84572ffda0b72823856558f47dea69ae8ed1"
-+ },
-+ {
+ },
+ {
+- "type" : "bom",
+- "url" :
"https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.22.1/jackson-dataformat-xml-2.22.1-sbom-cyclonedx.json";
+ "alg" : "SHA-512",
+ "content" :
"12398c493aa3b54716813a6297b72104fa52ab324bae54512e41a1285ac756fcbb800084c088f8e9d3aceae2e698ca164bc547421d5fe2fb62ed2dadf1d3d000"
+ },
+ {
+ "alg" : "SHA3-256",
+ "content" :
"2d33856e0e0aa27571950d57227a66ab78f22c5cecf7c07afc3ad4dbe3b4b4ae"
- },
- {
-- "type" : "bom",
-- "url" :
"https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.22.1/jackson-dataformat-xml-2.22.1-sbom-cyclonedx.json";
++ },
++ {
+ "alg" : "SHA3-512",
+ "content" :
"47bdf965089a1949286216aed3b286d8990a3b9169dacb15f0a6f36df07ee397d0ecbcc1294228479068cdbff4b1d8a11718ad5efa744952c34eb092e62cf644"
+ },
@@ -347,10 +347,9 @@
- }
- ],
- "purl" :
"pkg:maven/com.jcraft/[email protected]?type=jar",
-+ "purl" :
"pkg:maven/com.github.package-url/[email protected]?type=jar",
- "externalReferences" : [
- {
- "type" : "website",
+- "externalReferences" : [
+- {
+- "type" : "website",
- "url" : "http://www.jcraft.com/";
- }
- ]
@@ -417,9 +416,10 @@
- }
- ],
- "purl" : "pkg:maven/com.jcraft/[email protected]?type=jar",
-- "externalReferences" : [
-- {
-- "type" : "website",
++ "purl" :
"pkg:maven/com.github.package-url/[email protected]?type=jar",
+ "externalReferences" : [
+ {
+ "type" : "website",
- "url" : "http://www.jcraft.com/";
+ "url" : "https://github.com/package-url/packageurl-java";
}
@@ -545,232 +545,114 @@
}
]
},
-@@ -984,168 +882,119 @@
- "type" : "library",
- "bom-ref" : "pkg:maven/org.apache.ant/[email protected]?type=jar",
- "isExternal" : true,
-- "supplier" : {
-- "name" : "Apache Ant Project Management Committee",
-- "url" : [
-- "https://ant.apache.org/";
-- ]
-- },
+@@ -993,6 +891,40 @@
"group" : "org.apache.ant",
"name" : "ant-launcher",
"version" : "1.10.17",
-- "licenses" : [
-- {
-- "license" : {
-- "id" : "Apache-2.0",
-- "url" : "https://www.apache.org/licenses/LICENSE-2.0.txt";
-- }
-- }
-- ],
-- "purl" : "pkg:maven/org.apache.ant/[email protected]?type=jar",
-- "externalReferences" : [
-- {
-- "type" : "vcs",
-- "url" : "https://gitbox.apache.org/repos/asf/ant.git";
-- },
-- {
-- "type" : "issue-tracker",
-- "url" : "https://bz.apache.org/bugzilla/buglist.cgi?product=Ant";
-- },
-- {
-- "type" : "website",
-- "url" : "https://ant.apache.org/";
-- },
-- {
-- "type" : "advisories",
-- "url" :
"https://ant.apache.org/security.html#Apache%20Ant%20Security%20Vulnerabilities";
-- },
+ "hashes" : [
- {
-- "type" : "mailing-list",
-- "url" : "https://ant.apache.org/mail.html";
++ {
+ "alg" : "MD5",
+ "content" : "6f03c0937a15756fd7bc7bb98d6ee360"
- },
- {
-- "type" : "documentation",
-- "url" : "https://ant.apache.org/manual/";
++ },
++ {
+ "alg" : "SHA-1",
+ "content" : "a65884e1ff214f724a6e9c089365c71935c488e4"
- },
- {
-- "type" : "source-distribution",
-- "url" : "https://ant.apache.org/srcdownload.cgi";
++ },
++ {
+ "alg" : "SHA-256",
+ "content" :
"f6e3de06dc0ea396638004f1a003f55fdbd20c3e7ccfb9b7a524f49fd0ae8568"
- },
- {
-- "type" : "distribution",
-- "url" : "https://ant.apache.org/bindownload.cgi";
++ },
++ {
+ "alg" : "SHA-512",
+ "content" :
"73fef113f238f6fcfe94e7d58824207ea6557626262f27d3bd20ab3bbba6af848ee5998ad915a7fa3999e0e368bb1f7ae1bf90888295989a15236a73c7d08709"
- },
- {
-- "type" : "license",
-- "url" : "https://www.apache.org/licenses/LICENSE-2.0.txt";
++ },
++ {
+ "alg" : "SHA3-256",
+ "content" :
"80ef280b77fd566dde6c6438a974f993db7540dc7a99ea89e43557df769a7f17"
- },
- {
-- "type" : "release-notes",
-- "url" : "https://github.com/apache/ant/blob/master/WHATSNEW";
++ },
++ {
+ "alg" : "SHA3-512",
+ "content" :
"b9700c9f92513d503c806ed1ce2fed1d351a79f609ac8b30d4ec27580b0976d67cbecbe040647c7602f549f18ef8ac4fa37cc54d47a577e5046f0f86ff21de39"
- },
- {
-- "type" : "security-contact",
-- "url" : "https://www.apache.org/security/";
++ },
++ {
+ "alg" : "SHA-384",
+ "content" :
"3cfaf78d72581170b94df32d7b069bab2e10fa8ae56d2973de3a750ec45aaeb194d89714dacc77af8f9892802a4a7ec6"
- },
- {
-- "type" : "rfc-9116",
-- "url" : "https://ant.apache.org/.well-known/security.txt";
++ },
++ {
+ "alg" : "SHA3-384",
+ "content" :
"447a649c728ffc652a3676904a3001e41cd10387dafe90df97fa121c8e824822a98a00b9a3de3cbd93b19355ad51d7a7"
- }
-- ]
-- },
-- {
-- "type" : "library",
-- "bom-ref" : "pkg:maven/org.apache.ant/[email protected]?type=jar",
-- "isExternal" : true,
-- "supplier" : {
-- "name" : "Apache Ant Project Management Committee",
-- "url" : [
-- "https://ant.apache.org/";
-- ]
-- },
-- "group" : "org.apache.ant",
-- "name" : "ant",
-- "version" : "1.10.17",
++ }
+ ],
"licenses" : [
{
"license" : {
-- "id" : "Apache-2.0",
-+ "name" : "The Apache Software License, Version 2.0",
- "url" : "https://www.apache.org/licenses/LICENSE-2.0.txt";
- }
- }
- ],
-- "purl" : "pkg:maven/org.apache.ant/[email protected]?type=jar",
-+ "purl" : "pkg:maven/org.apache.ant/[email protected]?type=jar",
- "externalReferences" : [
- {
-- "type" : "vcs",
-- "url" : "https://gitbox.apache.org/repos/asf/ant.git";
-- },
-- {
-- "type" : "issue-tracker",
-- "url" : "https://bz.apache.org/bugzilla/buglist.cgi?product=Ant";
-- },
-- {
- "type" : "website",
- "url" : "https://ant.apache.org/";
-- },
-- {
-- "type" : "advisories",
-- "url" :
"https://ant.apache.org/security.html#Apache%20Ant%20Security%20Vulnerabilities";
-- },
-+ }
-+ ]
-+ },
-+ {
-+ "type" : "library",
-+ "bom-ref" : "pkg:maven/org.apache.ant/[email protected]?type=jar",
-+ "isExternal" : true,
-+ "group" : "org.apache.ant",
-+ "name" : "ant",
-+ "version" : "1.10.17",
+@@ -1066,6 +998,40 @@
+ "group" : "org.apache.ant",
+ "name" : "ant",
+ "version" : "1.10.17",
+ "hashes" : [
- {
-- "type" : "mailing-list",
-- "url" : "https://ant.apache.org/mail.html";
++ {
+ "alg" : "MD5",
+ "content" : "7deb57aad47476c63e707ea57533e43b"
- },
- {
-- "type" : "documentation",
-- "url" : "https://ant.apache.org/manual/";
++ },
++ {
+ "alg" : "SHA-1",
+ "content" : "fa8a13422ac460563171d10a37c3f28340a953f6"
- },
- {
-- "type" : "source-distribution",
-- "url" : "https://ant.apache.org/srcdownload.cgi";
++ },
++ {
+ "alg" : "SHA-256",
+ "content" :
"8be692e02837f41a47a3d21cde6655792142fdf42fe23bcb16d7129cad9b2284"
- },
- {
-- "type" : "distribution",
-- "url" : "https://ant.apache.org/bindownload.cgi";
++ },
++ {
+ "alg" : "SHA-512",
+ "content" :
"f1cc1a82e1abcf613d4ccf080f83fcd51acd7d4a2f1c2841cca90dd1ebaa96fab2df6411abd2cf97e2ec74231b1540a5d15c12117ba777ab1538b61f9f2b5fa9"
- },
- {
-- "type" : "license",
-- "url" : "https://www.apache.org/licenses/LICENSE-2.0.txt";
++ },
++ {
+ "alg" : "SHA3-256",
+ "content" :
"540a9cc40d8c9c4e004b04bd6af4a590e18d2077e93d441a9dcbdf90798b31b6"
- },
- {
-- "type" : "release-notes",
-- "url" : "https://github.com/apache/ant/blob/master/WHATSNEW";
++ },
++ {
+ "alg" : "SHA3-512",
+ "content" :
"7a65837340a624a8f9eb68a56c78b6891ddf95cd617ccbc227e2fe88b53f59c2cea7d856b4d803898f2bb2317dbc8f8124d3c35154e3cee555d97fe064a8739d"
- },
- {
-- "type" : "security-contact",
-- "url" : "https://www.apache.org/security/";
++ },
++ {
+ "alg" : "SHA-384",
+ "content" :
"2af275805479b9cfcfdae25f19cce911922207bc2fb77c2c44caf8633c56cd7d772ab30134bac68aacf0ea6e444fa50c"
- },
- {
-- "type" : "rfc-9116",
-- "url" : "https://ant.apache.org/.well-known/security.txt";
++ },
++ {
+ "alg" : "SHA3-384",
+ "content" :
"71205d360f909df37fef5b427538c22977e01801108a1cb37387d1f72e784509796a915c2069a12762a78b990d0aa207"
- }
-- ]
-- },
-- {
-- "type" : "library",
-- "bom-ref" :
"pkg:maven/org.apache.commons/[email protected]?type=jar",
-- "group" : "org.apache.commons",
-- "name" : "commons-codec",
-- "version" : "1.18.0",
++ }
+ ],
"licenses" : [
{
"license" : {
-- "id" : "Apache-2.0",
-+ "name" : "The Apache Software License, Version 2.0",
- "url" : "https://www.apache.org/licenses/LICENSE-2.0.txt";
- }
- }
- ],
-- "purl" : "pkg:maven/org.apache.commons/[email protected]?type=jar"
-+ "purl" : "pkg:maven/org.apache.ant/[email protected]?type=jar",
-+ "externalReferences" : [
-+ {
-+ "type" : "website",
-+ "url" : "https://ant.apache.org/";
-+ }
-+ ]
+@@ -1128,24 +1094,7 @@
},
{
"type" : "library",
+- "bom-ref" :
"pkg:maven/org.apache.commons/[email protected]?type=jar",
+- "group" : "org.apache.commons",
+- "name" : "commons-codec",
+- "version" : "1.18.0",
+- "licenses" : [
+- {
+- "license" : {
+- "id" : "Apache-2.0",
+- "url" : "https://www.apache.org/licenses/LICENSE-2.0.txt";
+- }
+- }
+- ],
+- "purl" : "pkg:maven/org.apache.commons/[email protected]?type=jar"
+- },
+- {
+- "type" : "library",
"bom-ref" :
"pkg:maven/org.apache.commons/[email protected]?type=jar",
- "publisher" : "The Apache Software Foundation",
"group" : "org.apache.commons",
"name" : "commons-collections4",
"version" : "4.5.0",
-@@ -1187,63 +1036,22 @@
+@@ -1187,63 +1136,22 @@
"licenses" : [
{
"license" : {
@@ -836,7 +718,7 @@
"group" : "org.apache.commons",
"name" : "commons-lang3",
"version" : "3.20.0",
-@@ -1285,95 +1093,26 @@
+@@ -1285,95 +1193,26 @@
"licenses" : [
{
"license" : {
@@ -935,7 +817,7 @@
"hashes" : [
{
"alg" : "MD5",
-@@ -1411,93 +1150,21 @@
+@@ -1411,93 +1250,21 @@
"licenses" : [
{
"license" : {
@@ -1032,7 +914,7 @@
"bom-ref" : "pkg:maven/org.codehaus.woodstox/[email protected]?type=jar",
"group" : "org.codehaus.woodstox",
"name" : "stax2-api",
-@@ -1540,17 +1207,22 @@
+@@ -1540,17 +1307,22 @@
"licenses" : [
{
"license" : {
@@ -1058,7 +940,7 @@
"group" : "org.cyclonedx",
"name" : "cyclonedx-core-java",
"version" : "13.1.0",
-@@ -1592,62 +1264,146 @@
+@@ -1592,62 +1364,146 @@
"licenses" : [
{
"license" : {
@@ -1106,14 +988,14 @@
+ {
+ "alg" : "SHA-512",
+ "content" :
"9a3e79db6666a6096a3021bb2e1d918f30f589d8de51d6b600f8ebd92515a510ae2d8f87919cc2dfa8365d64f10194cac8dfa0fb950160eef0e9da06f6caaeb9"
-+ },
-+ {
-+ "alg" : "SHA3-256",
-+ "content" :
"00559b4f4066b4917ba4fe2a6f23111eaeada321112d030910d218ced9084b5e"
},
{
- "type" : "distribution-intake",
- "url" :
"https://oss.sonatype.org/service/local/staging/deploy/maven2/";
++ "alg" : "SHA3-256",
++ "content" :
"00559b4f4066b4917ba4fe2a6f23111eaeada321112d030910d218ced9084b5e"
++ },
++ {
+ "alg" : "SHA3-512",
+ "content" :
"9579c2f7e7516e177c2d493ccc9eb8150978cf19f6f09b28d116f6935239fd56dc6af2b62b3336f79b0b462445550cd1fb5377a07001a6f44aaab6a32fa2fa47"
},
@@ -1227,7 +1109,7 @@
},
{
"ref" :
"pkg:maven/com.fasterxml.jackson.core/[email protected]?type=jar",
-@@ -1667,10 +1423,33 @@
+@@ -1667,10 +1523,33 @@
]
},
{
@@ -1261,7 +1143,7 @@
"ref" : "pkg:maven/commons-codec/[email protected]?type=jar",
"dependsOn" : [ ]
},
-@@ -1681,8 +1460,10 @@
+@@ -1681,8 +1560,10 @@
{
"ref" : "pkg:maven/org.apache.ant/[email protected]?type=jar",
"dependsOn" : [
@@ -1272,7 +1154,7 @@
"pkg:maven/org.cyclonedx/[email protected]?type=jar"
]
},
-@@ -1698,9 +1479,7 @@
+@@ -1698,9 +1579,7 @@
},
{
"ref" :
"pkg:maven/org.apache.commons/[email protected]?type=jar",
@@ -1283,7 +1165,7 @@
},
{
"ref" : "pkg:maven/org.apache.commons/[email protected]?type=jar",
-@@ -1708,20 +1487,7 @@
+@@ -1708,20 +1587,7 @@
},
{
"ref" : "pkg:maven/org.apache.ivy/[email protected]?type=jar",
@@ -1305,7 +1187,7 @@
},
{
"ref" : "pkg:maven/org.codehaus.woodstox/[email protected]?type=jar",
-@@ -1738,6 +1504,14 @@
+@@ -1738,6 +1604,14 @@
"pkg:maven/org.apache.commons/[email protected]?type=jar",
"pkg:maven/org.apache.commons/[email protected]?type=jar"
]
diff --git a/example/ant-cyclonedx-0.2alpha.cdx.json
b/example/ant-cyclonedx-0.2alpha.cdx.json
index 1e8bed0..5307f47 100644
--- a/example/ant-cyclonedx-0.2alpha.cdx.json
+++ b/example/ant-cyclonedx-0.2alpha.cdx.json
@@ -34,35 +34,35 @@
"hashes" : [
{
"alg" : "MD5",
- "content" : "93377dd0fcea7a2d943bde92bdb2056d"
+ "content" : "ff19edcb045b48fe416334fd6b5b40a2"
},
{
"alg" : "SHA-1",
- "content" : "25394ae9ad3888e7e3634099cce4d75b2f2e6862"
+ "content" : "899e5a281d8e289c90b8e0f943a69ad13487237f"
},
{
"alg" : "SHA-256",
- "content" :
"ddab2702eeda163f45f2171c4ede688e2f009bb3c69491f7a60b7d95d425eaa2"
+ "content" :
"73bcb63a39021cc866f4818cf09cb5cbac58e414d5b8ba19dad7b6628f755b60"
},
{
"alg" : "SHA-512",
- "content" :
"4fe694b6825907a148eff248d8610fb11ce6458104c7d5b734d9143a01df86fea019209ed8197850bdb84f1244365e05f689ace02355473008d1fc8866f8547f"
+ "content" :
"0c933c2479b4c1a3db6dbb8a2c29b2db580432acf079f543e7689163dde9595e39571c2497c8d8c1c0a133ea4f4808e7bd0d6770d4ee81612a83aac3775dfa7d"
},
{
"alg" : "SHA3-256",
- "content" :
"daa143aa46e4bc6a5116227deb0236b99aaa3d15e213db19b83e358aa9aca434"
+ "content" :
"5e3c494ad79c055e31e9f095624336239e1de3186e5bf0fa1c58f75e3fcc97a1"
},
{
"alg" : "SHA3-512",
- "content" :
"2656e4e335c95aaf2a531182d47f911218cb4f372cd676ea43437292e0a6a6f5c9a4581126e3ef2e1f2d2cb7a5ac928a8db7bc27fff8bcfd3a7c0b709d97d906"
+ "content" :
"bf3e2e810d97d8f89732123f8bcab0fdf29674a5e45272e298ea69e695c00ba046d0a75659d405559ac899bace07540cf4693d2a6e58e28c04d8e30be551fdfb"
},
{
"alg" : "SHA-384",
- "content" :
"f4d9f57cd6a5f17ae04201b6fa123572c1fa4552e3a61633bec3f598f1f3cf52eaad4d23560262af6a6c63e9d701801d"
+ "content" :
"41645f20d50bc11e048c0b5963fb7f0126d6f5b18b4edf5aa33dbac9aea9e693713a8821bcb2b58f445fab561c64f4cc"
},
{
"alg" : "SHA3-384",
- "content" :
"b3ba3c9d1206fa7cf3d1a90f12f145ce742ace71446cce5dc4ab3e98480933b55d8fc7c9d00cf19bc2d8faf88c3607a1"
+ "content" :
"7f6257e7202882b8d2c7758f9b10596489022547f1cc4e924599c75b66c57c520a3b8ec7c55abe984215b88639dd3758"
}
],
"licenses" : [
@@ -146,35 +146,35 @@
"hashes" : [
{
"alg" : "MD5",
- "content" : "93377dd0fcea7a2d943bde92bdb2056d"
+ "content" : "ff19edcb045b48fe416334fd6b5b40a2"
},
{
"alg" : "SHA-1",
- "content" : "25394ae9ad3888e7e3634099cce4d75b2f2e6862"
+ "content" : "899e5a281d8e289c90b8e0f943a69ad13487237f"
},
{
"alg" : "SHA-256",
- "content" :
"ddab2702eeda163f45f2171c4ede688e2f009bb3c69491f7a60b7d95d425eaa2"
+ "content" :
"73bcb63a39021cc866f4818cf09cb5cbac58e414d5b8ba19dad7b6628f755b60"
},
{
"alg" : "SHA-512",
- "content" :
"4fe694b6825907a148eff248d8610fb11ce6458104c7d5b734d9143a01df86fea019209ed8197850bdb84f1244365e05f689ace02355473008d1fc8866f8547f"
+ "content" :
"0c933c2479b4c1a3db6dbb8a2c29b2db580432acf079f543e7689163dde9595e39571c2497c8d8c1c0a133ea4f4808e7bd0d6770d4ee81612a83aac3775dfa7d"
},
{
"alg" : "SHA3-256",
- "content" :
"daa143aa46e4bc6a5116227deb0236b99aaa3d15e213db19b83e358aa9aca434"
+ "content" :
"5e3c494ad79c055e31e9f095624336239e1de3186e5bf0fa1c58f75e3fcc97a1"
},
{
"alg" : "SHA3-512",
- "content" :
"2656e4e335c95aaf2a531182d47f911218cb4f372cd676ea43437292e0a6a6f5c9a4581126e3ef2e1f2d2cb7a5ac928a8db7bc27fff8bcfd3a7c0b709d97d906"
+ "content" :
"bf3e2e810d97d8f89732123f8bcab0fdf29674a5e45272e298ea69e695c00ba046d0a75659d405559ac899bace07540cf4693d2a6e58e28c04d8e30be551fdfb"
},
{
"alg" : "SHA-384",
- "content" :
"f4d9f57cd6a5f17ae04201b6fa123572c1fa4552e3a61633bec3f598f1f3cf52eaad4d23560262af6a6c63e9d701801d"
+ "content" :
"41645f20d50bc11e048c0b5963fb7f0126d6f5b18b4edf5aa33dbac9aea9e693713a8821bcb2b58f445fab561c64f4cc"
},
{
"alg" : "SHA3-384",
- "content" :
"b3ba3c9d1206fa7cf3d1a90f12f145ce742ace71446cce5dc4ab3e98480933b55d8fc7c9d00cf19bc2d8faf88c3607a1"
+ "content" :
"7f6257e7202882b8d2c7758f9b10596489022547f1cc4e924599c75b66c57c520a3b8ec7c55abe984215b88639dd3758"
}
],
"licenses" : [
diff --git a/example/ant-cyclonedx-0.2alpha.ivy.cdx.json
b/example/ant-cyclonedx-0.2alpha.ivy.cdx.json
index 6a0c152..39a761d 100644
--- a/example/ant-cyclonedx-0.2alpha.ivy.cdx.json
+++ b/example/ant-cyclonedx-0.2alpha.ivy.cdx.json
@@ -34,35 +34,35 @@
"hashes" : [
{
"alg" : "MD5",
- "content" : "93377dd0fcea7a2d943bde92bdb2056d"
+ "content" : "ff19edcb045b48fe416334fd6b5b40a2"
},
{
"alg" : "SHA-1",
- "content" : "25394ae9ad3888e7e3634099cce4d75b2f2e6862"
+ "content" : "899e5a281d8e289c90b8e0f943a69ad13487237f"
},
{
"alg" : "SHA-256",
- "content" :
"ddab2702eeda163f45f2171c4ede688e2f009bb3c69491f7a60b7d95d425eaa2"
+ "content" :
"73bcb63a39021cc866f4818cf09cb5cbac58e414d5b8ba19dad7b6628f755b60"
},
{
"alg" : "SHA-512",
- "content" :
"4fe694b6825907a148eff248d8610fb11ce6458104c7d5b734d9143a01df86fea019209ed8197850bdb84f1244365e05f689ace02355473008d1fc8866f8547f"
+ "content" :
"0c933c2479b4c1a3db6dbb8a2c29b2db580432acf079f543e7689163dde9595e39571c2497c8d8c1c0a133ea4f4808e7bd0d6770d4ee81612a83aac3775dfa7d"
},
{
"alg" : "SHA3-256",
- "content" :
"daa143aa46e4bc6a5116227deb0236b99aaa3d15e213db19b83e358aa9aca434"
+ "content" :
"5e3c494ad79c055e31e9f095624336239e1de3186e5bf0fa1c58f75e3fcc97a1"
},
{
"alg" : "SHA3-512",
- "content" :
"2656e4e335c95aaf2a531182d47f911218cb4f372cd676ea43437292e0a6a6f5c9a4581126e3ef2e1f2d2cb7a5ac928a8db7bc27fff8bcfd3a7c0b709d97d906"
+ "content" :
"bf3e2e810d97d8f89732123f8bcab0fdf29674a5e45272e298ea69e695c00ba046d0a75659d405559ac899bace07540cf4693d2a6e58e28c04d8e30be551fdfb"
},
{
"alg" : "SHA-384",
- "content" :
"f4d9f57cd6a5f17ae04201b6fa123572c1fa4552e3a61633bec3f598f1f3cf52eaad4d23560262af6a6c63e9d701801d"
+ "content" :
"41645f20d50bc11e048c0b5963fb7f0126d6f5b18b4edf5aa33dbac9aea9e693713a8821bcb2b58f445fab561c64f4cc"
},
{
"alg" : "SHA3-384",
- "content" :
"b3ba3c9d1206fa7cf3d1a90f12f145ce742ace71446cce5dc4ab3e98480933b55d8fc7c9d00cf19bc2d8faf88c3607a1"
+ "content" :
"7f6257e7202882b8d2c7758f9b10596489022547f1cc4e924599c75b66c57c520a3b8ec7c55abe984215b88639dd3758"
}
],
"licenses" : [
@@ -146,35 +146,35 @@
"hashes" : [
{
"alg" : "MD5",
- "content" : "93377dd0fcea7a2d943bde92bdb2056d"
+ "content" : "ff19edcb045b48fe416334fd6b5b40a2"
},
{
"alg" : "SHA-1",
- "content" : "25394ae9ad3888e7e3634099cce4d75b2f2e6862"
+ "content" : "899e5a281d8e289c90b8e0f943a69ad13487237f"
},
{
"alg" : "SHA-256",
- "content" :
"ddab2702eeda163f45f2171c4ede688e2f009bb3c69491f7a60b7d95d425eaa2"
+ "content" :
"73bcb63a39021cc866f4818cf09cb5cbac58e414d5b8ba19dad7b6628f755b60"
},
{
"alg" : "SHA-512",
- "content" :
"4fe694b6825907a148eff248d8610fb11ce6458104c7d5b734d9143a01df86fea019209ed8197850bdb84f1244365e05f689ace02355473008d1fc8866f8547f"
+ "content" :
"0c933c2479b4c1a3db6dbb8a2c29b2db580432acf079f543e7689163dde9595e39571c2497c8d8c1c0a133ea4f4808e7bd0d6770d4ee81612a83aac3775dfa7d"
},
{
"alg" : "SHA3-256",
- "content" :
"daa143aa46e4bc6a5116227deb0236b99aaa3d15e213db19b83e358aa9aca434"
+ "content" :
"5e3c494ad79c055e31e9f095624336239e1de3186e5bf0fa1c58f75e3fcc97a1"
},
{
"alg" : "SHA3-512",
- "content" :
"2656e4e335c95aaf2a531182d47f911218cb4f372cd676ea43437292e0a6a6f5c9a4581126e3ef2e1f2d2cb7a5ac928a8db7bc27fff8bcfd3a7c0b709d97d906"
+ "content" :
"bf3e2e810d97d8f89732123f8bcab0fdf29674a5e45272e298ea69e695c00ba046d0a75659d405559ac899bace07540cf4693d2a6e58e28c04d8e30be551fdfb"
},
{
"alg" : "SHA-384",
- "content" :
"f4d9f57cd6a5f17ae04201b6fa123572c1fa4552e3a61633bec3f598f1f3cf52eaad4d23560262af6a6c63e9d701801d"
+ "content" :
"41645f20d50bc11e048c0b5963fb7f0126d6f5b18b4edf5aa33dbac9aea9e693713a8821bcb2b58f445fab561c64f4cc"
},
{
"alg" : "SHA3-384",
- "content" :
"b3ba3c9d1206fa7cf3d1a90f12f145ce742ace71446cce5dc4ab3e98480933b55d8fc7c9d00cf19bc2d8faf88c3607a1"
+ "content" :
"7f6257e7202882b8d2c7758f9b10596489022547f1cc4e924599c75b66c57c520a3b8ec7c55abe984215b88639dd3758"
}
],
"licenses" : [
@@ -882,6 +882,12 @@
"type" : "library",
"bom-ref" : "pkg:maven/org.apache.ant/[email protected]?type=jar",
"isExternal" : true,
+ "supplier" : {
+ "name" : "Apache Ant Project Management Committee",
+ "url" : [
+ "https://ant.apache.org/";
+ ]
+ },
"group" : "org.apache.ant",
"name" : "ant-launcher",
"version" : "1.10.17",
@@ -922,16 +928,60 @@
"licenses" : [
{
"license" : {
- "name" : "The Apache Software License, Version 2.0",
+ "id" : "Apache-2.0",
"url" : "https://www.apache.org/licenses/LICENSE-2.0.txt";
}
}
],
"purl" : "pkg:maven/org.apache.ant/[email protected]?type=jar",
"externalReferences" : [
+ {
+ "type" : "vcs",
+ "url" : "https://gitbox.apache.org/repos/asf/ant.git";
+ },
+ {
+ "type" : "issue-tracker",
+ "url" : "https://bz.apache.org/bugzilla/buglist.cgi?product=Ant";
+ },
{
"type" : "website",
"url" : "https://ant.apache.org/";
+ },
+ {
+ "type" : "advisories",
+ "url" :
"https://ant.apache.org/security.html#Apache%20Ant%20Security%20Vulnerabilities";
+ },
+ {
+ "type" : "mailing-list",
+ "url" : "https://ant.apache.org/mail.html";
+ },
+ {
+ "type" : "documentation",
+ "url" : "https://ant.apache.org/manual/";
+ },
+ {
+ "type" : "source-distribution",
+ "url" : "https://ant.apache.org/srcdownload.cgi";
+ },
+ {
+ "type" : "distribution",
+ "url" : "https://ant.apache.org/bindownload.cgi";
+ },
+ {
+ "type" : "license",
+ "url" : "https://www.apache.org/licenses/LICENSE-2.0.txt";
+ },
+ {
+ "type" : "release-notes",
+ "url" : "https://github.com/apache/ant/blob/master/WHATSNEW";
+ },
+ {
+ "type" : "security-contact",
+ "url" : "https://www.apache.org/security/";
+ },
+ {
+ "type" : "rfc-9116",
+ "url" : "https://ant.apache.org/.well-known/security.txt";
}
]
},
@@ -939,6 +989,12 @@
"type" : "library",
"bom-ref" : "pkg:maven/org.apache.ant/[email protected]?type=jar",
"isExternal" : true,
+ "supplier" : {
+ "name" : "Apache Ant Project Management Committee",
+ "url" : [
+ "https://ant.apache.org/";
+ ]
+ },
"group" : "org.apache.ant",
"name" : "ant",
"version" : "1.10.17",
@@ -979,16 +1035,60 @@
"licenses" : [
{
"license" : {
- "name" : "The Apache Software License, Version 2.0",
+ "id" : "Apache-2.0",
"url" : "https://www.apache.org/licenses/LICENSE-2.0.txt";
}
}
],
"purl" : "pkg:maven/org.apache.ant/[email protected]?type=jar",
"externalReferences" : [
+ {
+ "type" : "vcs",
+ "url" : "https://gitbox.apache.org/repos/asf/ant.git";
+ },
+ {
+ "type" : "issue-tracker",
+ "url" : "https://bz.apache.org/bugzilla/buglist.cgi?product=Ant";
+ },
{
"type" : "website",
"url" : "https://ant.apache.org/";
+ },
+ {
+ "type" : "advisories",
+ "url" :
"https://ant.apache.org/security.html#Apache%20Ant%20Security%20Vulnerabilities";
+ },
+ {
+ "type" : "mailing-list",
+ "url" : "https://ant.apache.org/mail.html";
+ },
+ {
+ "type" : "documentation",
+ "url" : "https://ant.apache.org/manual/";
+ },
+ {
+ "type" : "source-distribution",
+ "url" : "https://ant.apache.org/srcdownload.cgi";
+ },
+ {
+ "type" : "distribution",
+ "url" : "https://ant.apache.org/bindownload.cgi";
+ },
+ {
+ "type" : "license",
+ "url" : "https://www.apache.org/licenses/LICENSE-2.0.txt";
+ },
+ {
+ "type" : "release-notes",
+ "url" : "https://github.com/apache/ant/blob/master/WHATSNEW";
+ },
+ {
+ "type" : "security-contact",
+ "url" : "https://www.apache.org/security/";
+ },
+ {
+ "type" : "rfc-9116",
+ "url" : "https://ant.apache.org/.well-known/security.txt";
}
]
},
diff --git a/src/main/org/apache/ant/cyclonedx/Component.java
b/src/main/org/apache/ant/cyclonedx/Component.java
index 07744d3..0ff6803 100644
--- a/src/main/org/apache/ant/cyclonedx/Component.java
+++ b/src/main/org/apache/ant/cyclonedx/Component.java
@@ -138,6 +138,9 @@ public class Component extends DataType {
* @since CycloneDX Antlib 0.2
*/
protected Component(Component other) {
+ if (other.isReference()) {
+ other = other.getRef();
+ }
this.resource = other.resource;
this.type = other.type;
this.name = other.name;
