From 21ba7dc108c71501196b5586567719f67eea4936 Mon Sep 17 00:00:00 2001
From: Marius Volkhart <mariusvolkhart@apache.org>
Date: Sun, 14 Mar 2021 18:51:12 +0000
Subject: [PATCH] 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
---
 build.gradle        |  5 ++++-
 maven/poi-ooxml.pom | 18 +++++++++++-------
 sonar/ooxml/pom.xml | 12 +++++++++++-
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index cd7d8a4b3a..6b7b5cb2e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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'
 
diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom
index 4f8f7ff40b..c445b1e373 100644
--- a/maven/poi-ooxml.pom
+++ b/maven/poi-ooxml.pom
@@ -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>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 454f46b8b4..6248a47d7a 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -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>
-- 
2.39.5