diff options
| author | Marius Volkhart <mariusvolkhart@apache.org> | 2021-03-14 18:56:30 +0000 |
|---|---|---|
| committer | Marius Volkhart <mariusvolkhart@apache.org> | 2021-03-14 18:56:30 +0000 |
| commit | deb410b568f56fd292f94b85b7ef28d54bae7f2d (patch) | |
| tree | ae13d1016918bebebf52b62393a0f09117449570 | |
| parent | 21ba7dc108c71501196b5586567719f67eea4936 (diff) | |
| download | poi-deb410b568f56fd292f94b85b7ef28d54bae7f2d.tar.gz poi-deb410b568f56fd292f94b85b7ef28d54bae7f2d.zip | |
Exclude batik-script dependency from OOXML artifact
We do not make use of the batik-script dependency. While this is likely to be true of a variety of the Batik dependencies, batik-script causes problems for our users who are using JPMS. See [bug-65103].
Fixes #230
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1887643 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build.gradle | 5 | ||||
| -rw-r--r-- | build.xml | 5 | ||||
| -rw-r--r-- | maven/poi-ooxml.pom | 6 | ||||
| -rw-r--r-- | sonar/ooxml/pom.xml | 6 |
4 files changed, 16 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle index 6b7b5cb2e0..845d107044 100644 --- a/build.gradle +++ b/build.gradle @@ -311,7 +311,9 @@ project('ooxml') { // compile only, don't add it to our dist as it blows up the size compile "org.apache.xmlgraphics:batik-svggen:${batikVersion}" - compile "org.apache.xmlgraphics:batik-bridge:${batikVersion}" + compile("org.apache.xmlgraphics:batik-bridge:${batikVersion}") { + exclude group: 'org.apache.xmlgraphics', module: 'batik-script' + } compile "org.apache.xmlgraphics:batik-codec:${batikVersion}" compile 'xml-apis:xml-apis-ext:1.3.04' compile 'org.apache.xmlgraphics:xmlgraphics-commons:2.4' @@ -420,6 +422,7 @@ project('integrationtest') { test { // exclude these from the normal test-run + exclude '**/TestAllFiles.class' exclude '**/*FileHandler.class' } @@ -314,7 +314,6 @@ under the License. <dependency prefix="svg.batik-gvt" artifact="org.apache.xmlgraphics:batik-gvt:1.14" usage="ooxml-batik"/> <dependency prefix="svg.batik-i18n" artifact="org.apache.xmlgraphics:batik-i18n:1.14" usage="ooxml-batik"/> <dependency prefix="svg.batik-parser" artifact="org.apache.xmlgraphics:batik-parser:1.14" usage="ooxml-batik"/> - <dependency prefix="svg.batik-script" artifact="org.apache.xmlgraphics:batik-script:1.14" usage="ooxml-batik"/> <dependency prefix="svg.batik-shared-resources" artifact="org.apache.xmlgraphics:batik-shared-resources:1.14" usage="ooxml-batik"/> <dependency prefix="svg.batik-svg-dom" artifact="org.apache.xmlgraphics:batik-svg-dom:1.14" usage="ooxml-batik"/> <dependency prefix="svg.batik-svggen" artifact="org.apache.xmlgraphics:batik-svggen:1.14" usage="ooxml-batik"/> @@ -491,7 +490,6 @@ under the License. <pathelement location="${svg.batik-gvt.jar}"/> <pathelement location="${svg.batik-i18n.jar}"/> <pathelement location="${svg.batik-parser.jar}"/> - <pathelement location="${svg.batik-script.jar}"/> <pathelement location="${svg.batik-shared-resources.jar}"/> <pathelement location="${svg.batik-svg-dom.jar}"/> <pathelement location="${svg.batik-svggen.jar}"/> @@ -805,7 +803,6 @@ under the License. <available file="${svg.batik-gvt.jar}"/> <available file="${svg.batik-i18n.jar}"/> <available file="${svg.batik-parser.jar}"/> - <available file="${svg.batik-script.jar}"/> <available file="${svg.batik-shared-resources.jar}"/> <available file="${svg.batik-svg-dom.jar}"/> <available file="${svg.batik-svggen.jar}"/> @@ -843,7 +840,6 @@ under the License. <downloadfile src="${svg.batik-gvt.url}" dest="${svg.batik-gvt.jar}"/> <downloadfile src="${svg.batik-i18n.url}" dest="${svg.batik-i18n.jar}"/> <downloadfile src="${svg.batik-parser.url}" dest="${svg.batik-parser.jar}"/> - <downloadfile src="${svg.batik-script.url}" dest="${svg.batik-script.jar}"/> <downloadfile src="${svg.batik-shared-resources.url}" dest="${svg.batik-shared-resources.jar}"/> <downloadfile src="${svg.batik-svg-dom.url}" dest="${svg.batik-svg-dom.jar}"/> <downloadfile src="${svg.batik-svggen.url}" dest="${svg.batik-svggen.jar}"/> @@ -2679,7 +2675,6 @@ under the License. <auxClasspath path="${svg.batik-gvt.jar}"/> <auxClasspath path="${svg.batik-i18n.jar}"/> <auxClasspath path="${svg.batik-parser.jar}"/> - <auxClasspath path="${svg.batik-script.jar}"/> <auxClasspath path="${svg.batik-shared-resources.jar}"/> <auxClasspath path="${svg.batik-svg-dom.jar}"/> <auxClasspath path="${svg.batik-svggen.jar}"/> diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom index c445b1e373..d43f72a6e8 100644 --- a/maven/poi-ooxml.pom +++ b/maven/poi-ooxml.pom @@ -100,6 +100,12 @@ <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-bridge</artifactId> <version>1.14</version> + <exclusions> + <exclusion> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-script</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml index 6248a47d7a..90df1cbb9e 100644 --- a/sonar/ooxml/pom.xml +++ b/sonar/ooxml/pom.xml @@ -160,6 +160,12 @@ <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-bridge</artifactId> <version>1.14</version> + <exclusions> + <exclusion> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-script</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> |