try to build sboms

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1906146 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-12-21 17:52:29 +00:00
parent efeea0fbc9
commit 1494812da8
8 changed files with 8 additions and 5 deletions

View File

@ -483,7 +483,7 @@ poijobs.each { poijob ->
} }
} }
// in archive, junit and jacoco publishers, matches beneath build/*/build/... are for Gradle-build results // 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) { warnings(['Java Compiler (javac)', 'JavaDoc Tool'], null) {
resolveRelativePaths() resolveRelativePaths()
} }

View File

@ -85,7 +85,7 @@ task cacheJava9(type: Copy) {
} }
jar { jar {
dependsOn cacheJava9 dependsOn cacheJava9, cyclonedxBom
destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")

View File

@ -121,7 +121,7 @@ task cacheTest9(type: Copy) {
} }
jar { jar {
dependsOn cacheJava9 dependsOn cacheJava9, cyclonedxBom
destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")

View File

@ -143,7 +143,7 @@ task sourceJar(type: Jar) {
} }
jar { jar {
dependsOn 'sourceJar' dependsOn 'sourceJar', cyclonedxBom
if (jdkVersion == 8) { if (jdkVersion == 8) {
into('META-INF/versions/9') { into('META-INF/versions/9') {

View File

@ -125,6 +125,7 @@ task cacheJava9(type: Copy, dependsOn: 'compileJava9') {
} }
jar { jar {
dependsOn cyclonedxBom
destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
doFirst { doFirst {

View File

@ -232,6 +232,7 @@ task cacheTest9(type: Copy) {
} }
jar { jar {
dependsOn cyclonedxBom
destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
if (jdkVersion == 8) { if (jdkVersion == 8) {

View File

@ -117,6 +117,7 @@ task cacheTest9(type: Copy) {
} }
jar { jar {
dependsOn cyclonedxBom
destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
if (jdkVersion == 8) { if (jdkVersion == 8) {

View File

@ -147,7 +147,7 @@ task cacheTest9(type: Copy) {
} }
jar { jar {
dependsOn cacheJava9 dependsOn cacheJava9, cyclonedxBom
if (jdkVersion == 8) { if (jdkVersion == 8) {
into('META-INF/versions/9') { into('META-INF/versions/9') {