This is an automated email from the ASF dual-hosted git repository.

pjfanning pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/poi.git


The following commit(s) were added to refs/heads/trunk by this push:
     new f039064571 Bump org.cyclonedx.bom from 2.4.1 to 3.2.4 (#1155)
f039064571 is described below

commit f039064571dc6074a31a9298680f79fb08d1f7d6
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Jun 29 16:42:50 2026 +0100

    Bump org.cyclonedx.bom from 2.4.1 to 3.2.4 (#1155)
    
    * Bump org.cyclonedx.bom from 2.4.1 to 3.2.4
    
    Bumps org.cyclonedx.bom from 2.4.1 to 3.2.4.
    
    ---
    updated-dependencies:
    - dependency-name: org.cyclonedx.bom
      dependency-version: 3.2.4
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    
    * Update release-guide.txt
    
    * change config
    
    ---------
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: PJ Fanning <[email protected]>
---
 build.gradle                | 15 +++++++++++++--
 poi-examples/build.gradle   | 19 -------------------
 poi-excelant/build.gradle   | 19 -------------------
 poi-ooxml-full/build.gradle | 19 -------------------
 poi-ooxml-lite/build.gradle | 19 -------------------
 poi-ooxml/build.gradle      | 19 -------------------
 poi-scratchpad/build.gradle | 19 -------------------
 poi/build.gradle            | 19 -------------------
 8 files changed, 13 insertions(+), 135 deletions(-)

diff --git a/build.gradle b/build.gradle
index 891f8a16a6..48c486ca31 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ plugins {
 
     id 'de.thetaphi.forbiddenapis' version '3.10'
     id 'org.sonarqube' version '7.2.3.7755'
-    id 'org.cyclonedx.bom' version '2.4.1'
+    id 'org.cyclonedx.bom' version '3.2.4'
     id 'com.adarshr.test-logger' version '4.0.0'
 }
 
@@ -95,6 +95,18 @@ allprojects {
     apply plugin: 'idea'
 
     version = '6.0.0-SNAPSHOT'
+
+    tasks.cyclonedxDirectBom {
+        // includeConfigs is the list of configuration names to include when 
generating the BOM (leave empty to include every configuration)
+        includeConfigs = ["runtimeClasspath"]
+        // skipConfigs is a list of configuration names to exclude when 
generating the BOM
+        //skipConfigs = ["compileClasspath", "testCompileClasspath"]
+        // Specified the version of the CycloneDX specification to use
+        //schemaVersion = org.cyclonedx.model.schema.SchemaVersion.VERSION_16
+        // Specified the type of project being built. Defaults to 'library'
+        projectType = "library"
+        jsonOutput = file("build/reports/sbom/${project.name}-sbom.json")
+    }
 }
 
 abstract class VerifyModuleInfoIsPresent extends DefaultTask {
@@ -753,7 +765,6 @@ task jenkins(dependsOn: [
             subprojects.javadoc,
             subprojects.jacocoTestReport,
             subprojects.getDeps,
-            'srcDistZip',
             'srcDistTar',
             rat
 ]) {}
diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle
index 6eeb62b6ac..4b788f9b8d 100644
--- a/poi-examples/build.gradle
+++ b/poi-examples/build.gradle
@@ -87,22 +87,3 @@ sourcesJar {
         from("$projectDir/../legal/NOTICE")
     }
 }
-
-cyclonedxBom {
-    // includeConfigs is the list of configuration names to include when 
generating the BOM (leave empty to include every configuration)
-    includeConfigs = ["runtimeClasspath"]
-    // skipConfigs is a list of configuration names to exclude when generating 
the BOM
-    //skipConfigs = ["compileClasspath", "testCompileClasspath"]
-    // Specified the type of project being built. Defaults to 'library'
-    projectType = "library"
-    // Specified the version of the CycloneDX specification to use. Defaults 
to 1.4.
-    schemaVersion = "1.4"
-    // Boms destination directory (defaults to build/reports)
-    destination = file("build/reports")
-    // The file name for the generated BOMs (before the file format suffix). 
Defaults to 'bom'
-    outputName = "poi-examples-${project.version}.bom"
-    // The file format generated, can be xml, json or all for generating both
-    outputFormat = "all"
-    // Exclude BOM Serial Number
-    includeBomSerialNumber = true
-}
diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index 42b4f5b714..ad74db9fab 100644
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -158,22 +158,3 @@ publishing {
         }
     }
 }
-
-cyclonedxBom {
-    // includeConfigs is the list of configuration names to include when 
generating the BOM (leave empty to include every configuration)
-    includeConfigs = ["runtimeClasspath"]
-    // skipConfigs is a list of configuration names to exclude when generating 
the BOM
-    //skipConfigs = ["compileClasspath", "testCompileClasspath"]
-    // Specified the type of project being built. Defaults to 'library'
-    projectType = "library"
-    // Specified the version of the CycloneDX specification to use. Defaults 
to 1.4.
-    schemaVersion = "1.4"
-    // Boms destination directory (defaults to build/reports)
-    destination = file("build/reports")
-    // The file name for the generated BOMs (before the file format suffix). 
Defaults to 'bom'
-    outputName = "poi-excelant-${project.version}.bom"
-    // The file format generated, can be xml, json or all for generating both
-    outputFormat = "all"
-    // Exclude BOM Serial Number
-    includeBomSerialNumber = true
-}
diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle
index 164543b298..8de638b672 100644
--- a/poi-ooxml-full/build.gradle
+++ b/poi-ooxml-full/build.gradle
@@ -163,22 +163,3 @@ spotbugsTest.enabled = false
 spotbugsMain.enabled = false
 javadoc.enabled = false
 javadocJar.enabled = false
-
-cyclonedxBom {
-    // includeConfigs is the list of configuration names to include when 
generating the BOM (leave empty to include every configuration)
-    includeConfigs = ["runtimeClasspath"]
-    // skipConfigs is a list of configuration names to exclude when generating 
the BOM
-    //skipConfigs = ["compileClasspath", "testCompileClasspath"]
-    // Specified the type of project being built. Defaults to 'library'
-    projectType = "library"
-    // Specified the version of the CycloneDX specification to use. Defaults 
to 1.4.
-    schemaVersion = "1.4"
-    // Boms destination directory (defaults to build/reports)
-    destination = file("build/reports")
-    // The file name for the generated BOMs (before the file format suffix). 
Defaults to 'bom'
-    outputName = "poi-ooxml-full-${project.version}.bom"
-    // The file format generated, can be xml, json or all for generating both
-    outputFormat = "all"
-    // Exclude BOM Serial Number
-    includeBomSerialNumber = true
-}
\ No newline at end of file
diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle
index 2096837f2e..a63088104c 100644
--- a/poi-ooxml-lite/build.gradle
+++ b/poi-ooxml-lite/build.gradle
@@ -143,22 +143,3 @@ spotbugsTest.enabled = false
 spotbugsMain.enabled = false
 javadoc.enabled = false
 javadocJar.enabled = false
-
-cyclonedxBom {
-    // includeConfigs is the list of configuration names to include when 
generating the BOM (leave empty to include every configuration)
-    includeConfigs = ["runtimeClasspath"]
-    // skipConfigs is a list of configuration names to exclude when generating 
the BOM
-    //skipConfigs = ["compileClasspath", "testCompileClasspath"]
-    // Specified the type of project being built. Defaults to 'library'
-    projectType = "library"
-    // Specified the version of the CycloneDX specification to use. Defaults 
to 1.4.
-    schemaVersion = "1.4"
-    // Boms destination directory (defaults to build/reports)
-    destination = file("build/reports")
-    // The file name for the generated BOMs (before the file format suffix). 
Defaults to 'bom'
-    outputName = "poi-ooxml-lite-${project.version}.bom"
-    // The file format generated, can be xml, json or all for generating both
-    outputFormat = "all"
-    // Exclude BOM Serial Number
-    includeBomSerialNumber = true
-}
diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index f8fb9fb9f1..78c4ea891a 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -286,22 +286,3 @@ publishing {
         }
     }
 }
-
-cyclonedxBom {
-    // includeConfigs is the list of configuration names to include when 
generating the BOM (leave empty to include every configuration)
-    includeConfigs = ["runtimeClasspath"]
-    // skipConfigs is a list of configuration names to exclude when generating 
the BOM
-    //skipConfigs = ["compileClasspath", "testCompileClasspath"]
-    // Specified the type of project being built. Defaults to 'library'
-    projectType = "library"
-    // Specified the version of the CycloneDX specification to use. Defaults 
to 1.4.
-    schemaVersion = "1.4"
-    // Boms destination directory (defaults to build/reports)
-    destination = file("build/reports")
-    // The file name for the generated BOMs (before the file format suffix). 
Defaults to 'bom'
-    outputName = "poi-ooxml-${project.version}.bom"
-    // The file format generated, can be xml, json or all for generating both
-    outputFormat = "all"
-    // Exclude BOM Serial Number
-    includeBomSerialNumber = true
-}
diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle
index e9efb55e06..f6268784ff 100644
--- a/poi-scratchpad/build.gradle
+++ b/poi-scratchpad/build.gradle
@@ -166,22 +166,3 @@ publishing {
         }
     }
 }
-
-cyclonedxBom {
-    // includeConfigs is the list of configuration names to include when 
generating the BOM (leave empty to include every configuration)
-    includeConfigs = ["runtimeClasspath"]
-    // skipConfigs is a list of configuration names to exclude when generating 
the BOM
-    //skipConfigs = ["compileClasspath", "testCompileClasspath"]
-    // Specified the type of project being built. Defaults to 'library'
-    projectType = "library"
-    // Specified the version of the CycloneDX specification to use. Defaults 
to 1.4.
-    schemaVersion = "1.4"
-    // Boms destination directory (defaults to build/reports)
-    destination = file("build/reports")
-    // The file name for the generated BOMs (before the file format suffix). 
Defaults to 'bom'
-    outputName = "poi-scratchpad-${project.version}.bom"
-    // The file format generated, can be xml, json or all for generating both
-    outputFormat = "all"
-    // Exclude BOM Serial Number
-    includeBomSerialNumber = true
-}
diff --git a/poi/build.gradle b/poi/build.gradle
index 2b96a88dbd..a974866944 100644
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -189,22 +189,3 @@ publishing {
         }
     }
 }
-
-cyclonedxBom {
-    // includeConfigs is the list of configuration names to include when 
generating the BOM (leave empty to include every configuration)
-    includeConfigs = ["runtimeClasspath"]
-    // skipConfigs is a list of configuration names to exclude when generating 
the BOM
-    //skipConfigs = ["compileClasspath", "testCompileClasspath"]
-    // Specified the type of project being built. Defaults to 'library'
-    projectType = "library"
-    // Specified the version of the CycloneDX specification to use. Defaults 
to 1.4.
-    schemaVersion = "1.4"
-    // Boms destination directory (defaults to build/reports)
-    destination = file("build/reports")
-    // The file name for the generated BOMs (before the file format suffix). 
Defaults to 'bom'
-    outputName = "poi-${project.version}.bom"
-    // The file format generated, can be xml, json or all for generating both
-    outputFormat = "all"
-    // Exclude BOM Serial Number
-    includeBomSerialNumber = true
-}


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to