From 8898d2d15a0356fa2969e6c556d765f2b713c779 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Mon, 26 Dec 2022 00:24:29 +0000
Subject: [PATCH] try to fix build

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1906208 13f79535-47bb-0310-9956-ffa450edef68
---
 build.gradle                                  |   4 ++--
 poi-examples/build.gradle                     |   2 +-
 poi-examples/src/main/java9/module-info.class | Bin 979 -> 979 bytes
 poi-excelant/build.gradle                     |   2 +-
 poi-excelant/src/main/java9/module-info.class | Bin 256 -> 306 bytes
 poi-ooxml-full/build.gradle                   |   2 +-
 poi-ooxml-lite/build.gradle                   |   1 -
 poi-ooxml/build.gradle                        |   1 -
 poi-scratchpad/build.gradle                   |   1 -
 poi/build.gradle                              |   2 +-
 10 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index d22829fec1..4bbda2e87e 100644
--- 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 c6916d90ea..7747a5dde7 100644
--- 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
GIT binary patch
delta 12
Tcmcc2ewlrOE2H^Fw_aud9_a*0

delta 12
Tcmcc2ewlrOE2F_iw_aud9>xSh

diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index aa67f1f13d..bea233d53b 100644
--- 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
GIT binary patch
delta 158
zcmZo*+Qbxe>ff$?3=9mW48rUTJd6xn!TF^{$*FFcIjM{c0=fAqr8%j(nR#jXdRd8O
ziHr<vzF;9?23}zXK1K$1Lqk0SJwtP027X}%0TBj45eA`&8greQ7?^;DGBGeSumEWj
j238=+0OYYXFfgz)aDaK7V3LV}3rur^NuUG3G>`xQND3C7

delta 108
zcmdnQ)WD>1>ff$?3=9mW3<B&7oQw=?zWFJoIjO=7T*3_8!VEmZ47?%?d?F0|6NBbj
nGcqs%m6|Xx14#xT$<hF%7+66B0~?rRVqgc;9AJ_W$^&u$j~xoY

diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle
index 4a29e38d3f..28d59caf15 100644
--- 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 4603810c77..b35ec45c97 100644
--- 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 e92d7e2534..be93cc7b06 100644
--- 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 baa3875d80..e7b086d7b2 100644
--- 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 6bf2fa7180..158e6e7e62 100644
--- 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') {