try to fix build

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1906208 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.gradle b/build.gradle
index d22829fec16bcdd9901e85fdb171cee9031024a3..4bbda2e87eeb616d1bc830c1d43dc41e0223b50b 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -794,8 +794,8 @@ distributions {
     }
 }
 
-binDistZip.dependsOn 'zipJavadocs', ':poi-ooxml-lite:jar'
-binDistTar.dependsOn 'zipJavadocs', ':poi-ooxml-lite:jar'
+binDistZip.dependsOn 'zipJavadocs', ':poi-ooxml-lite:jar', cyclonedxBom
+binDistTar.dependsOn 'zipJavadocs', ':poi-ooxml-lite:jar', cyclonedxBom
 
 task soLinkCheck() {
     doLast {

diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle
index c6916d90ea6f63418419008d8d2161acb89776e6..7747a5dde77a37216fd6f1f16e191eb9e98eb817 100644 (file)
--- a/poi-examples/build.gradle
+++ b/poi-examples/build.gradle
@@ -81,7 +81,7 @@ task cacheJava9(type: Copy) {
 }
 
 jar {
-    dependsOn cacheJava9, cyclonedxBom
+    dependsOn cacheJava9
 
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 

diff --git a/poi-examples/src/main/java9/module-info.class b/poi-examples/src/main/java9/module-info.class
index f35935461e20e8063ef29dd4ae9aba8d40e93ad6..bd60029c1c7f655c74d19b007767bbcdc49de05b 100644 (file)
Binary files a/poi-examples/src/main/java9/module-info.class and b/poi-examples/src/main/java9/module-info.class differ

diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index aa67f1f13d35e29869f3db6da2121ec49d69ecfb..bea233d53b5e49873bb2615756c557bcff5c742d 100644 (file)
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -117,7 +117,7 @@ task cacheTest9(type: Copy) {
 }
 
 jar {
-    dependsOn cacheJava9, cyclonedxBom
+    dependsOn cacheJava9
 
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 

diff --git a/poi-excelant/src/main/java9/module-info.class b/poi-excelant/src/main/java9/module-info.class
index 95b0590d80e5f25cafab86a7ee0f9845e0d66315..4df3dfdf05d5de17ac2ec327ad609a0b4fa77a1e 100644 (file)
Binary files a/poi-excelant/src/main/java9/module-info.class and b/poi-excelant/src/main/java9/module-info.class differ

diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle
index 4a29e38d3f4974b1cb6e680779bda2a0ebfce561..28d59caf15df0efddaaf4fc738d329dfb7132b8c 100644 (file)
--- a/poi-ooxml-full/build.gradle
+++ b/poi-ooxml-full/build.gradle
@@ -141,7 +141,7 @@ task sourceJar(type: Jar) {
 }
 
 jar {
-    dependsOn 'sourceJar', cyclonedxBom
+    dependsOn 'sourceJar'
 
     if (jdkVersion == 8) {
         into('META-INF/versions/9') {

diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle
index 4603810c77d01624bd5f8da7e04c0c1c8f81b662..b35ec45c979417b39c759ca2950ddc5d533caf6a 100644 (file)
--- a/poi-ooxml-lite/build.gradle
+++ b/poi-ooxml-lite/build.gradle
@@ -123,7 +123,6 @@ 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 e92d7e25344279f758dd08e03998d995ff93a4b8..be93cc7b06d3c7dab7c916e76252c84ad38d7df0 100644 (file)
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -228,7 +228,6 @@ 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 baa3875d808ff585490dc6d7da5b0a1a2dd76dfe..e7b086d7b244729653e846552521e5b26f49df92 100644 (file)
--- a/poi-scratchpad/build.gradle
+++ b/poi-scratchpad/build.gradle
@@ -113,7 +113,6 @@ 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 6bf2fa7180a13b4edc2e86a1adb5e7d1ff5bfa84..158e6e7e624ab8354b3843c992a4a746ada7d3e5 100644 (file)
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -142,7 +142,7 @@ task cacheTest9(type: Copy) {
 }
 
 jar {
-    dependsOn cacheJava9, cyclonedxBom
+    dependsOn cacheJava9
 
     if (jdkVersion == 8) {
         into('META-INF/versions/9') {