You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/12/21 17:52:29 UTC

svn commit: r1906146 - in /poi/trunk: jenkins/create_jobs.groovy poi-examples/build.gradle poi-excelant/build.gradle poi-ooxml-full/build.gradle poi-ooxml-lite/build.gradle poi-ooxml/build.gradle poi-scratchpad/build.gradle poi/build.gradle

Author: fanningpj
Date: Wed Dec 21 17:52:29 2022
New Revision: 1906146

URL: http://svn.apache.org/viewvc?rev=1906146&view=rev
Log:
try to build sboms

Modified:
    poi/trunk/jenkins/create_jobs.groovy
    poi/trunk/poi-examples/build.gradle
    poi/trunk/poi-excelant/build.gradle
    poi/trunk/poi-ooxml-full/build.gradle
    poi/trunk/poi-ooxml-lite/build.gradle
    poi/trunk/poi-ooxml/build.gradle
    poi/trunk/poi-scratchpad/build.gradle
    poi/trunk/poi/build.gradle

Modified: poi/trunk/jenkins/create_jobs.groovy
URL: http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1906146&r1=1906145&r2=1906146&view=diff
==============================================================================
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Wed Dec 21 17:52:29 2022
@@ -483,7 +483,7 @@ poijobs.each { poijob ->
                     }
                 }
                 // in archive, junit and jacoco publishers, matches beneath build/*/build/... are for Gradle-build results
-                archiveArtifacts('build/dist/*.zip,build/dist/*.tgz,build/dist/maven/*/*.jar,build/coverage/**,build/hs_err*.log')
+                archiveArtifacts('build/dist/*.zip,build/dist/*.tgz,build/dist/maven/*/*.jar,build/coverage/**,*/build/reports/*.bom.*,build/hs_err*.log')
                 warnings(['Java Compiler (javac)', 'JavaDoc Tool'], null) {
                     resolveRelativePaths()
                 }

Modified: poi/trunk/poi-examples/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-examples/build.gradle?rev=1906146&r1=1906145&r2=1906146&view=diff
==============================================================================
--- poi/trunk/poi-examples/build.gradle (original)
+++ poi/trunk/poi-examples/build.gradle Wed Dec 21 17:52:29 2022
@@ -85,7 +85,7 @@ task cacheJava9(type: Copy) {
 }
 
 jar {
-    dependsOn cacheJava9
+    dependsOn cacheJava9, cyclonedxBom
 
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 

Modified: poi/trunk/poi-excelant/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-excelant/build.gradle?rev=1906146&r1=1906145&r2=1906146&view=diff
==============================================================================
--- poi/trunk/poi-excelant/build.gradle (original)
+++ poi/trunk/poi-excelant/build.gradle Wed Dec 21 17:52:29 2022
@@ -121,7 +121,7 @@ task cacheTest9(type: Copy) {
 }
 
 jar {
-    dependsOn cacheJava9
+    dependsOn cacheJava9, cyclonedxBom
 
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 

Modified: poi/trunk/poi-ooxml-full/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-full/build.gradle?rev=1906146&r1=1906145&r2=1906146&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-full/build.gradle (original)
+++ poi/trunk/poi-ooxml-full/build.gradle Wed Dec 21 17:52:29 2022
@@ -143,7 +143,7 @@ task sourceJar(type: Jar) {
 }
 
 jar {
-    dependsOn 'sourceJar'
+    dependsOn 'sourceJar', cyclonedxBom
 
     if (jdkVersion == 8) {
         into('META-INF/versions/9') {

Modified: poi/trunk/poi-ooxml-lite/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite/build.gradle?rev=1906146&r1=1906145&r2=1906146&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-lite/build.gradle (original)
+++ poi/trunk/poi-ooxml-lite/build.gradle Wed Dec 21 17:52:29 2022
@@ -125,6 +125,7 @@ task cacheJava9(type: Copy, dependsOn: '
 }
 
 jar {
+    dependsOn cyclonedxBom
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 
     doFirst {

Modified: poi/trunk/poi-ooxml/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/build.gradle?rev=1906146&r1=1906145&r2=1906146&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/build.gradle (original)
+++ poi/trunk/poi-ooxml/build.gradle Wed Dec 21 17:52:29 2022
@@ -232,6 +232,7 @@ task cacheTest9(type: Copy) {
 }
 
 jar {
+    dependsOn cyclonedxBom
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 
     if (jdkVersion == 8) {

Modified: poi/trunk/poi-scratchpad/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/build.gradle?rev=1906146&r1=1906145&r2=1906146&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/build.gradle (original)
+++ poi/trunk/poi-scratchpad/build.gradle Wed Dec 21 17:52:29 2022
@@ -117,6 +117,7 @@ task cacheTest9(type: Copy) {
 }
 
 jar {
+    dependsOn cyclonedxBom
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 
     if (jdkVersion == 8) {

Modified: poi/trunk/poi/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi/build.gradle?rev=1906146&r1=1906145&r2=1906146&view=diff
==============================================================================
--- poi/trunk/poi/build.gradle (original)
+++ poi/trunk/poi/build.gradle Wed Dec 21 17:52:29 2022
@@ -147,7 +147,7 @@ task cacheTest9(type: Copy) {
 }
 
 jar {
-    dependsOn cacheJava9
+    dependsOn cacheJava9, cyclonedxBom
 
     if (jdkVersion == 8) {
         into('META-INF/versions/9') {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org