diff options
| -rw-r--r-- | jenkins/create_jobs.groovy | 2 | ||||
| -rw-r--r-- | poi-examples/build.gradle | 2 | ||||
| -rw-r--r-- | poi-excelant/build.gradle | 2 | ||||
| -rw-r--r-- | poi-ooxml-full/build.gradle | 2 | ||||
| -rw-r--r-- | poi-ooxml-lite/build.gradle | 1 | ||||
| -rw-r--r-- | poi-ooxml/build.gradle | 1 | ||||
| -rw-r--r-- | poi-scratchpad/build.gradle | 1 | ||||
| -rw-r--r-- | poi/build.gradle | 2 |
8 files changed, 8 insertions, 5 deletions
diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy index e103cce409..92d577dfe5 100644 --- a/jenkins/create_jobs.groovy +++ b/jenkins/create_jobs.groovy @@ -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() } diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle index 435e050c3b..40101428ab 100644 --- a/poi-examples/build.gradle +++ b/poi-examples/build.gradle @@ -85,7 +85,7 @@ task cacheJava9(type: Copy) { } jar { - dependsOn cacheJava9 + dependsOn cacheJava9, cyclonedxBom destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle index 2a4f7a9ae6..3d72c8dcbd 100644 --- a/poi-excelant/build.gradle +++ b/poi-excelant/build.gradle @@ -121,7 +121,7 @@ task cacheTest9(type: Copy) { } jar { - dependsOn cacheJava9 + dependsOn cacheJava9, cyclonedxBom destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle index 0900c57b34..4f857994c0 100644 --- a/poi-ooxml-full/build.gradle +++ b/poi-ooxml-full/build.gradle @@ -143,7 +143,7 @@ task sourceJar(type: Jar) { } jar { - dependsOn 'sourceJar' + dependsOn 'sourceJar', cyclonedxBom if (jdkVersion == 8) { into('META-INF/versions/9') { diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle index a21bad71cf..c329ebd34e 100644 --- a/poi-ooxml-lite/build.gradle +++ b/poi-ooxml-lite/build.gradle @@ -125,6 +125,7 @@ task cacheJava9(type: Copy, dependsOn: 'compileJava9') { } jar { + dependsOn cyclonedxBom destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") doFirst { diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index e435ee71aa..037dd59c05 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -232,6 +232,7 @@ task cacheTest9(type: Copy) { } jar { + dependsOn cyclonedxBom destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") if (jdkVersion == 8) { diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle index 4c92d381c9..7e53bba708 100644 --- a/poi-scratchpad/build.gradle +++ b/poi-scratchpad/build.gradle @@ -117,6 +117,7 @@ task cacheTest9(type: Copy) { } jar { + dependsOn cyclonedxBom destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") if (jdkVersion == 8) { diff --git a/poi/build.gradle b/poi/build.gradle index c8dee0de43..b411b99dc5 100644 --- a/poi/build.gradle +++ b/poi/build.gradle @@ -147,7 +147,7 @@ task cacheTest9(type: Copy) { } jar { - dependsOn cacheJava9 + dependsOn cacheJava9, cyclonedxBom if (jdkVersion == 8) { into('META-INF/versions/9') { |