From 221f840adb4039b92ada2a40e9da543d6d0c7d27 Mon Sep 17 00:00:00 2001
From: Andreas Beeker <kiwiwings@apache.org>
Date: Mon, 17 Feb 2020 22:28:08 +0000
Subject: [PATCH] Update Batik dependency to 1.12

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1874149 13f79535-47bb-0310-9956-ffa450edef68
---
 .classpath   | 2 +-
 build.gradle | 2 +-
 build.xml    | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.classpath b/.classpath
index 98fe5cd3cb..819bb23955 100644
--- a/.classpath
+++ b/.classpath
@@ -44,6 +44,6 @@
 	<classpathentry kind="lib" path="lib/mockito-core-3.2.4.jar"/>
 	<classpathentry kind="lib" path="lib/byte-buddy-1.10.1.jar"/>
 	<classpathentry kind="lib" path="lib/byte-buddy-agent-1.10.1.jar"/>
-	<classpathentry kind="lib" path="compile-lib/batik-all-1.11.jar"/>
+	<classpathentry kind="lib" path="compile-lib/batik-all-1.12.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build.gradle b/build.gradle
index 15beafb02f..5f0123386e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -247,7 +247,7 @@ project('ooxml') {
         compile 'com.zaxxer:SparseBitSet:1.2'
 
         // compile only, don't add it to our dist as it blows up the size
-        compile 'org.apache.xmlgraphics:batik-all:1.11'
+        compile 'org.apache.xmlgraphics:batik-all:1.12'
         compile 'xml-apis:xml-apis-ext:1.3.04'
         compile 'org.apache.xmlgraphics:xmlgraphics-commons:2.3'
 
diff --git a/build.xml b/build.xml
index e31ab34ed7..d24d20a563 100644
--- a/build.xml
+++ b/build.xml
@@ -233,8 +233,8 @@ under the License.
     <property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
 
     <!-- svg/batik libs - not part of the distribution -->
-    <property name="svg.batik-all.url" value="${repository.m2}/maven2/org/apache/xmlgraphics/batik-all/1.11/batik-all-1.11.jar"/>
-    <property name="svg.batik-all.jar" value="${compile.lib}/batik-all-1.11.jar"/>
+    <property name="svg.batik-all.url" value="${repository.m2}/maven2/org/apache/xmlgraphics/batik-all/1.12/batik-all-1.12.jar"/>
+    <property name="svg.batik-all.jar" value="${compile.lib}/batik-all-1.12.jar"/>
     <property name="svg.xml-apis-ext.url" value="${repository.m2}/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar"/>
     <property name="svg.xml-apis-ext.jar" value="${compile.lib}/xml-apis-ext-1.3.04.jar"/>
     <property name="svg.xmlgraphics-commons.url" value="${repository.m2}/maven2/org/apache/xmlgraphics/xmlgraphics-commons/2.3/xmlgraphics-commons-2.3.jar"/>
@@ -720,6 +720,7 @@ under the License.
                 <include name="bc*jdk15on-1.61*.jar"/>
                 <include name="bc*jdk15on-1.62*.jar"/>
                 <include name="batik-all-1.10.jar"/>
+                <include name="batik-all-1.11.jar"/>
                 <include name="slf4j-api-1.7.7.jar"/>
                 <include name="slf4j-api-1.7.1*.jar"/>
                 <include name="slf4j-api-1.7.2*.jar"/>