From b217a77dac8c68d2ede8e8abddcec330891c4113 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 26 Dec 2022 10:22:14 +0000 Subject: [PATCH] try to fix module-info compile git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1906213 13f79535-47bb-0310-9956-ffa450edef68 --- poi-ooxml/build.gradle | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index f1d8bf2363..eb585bec80 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -20,16 +20,12 @@ import java.util.regex.Pattern configurations { runtimeClasspath { exclude group: 'xalan', module: 'xalan' - if (jdkVersion > 8) { - exclude group: 'xml-apis', module: 'xml-apis' - } + exclude group: 'xml-apis', module: 'xml-apis' } compileClasspath { exclude group: 'xalan', module: 'xalan' - if (jdkVersion > 8) { - exclude group: 'xml-apis', module: 'xml-apis' - } + exclude group: 'xml-apis', module: 'xml-apis' } broken @@ -87,21 +83,15 @@ dependencies { renderImplementation "org.apache.xmlgraphics:batik-svggen:${batikVersion}" renderImplementation("org.apache.xmlgraphics:batik-svgrasterizer:${batikVersion}") { exclude group: 'xalan', module: 'xalan' - if (jdkVersion > 8) { - exclude group: 'xml-apis', module: 'xml-apis' - } + exclude group: 'xml-apis', module: 'xml-apis' } renderImplementation("org.apache.xmlgraphics:batik-codec:${batikVersion}") { exclude group: 'xalan', module: 'xalan' - if (jdkVersion > 8) { - exclude group: 'xml-apis', module: 'xml-apis' - } + exclude group: 'xml-apis', module: 'xml-apis' } renderImplementation("org.apache.xmlgraphics:batik-bridge:${batikVersion}") { exclude group: 'xalan', module: 'xalan' - if (jdkVersion > 8) { - exclude group: 'xml-apis', module: 'xml-apis' - } + exclude group: 'xml-apis', module: 'xml-apis' } rendersignImplementation "org.apache.pdfbox:pdfbox:${pdfboxVersion}" @@ -109,21 +99,15 @@ dependencies { rendersignImplementation "org.apache.xmlgraphics:batik-svggen:${batikVersion}" rendersignImplementation("org.apache.xmlgraphics:batik-svgrasterizer:${batikVersion}") { exclude group: 'xalan', module: 'xalan' - if (jdkVersion > 8) { - exclude group: 'xml-apis', module: 'xml-apis' - } + exclude group: 'xml-apis', module: 'xml-apis' } rendersignImplementation("org.apache.xmlgraphics:batik-codec:${batikVersion}") { exclude group: 'xalan', module: 'xalan' - if (jdkVersion > 8) { - exclude group: 'xml-apis', module: 'xml-apis' - } + exclude group: 'xml-apis', module: 'xml-apis' } rendersignImplementation("org.apache.xmlgraphics:batik-bridge:${batikVersion}") { exclude group: 'xalan', module: 'xalan' - if (jdkVersion > 8) { - exclude group: 'xml-apis', module: 'xml-apis' - } + exclude group: 'xml-apis', module: 'xml-apis' } @@ -153,9 +137,7 @@ dependencies { broken("org.apache.xmlgraphics:batik-script:${batikVersion}"){ exclude group: 'xalan', module: 'xalan' - if (jdkVersion > 8) { - exclude group: 'xml-apis', module: 'xml-apis' - } + exclude group: 'xml-apis', module: 'xml-apis' } javadocs project(':poi')