Author: mariusvolkhart Date: Sun Mar 14 18:51:12 2021 New Revision: 1887642
URL: http://svn.apache.org/viewvc?rev=1887642&view=rev Log: 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. Modified: poi/trunk/build.gradle 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=1887642&r1=1887641&r2=1887642&view=diff ============================================================================== --- poi/trunk/build.gradle (original) +++ poi/trunk/build.gradle Sun Mar 14 18:51:12 2021 @@ -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' Modified: poi/trunk/maven/poi-ooxml.pom URL: http://svn.apache.org/viewvc/poi/trunk/maven/poi-ooxml.pom?rev=1887642&r1=1887641&r2=1887642&view=diff ============================================================================== --- poi/trunk/maven/poi-ooxml.pom (original) +++ poi/trunk/maven/poi-ooxml.pom Sun Mar 14 18:51:12 2021 @@ -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> Modified: poi/trunk/sonar/ooxml/pom.xml URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml/pom.xml?rev=1887642&r1=1887641&r2=1887642&view=diff ============================================================================== --- poi/trunk/sonar/ooxml/pom.xml (original) +++ poi/trunk/sonar/ooxml/pom.xml Sun Mar 14 18:51:12 2021 @@ -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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
