svn commit: r1934748 - ant/site/ant/production/antlibs/cyclonedx/manual

[bodewig]

Author: bodewig
Date: Fri May 29 12:56:53 2026
New Revision: 1934748

Log:
update manual

Modified:
   ant/site/ant/production/antlibs/cyclonedx/manual/component.html
   ant/site/ant/production/antlibs/cyclonedx/manual/componentbom.html

Modified: ant/site/ant/production/antlibs/cyclonedx/manual/component.html
==============================================================================
--- ant/site/ant/production/antlibs/cyclonedx/manual/component.html     Fri May 
29 11:25:20 2026        (r1934747)
+++ ant/site/ant/production/antlibs/cyclonedx/manual/component.html     Fri May 
29 12:56:53 2026        (r1934748)
@@ -163,12 +163,12 @@
       <li><code>type</code>, <code>name</code>, <code>group</code>, 
<code>version</code>,
         <code>purl</code>, <code>bomRef</code>, <code>scope</code>,
         <code>decription</code>, <code>publisher</code>, <code>copright</code>,
-        <code>mimeType</code> and <code>manufacturer</code> are taken
+        <code>mimeType</code> and <code>supplier</code> are taken
         from the SBOM's metadata component unless they are explicitly
         specified on the component element itself.</li>
       <li><code>manufacturer</code> is taken from the SBOM's metadata
         component unless it is explicitly specified on the component
-        element itself or <code>manufacturerissupplier</code>
+        element itself or <code>supplierismanufacturer</code>
         is <code>true</code>.</li>
       <li>Tags are merged wiht those of the SBOM's metadata
         component.</li>

Modified: ant/site/ant/production/antlibs/cyclonedx/manual/componentbom.html
==============================================================================
--- ant/site/ant/production/antlibs/cyclonedx/manual/componentbom.html  Fri May 
29 11:25:20 2026        (r1934747)
+++ ant/site/ant/production/antlibs/cyclonedx/manual/componentbom.html  Fri May 
29 12:56:53 2026        (r1934748)
@@ -100,6 +100,16 @@
           <code>true</code>.</td>
         <td>No, defaults to <code>false</code>.</td>
       </tr>
+      <tr>
+        <td>useComponentManufacturer</td>
+        <td>If set to <code>true</code> the manufacturer of the SBOM's
+          main component will be used for the SBOM itself.<br/>
+          If this is <code>true</code> the main component must specify
+          a manufacturer. Also you must not use a
+          nested <code>manufacturer</code> child for this task if this is
+          <code>true</code>.</td>
+        <td>No, defaults to <code>false</code>.</td>
+      </tr>
     </table>
 
     <h3>Nested elements</h3>
@@ -120,6 +130,9 @@
     <p>At most one nested <a href="organization.html">organization</a>
       specifies the manufacturer of the SBOM.</p>
 
+    <p>This is prohibited if the <code>useComponentManufacturer</code>
+      attribute is set to <code>true</code>.</p>
+
     <h4 id="supplier">supplier</h4>
 
     <p>At most one nested <a href="organization.html">organization</a>
@@ -174,6 +187,7 @@
         outputdirectory="${output}"
         format="all"
         useComponentSupplier="true"
+        useComponentManufacturer="true"
         xmlns:cdx="antlib:org.apache.ant.cyclonedx">
       &lt;component
           name="ant-cyclonedx-src.tar"
@@ -181,7 +195,7 @@
           description="Apache CycloneDX Antlib Source Distribution"
           publisher="The Apache Software Foundation"
           type="FILE"
-          manufacturerIsSupplier="true">
+          supplierIsManufacturer="true">
         &lt;manufacturer refid="ant-team"/>
         &lt;license refid="apache-2"/>
         &lt;externalReferenceSet refid="antlib-ext-refs"/>