diff options
| author | PJ Fanning <fanningpj@apache.org> | 2022-12-26 00:24:29 +0000 |
|---|---|---|
| committer | PJ Fanning <fanningpj@apache.org> | 2022-12-26 00:24:29 +0000 |
| commit | 8898d2d15a0356fa2969e6c556d765f2b713c779 (patch) | |
| tree | 88b794fa101723de33cc267d8122929ef440cb4b | |
| parent | edee60d87a0f3b6d54d056a8f63dd42a386eb593 (diff) | |
| download | poi-8898d2d15a0356fa2969e6c556d765f2b713c779.tar.gz poi-8898d2d15a0356fa2969e6c556d765f2b713c779.zip | |
try to fix build
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1906208 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | poi-examples/build.gradle | 2 | ||||
| -rw-r--r-- | poi-examples/src/main/java9/module-info.class | bin | 979 -> 979 bytes | |||
| -rw-r--r-- | poi-excelant/build.gradle | 2 | ||||
| -rw-r--r-- | poi-excelant/src/main/java9/module-info.class | bin | 256 -> 306 bytes | |||
| -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 |
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 Binary files differindex f35935461e..bd60029c1c 100644 --- a/poi-examples/src/main/java9/module-info.class +++ b/poi-examples/src/main/java9/module-info.class 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 Binary files differindex 95b0590d80..4df3dfdf05 100644 --- a/poi-excelant/src/main/java9/module-info.class +++ b/poi-excelant/src/main/java9/module-info.class 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') { |