Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Specify more granular Batik dependencies 

Batik-all is a strange artifact. It's POM declares dependencies on all the sub-JARs, but its JAR has all of the sub-jars repackaged. This results in multiple JARs with the same packages being added to consuming applications. This leads to problems for JPMS users. See [bug-65183].

The Ant build does not use batik-all, so the Maven and Gradle builds should not either.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1887642 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Marius Volkhart 2021-03-14 18:51:12 +00:00
parent bce76497fe
commit 21ba7dc108
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -103,6 +103,7 @@ subprojects {
mockitoVersion = '3.6.0'
hamcrestVersion = '2.2'
xmlbeansVersion = '5.0.0'
batikVersion = '1.14'
}
tasks.withType(JavaCompile) {
@ -309,7 +310,9 @@ project('ooxml') {
compile "org.apache.logging.log4j:log4j-api:${log4jVersion}"
// compile only, don't add it to our dist as it blows up the size
compile 'org.apache.xmlgraphics:batik-all:1.14'
compile "org.apache.xmlgraphics:batik-svggen:${batikVersion}"
compile "org.apache.xmlgraphics:batik-bridge:${batikVersion}"
compile "org.apache.xmlgraphics:batik-codec:${batikVersion}"
compile 'xml-apis:xml-apis-ext:1.3.04'
compile 'org.apache.xmlgraphics:xmlgraphics-commons:2.4'

18
maven/poi-ooxml.pom
View File

@ -93,14 +93,18 @@
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-all</artifactId>
<artifactId>batik-svggen</artifactId>
<version>1.14</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-bridge</artifactId>
<version>1.14</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-codec</artifactId>
<version>1.14</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>de.rototor.pdfbox</groupId>

12
sonar/ooxml/pom.xml
View File

@ -153,7 +153,17 @@
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-all</artifactId>
<artifactId>batik-svggen</artifactId>
<version>1.14</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-bridge</artifactId>
<version>1.14</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-codec</artifactId>
<version>1.14</version>
</dependency>
<dependency>