You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ma...@apache.org on 2021/03/14 18:56:30 UTC
svn commit: r1887643 - in /poi/trunk: build.gradle build.xml
maven/poi-ooxml.pom sonar/ooxml/pom.xml
Author: mariusvolkhart
Date: Sun Mar 14 18:56:30 2021
New Revision: 1887643
URL: http://svn.apache.org/viewvc?rev=1887643&view=rev
Log:
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
Modified:
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/maven/poi-ooxml.pom
poi/trunk/sonar/ooxml/pom.xml
Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1887643&r1=1887642&r2=1887643&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Sun Mar 14 18:56:30 2021
@@ -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'
}
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1887643&r1=1887642&r2=1887643&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Mar 14 18:56:30 2021
@@ -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}"/>
Modified: poi/trunk/maven/poi-ooxml.pom
URL: http://svn.apache.org/viewvc/poi/trunk/maven/poi-ooxml.pom?rev=1887643&r1=1887642&r2=1887643&view=diff
==============================================================================
--- poi/trunk/maven/poi-ooxml.pom (original)
+++ poi/trunk/maven/poi-ooxml.pom Sun Mar 14 18:56:30 2021
@@ -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>
Modified: poi/trunk/sonar/ooxml/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml/pom.xml?rev=1887643&r1=1887642&r2=1887643&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml/pom.xml (original)
+++ poi/trunk/sonar/ooxml/pom.xml Sun Mar 14 18:56:30 2021
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org