From eb30f2e1c82404b574297472efd7c6a1b52c36df Mon Sep 17 00:00:00 2001
From: Andreas Beeker <kiwiwings@apache.org>
Date: Mon, 22 Feb 2021 00:18:37 +0000
Subject: [PATCH] Use upcoming XmlBeans 5.0.0 (working version 4.0.1) Make
 batik optional as it doesn't work on the module-path Use sub-components of
 batik as batik-all references them all again resulting in duplicated entries
 (maven poms haven't been migrated yet ...) Remove SLF4j dependency

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1886777 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                     | 130 +++++++++++++++---
 .../apache/poi/sl/draw/DrawPictureShape.java  |  37 +++--
 .../ooxml-lite/java9/module-info.class        | Bin 1663 -> 1663 bytes
 src/multimodule/ooxml/java9/module-info.class | Bin 3083 -> 3523 bytes
 src/multimodule/ooxml/java9/module-info.java  |  23 +++-
 src/multimodule/ooxml/test9/module-info.class | Bin 4542 -> 4982 bytes
 src/multimodule/ooxml/test9/module-info.java  |  23 +++-
 src/multimodule/poi/java9/module-info.class   | Bin 3314 -> 3329 bytes
 .../org/apache/poi/xslf/util/PPTX2PNG.java    |  13 +-
 .../poifs/crypt/dsig/TestSignatureInfo.java   |   2 +
 .../xslf/usermodel/TestXSLFPictureShape.java  |   5 +-
 11 files changed, 195 insertions(+), 38 deletions(-)

diff --git a/build.xml b/build.xml
index e8461f4df9..dddb2b15f5 100644
--- a/build.xml
+++ b/build.xml
@@ -288,7 +288,6 @@ under the License.
     <dependency prefix="main.objenesis" artifact="org.objenesis:objenesis:3.1" usage="main-tests"/>
     <dependency prefix="main.log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.14.0" usage="main-tests"/>
     <dependency prefix="main.commons-logging" artifact="commons-logging:commons-logging:1.2" usage="main-tests"/>
-    <dependency prefix="main.slf4j-api" artifact="org.slf4j:slf4j-api:1.7.30" usage="main-tests"/>
 
     <dependency prefix="main.ant" artifact="org.apache.ant:ant:1.10.9" usage="excelant"/>
     <dependency prefix="main.antlauncher" artifact="org.apache.ant:ant-launcher:1.10.9" usage="excelant"/>
@@ -300,17 +299,36 @@ under the License.
     <!-- only used for signing the release - not used with the ooxml signatures -->
     <dependency prefix="dsig.bouncycastle-bcpg" artifact="org.bouncycastle:bcpg-jdk15on:1.68" usage="util"/>
 
-    <!-- svg/batik/pdf libs - not part of the distribution -->
-    <dependency prefix="svg.xml-apis-ext" artifact="xml-apis:xml-apis-ext:1.3.04" usage="ooxml-provided"/>
-    <dependency prefix="svg.xmlgraphics-commons" artifact="org.apache.xmlgraphics:xmlgraphics-commons:2.4" usage="ooxml-provided"/>
-    <dependency prefix="svg.batik-all" artifact="org.apache.xmlgraphics:batik-all:1.14" usage="ooxml-provided"/>
+    <!-- svg/batik/pdf libs - not part of the distribution - move batik to its own directory because of JPMS module-path issues -->
+    <dependency prefix="svg.xml-apis-ext" artifact="xml-apis:xml-apis-ext:1.3.04" usage="ooxml-batik"/>
+    <dependency prefix="svg.xmlgraphics-commons" artifact="org.apache.xmlgraphics:xmlgraphics-commons:2.4" usage="ooxml-batik"/>
+    <dependency prefix="svg.batik-anim" artifact="org.apache.xmlgraphics:batik-anim:1.14" usage="ooxml-batik"/>
+    <dependency prefix="svg.batik-awt-util" artifact="org.apache.xmlgraphics:batik-awt-util:1.14" usage="ooxml-batik"/>
+    <dependency prefix="svg.batik-bridge" artifact="org.apache.xmlgraphics:batik-bridge:1.14" usage="ooxml-batik"/>
+    <dependency prefix="svg.batik-codec" artifact="org.apache.xmlgraphics:batik-codec:1.14" usage="ooxml-batik"/>
+    <dependency prefix="svg.batik-constants" artifact="org.apache.xmlgraphics:batik-constants:1.14" usage="ooxml-batik"/>
+    <dependency prefix="svg.batik-css" artifact="org.apache.xmlgraphics:batik-css:1.14" usage="ooxml-batik"/>
+    <dependency prefix="svg.batik-dom" artifact="org.apache.xmlgraphics:batik-dom:1.14" usage="ooxml-batik"/>
+    <dependency prefix="svg.batik-ext" artifact="org.apache.xmlgraphics:batik-ext:1.14" usage="ooxml-batik"/>
+    <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"/>
+    <dependency prefix="svg.batik-svgrasterizer" artifact="org.apache.xmlgraphics:batik-svgrasterizer:1.14" usage="ooxml-batik"/>
+    <dependency prefix="svg.batik-transcoder" artifact="org.apache.xmlgraphics:batik-transcoder:1.14" usage="ooxml-batik"/>
+    <dependency prefix="svg.batik-util" artifact="org.apache.xmlgraphics:batik-util:1.14" usage="ooxml-batik"/>
+    <dependency prefix="svg.batik-xml" artifact="org.apache.xmlgraphics:batik-xml:1.14" usage="ooxml-batik"/>
     <dependency prefix="pdf.pdfbox" artifact="org.apache.pdfbox:pdfbox:2.0.22" usage="ooxml-provided"/>
     <dependency prefix="pdf.fontbox" artifact="org.apache.pdfbox:fontbox:2.0.22" usage="ooxml-provided"/>
     <dependency prefix="pdf.graphics2d" artifact="de.rototor.pdfbox:graphics2d:0.30" usage="ooxml-provided"/>
 
     <!-- jars in the ooxml-lib directory, see the fetch-ooxml-jars target-->
     <dependency prefix="ooxml.curvesapi" artifact="com.github.virtuald:curvesapi:1.06" usage="ooxml"/>
-    <dependency prefix="ooxml.xmlbeans" artifact="org.apache.xmlbeans:xmlbeans:4.0.0" usage="ooxml"/>
+    <dependency prefix="ooxml.xmlbeans" artifact="org.apache.xmlbeans:xmlbeans:4.0.1" usage="ooxml"
+                url="https://ci-builds.apache.org/job/POI/job/POI-XMLBeans-DSL-1.8/lastSuccessfulBuild/artifact/build//xmlbeans-4.0.1.jar"/>
     <dependency prefix="ooxml.commons-compress" artifact="org.apache.commons:commons-compress:1.20" usage="ooxml"/>
 
     <!-- jars in the ooxml-test-lib directory, see the fetch-ooxml-jars target-->
@@ -433,7 +451,6 @@ under the License.
         <pathelement location="${main.objenesis.jar}"/>
         <pathelement location="${main.log4j-core.jar}"/>
         <pathelement location="${main.commons-logging.jar}"/>
-        <pathelement location="${main.slf4j-api.jar}"/>
     </path>
 
     <path id="scratchpad.classpath">
@@ -461,7 +478,25 @@ under the License.
     </path>
 
     <path id="batik.classpath">
-        <pathelement location="${svg.batik-all.jar}"/>
+        <pathelement location="${svg.batik-anim.jar}"/>
+        <pathelement location="${svg.batik-awt-util.jar}"/>
+        <pathelement location="${svg.batik-bridge.jar}"/>
+        <pathelement location="${svg.batik-codec.jar}"/>
+        <pathelement location="${svg.batik-constants.jar}"/>
+        <pathelement location="${svg.batik-css.jar}"/>
+        <pathelement location="${svg.batik-dom.jar}"/>
+        <pathelement location="${svg.batik-ext.jar}"/>
+        <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}"/>
+        <pathelement location="${svg.batik-svgrasterizer.jar}"/>
+        <pathelement location="${svg.batik-transcoder.jar}"/>
+        <pathelement location="${svg.batik-util.jar}"/>
+        <pathelement location="${svg.batik-xml.jar}"/>
         <pathelement location="${svg.xml-apis-ext.jar}"/>
         <pathelement location="${svg.xmlgraphics-commons.jar}"/>
     </path>
@@ -623,12 +658,14 @@ under the License.
             <fileset dir="${basedir}/lib/main">
                 <include name="log4j-1.2*.jar"/>
                 <include name="commons-logging-1.2.jar"/>
+                <include name="*slf4j*.jar"/>
             </fileset>
             <fileset dir="${basedir}/lib/main-tests">
                 <include name="mockito-core-3.2*.jar"/>
                 <include name="mockito-core-3.5*.jar"/>
                 <include name="hamcrest-core*"/>
                 <include name="junit-4*.jar"/>
+                <include name="*slf4j*.jar"/>
             </fileset>
             <fileset dir="${basedir}/lib/ooxml">
                 <include name="xmlbeans-3.1.0.jar"/>
@@ -675,7 +712,6 @@ under the License.
                     <available file="${main.objenesis.jar}"/>
                     <available file="${main.ant.jar}"/>
                     <available file="${main.antlauncher.jar}"/>
-                    <available file="${main.slf4j-api.jar}"/>
                     <available file="${main.log4j-api.jar}"/>
                     <available file="${main.log4j-core.jar}"/>
                     <available file="${asm.jar}"/>
@@ -722,7 +758,6 @@ under the License.
         <downloadfile src="${main.objenesis.url}" dest="${main.objenesis.jar}"/>
         <downloadfile src="${main.ant.url}" dest="${main.ant.jar}"/>
         <downloadfile src="${main.antlauncher.url}" dest="${main.antlauncher.jar}"/>
-        <downloadfile src="${main.slf4j-api.url}" dest="${main.slf4j-api.jar}"/>
         <downloadfile src="${main.log4j-api.url}" dest="${main.log4j-api.jar}"/>
         <downloadfile src="${main.log4j-core.url}" dest="${main.log4j-core.jar}"/>
         <downloadfile src="${asm.url}" dest="${asm.jar}"/>
@@ -756,7 +791,25 @@ under the License.
                     <available file="${ooxml.test.guava.jar}"/>
                     <available file="${ooxml.test.javassist.jar}"/>
                     <available file="${svg.xml-apis-ext.jar}"/>
-                    <available file="${svg.batik-all.jar}"/>
+                    <available file="${svg.batik-anim.jar}"/>
+                    <available file="${svg.batik-awt-util.jar}"/>
+                    <available file="${svg.batik-bridge.jar}"/>
+                    <available file="${svg.batik-codec.jar}"/>
+                    <available file="${svg.batik-constants.jar}"/>
+                    <available file="${svg.batik-css.jar}"/>
+                    <available file="${svg.batik-dom.jar}"/>
+                    <available file="${svg.batik-ext.jar}"/>
+                    <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}"/>
+                    <available file="${svg.batik-svgrasterizer.jar}"/>
+                    <available file="${svg.batik-transcoder.jar}"/>
+                    <available file="${svg.batik-util.jar}"/>
+                    <available file="${svg.batik-xml.jar}"/>
                     <available file="${svg.xmlgraphics-commons.jar}"/>
                     <available file="${pdf.pdfbox.jar}"/>
                     <available file="${pdf.fontbox.jar}"/>
@@ -775,7 +828,25 @@ under the License.
         <downloadfile src="${ooxml.test.reflections.url}" dest="${ooxml.test.reflections.jar}"/>
         <downloadfile src="${ooxml.test.guava.url}" dest="${ooxml.test.guava.jar}"/>
         <downloadfile src="${ooxml.test.javassist.url}" dest="${ooxml.test.javassist.jar}"/>
-        <downloadfile src="${svg.batik-all.url}" dest="${svg.batik-all.jar}"/>
+        <downloadfile src="${svg.batik-anim.url}" dest="${svg.batik-anim.jar}"/>
+        <downloadfile src="${svg.batik-awt-util.url}" dest="${svg.batik-awt-util.jar}"/>
+        <downloadfile src="${svg.batik-bridge.url}" dest="${svg.batik-bridge.jar}"/>
+        <downloadfile src="${svg.batik-codec.url}" dest="${svg.batik-codec.jar}"/>
+        <downloadfile src="${svg.batik-constants.url}" dest="${svg.batik-constants.jar}"/>
+        <downloadfile src="${svg.batik-css.url}" dest="${svg.batik-css.jar}"/>
+        <downloadfile src="${svg.batik-dom.url}" dest="${svg.batik-dom.jar}"/>
+        <downloadfile src="${svg.batik-ext.url}" dest="${svg.batik-ext.jar}"/>
+        <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}"/>
+        <downloadfile src="${svg.batik-svgrasterizer.url}" dest="${svg.batik-svgrasterizer.jar}"/>
+        <downloadfile src="${svg.batik-transcoder.url}" dest="${svg.batik-transcoder.jar}"/>
+        <downloadfile src="${svg.batik-util.url}" dest="${svg.batik-util.jar}"/>
+        <downloadfile src="${svg.batik-xml.url}" dest="${svg.batik-xml.jar}"/>
         <downloadfile src="${svg.xml-apis-ext.url}" dest="${svg.xml-apis-ext.jar}"/>
         <downloadfile src="${svg.xmlgraphics-commons.url}" dest="${svg.xmlgraphics-commons.jar}"/>
         <downloadfile src="${pdf.pdfbox.url}" dest="${pdf.pdfbox.jar}"/>
@@ -858,9 +929,13 @@ under the License.
         <mkdir dir="${xmlbean.sources.dir}"/>
         <mkdir dir="${xmlbean.classes.dir}"/>
 
-        <taskdef name="xmlbean"
-                 classname="org.apache.xmlbeans.impl.tool.XMLBean"
-                 classpath="${ooxml.xmlbeans.jar}"/>
+        <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean">
+            <classpath>
+                <path location="${ooxml.xmlbeans.jar}"/>
+                <path location="${main.log4j-api.jar}"/>
+                <path location="${main.log4j-core.jar}"/>
+            </classpath>
+        </taskdef>
 
         <xmlbean
             schema="${xmlbean.xsds.dir}"
@@ -1155,6 +1230,7 @@ under the License.
                 <pathelement path="lib/ooxml"/>
                 <pathelement path="lib/ooxml-provided"/>
                 <pathelement path="lib/ooxml-tests"/>
+                <pathelement path="lib/ooxml-batik"/>
             </lib>
             <resources>
                 <fileset dir="${ooxml.resource1.dir}"/>
@@ -1287,6 +1363,10 @@ under the License.
                         <jvmarg value="-Djunit.jupiter.execution.parallel.config.fixed.parallelism=3" />
                         <jvmarg value="-Xjit:verbose={compileStart|compileEnd},vlog=build/jit.log${no.jit.sherlock}" if:true="${isIBMVM}"/>
 
+<!--                        <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5000"/>-->
+<!--                        <jvmarg value="&#45;&#45;show-module-resolution"/>-->
+
+
                         <modulepath refid="@{modulepath-ref}" unless:true="${isJava8}"/>
 
                         <jvmarg line="--add-modules org.junit.platform.launcher" unless:true="${isJava8}"/>
@@ -2579,7 +2659,25 @@ under the License.
             <auxClasspath path="${main.jmhAnnotation.jar}"/>
             <auxClasspath path="${main.ant.jar}" />
             <auxClasspath path="${main.com.zaxxer.jar}" />
-            <auxClasspath path="${svg.batik-all.jar}"/>
+            <auxClasspath path="${svg.batik-anim.jar}"/>
+            <auxClasspath path="${svg.batik-awt-util.jar}"/>
+            <auxClasspath path="${svg.batik-bridge.jar}"/>
+            <auxClasspath path="${svg.batik-codec.jar}"/>
+            <auxClasspath path="${svg.batik-constants.jar}"/>
+            <auxClasspath path="${svg.batik-css.jar}"/>
+            <auxClasspath path="${svg.batik-dom.jar}"/>
+            <auxClasspath path="${svg.batik-ext.jar}"/>
+            <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}"/>
+            <auxClasspath path="${svg.batik-svgrasterizer.jar}"/>
+            <auxClasspath path="${svg.batik-transcoder.jar}"/>
+            <auxClasspath path="${svg.batik-util.jar}"/>
+            <auxClasspath path="${svg.batik-xml.jar}"/>
             <auxClasspath path="${svg.xml-apis-ext.jar}"/>
             <auxClasspath path="${svg.xmlgraphics-commons.jar}"/>
             <auxClasspath path="${pdf.pdfbox.jar}"/>
diff --git a/src/java/org/apache/poi/sl/draw/DrawPictureShape.java b/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
index 71cb1bdd23..764f1f576a 100644
--- a/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
+++ b/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
@@ -23,9 +23,10 @@ import java.awt.Insets;
 import java.awt.Paint;
 import java.awt.geom.Rectangle2D;
 import java.io.IOException;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
-import java.util.function.Supplier;
-import java.util.stream.StreamSupport;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -91,20 +92,26 @@ public class DrawPictureShape extends DrawSimpleShape {
             return fallback;
         }
 
-        // the fallback is the BitmapImageRenderer, at least it gracefully handles invalid images
-        final Supplier<ImageRenderer> getFallback = () -> {
-            LOG.atWarn().log("No suitable image renderer found for content-type '{}' - include " +
-                    "poi-scratchpad (for wmf/emf) or poi-ooxml (for svg) jars!", contentType);
-            return fallback;
-        };
-
         ClassLoader cl = DrawPictureShape.class.getClassLoader();
-        return StreamSupport
-            .stream(ServiceLoader.load(ImageRenderer.class, cl).spliterator(), false)
-            .filter(ir -> ir.canRender(contentType))
-            .findFirst()
-            .orElseGet(getFallback)
-        ;
+        Iterator<ImageRenderer> iter = ServiceLoader.load(ImageRenderer.class, cl).iterator();
+        for (;;) {
+            // Batik / SVGImageRenderer fails when executed on the module-path, hence we try/skip it in that case
+            try {
+                ImageRenderer ir = iter.next();
+                if (ir.canRender(contentType)) {
+                    return ir;
+                }
+            } catch (NoSuchElementException ignored) {
+                break;
+            } catch (Exception | ServiceConfigurationError ignored) {
+            }
+        }
+
+        // the fallback is the BitmapImageRenderer, at least it gracefully handles invalid images
+        LOG.atWarn().log("No suitable image renderer found for content-type '{}' - include " +
+            "poi-scratchpad (for wmf/emf) or poi-ooxml (for svg) jars - " +
+            "svgs/batik doesn't work on the module-path!", contentType);
+        return fallback;
     }
 
     @Override
diff --git a/src/multimodule/ooxml-lite/java9/module-info.class b/src/multimodule/ooxml-lite/java9/module-info.class
index 2a720c718dbce28980eac8ad74ea97e6d1dfe7c0..5a1a8d9258b44306f29dce9dcd0d8a7b34bbf118 100644
GIT binary patch
delta 620
zcmX|;OHUJF6o%h3ms02yu`>lqZHrt)F0BX@luJY0lely{)Tuy#8c?EfflIg3Z{u$u
zF>z^J_ygR!WkJ|O_yyvbw}#DgzURE>oJ=ye-mN$F`|r<R0P1M;z!GE*+OOa5N7dcK
zR$GwTqWN&+PnC5aJ%Zl7@Fc8lhsTkRUV+~}dQ%JEhRvO*_TgZEI|>hvePje_&S@(^
zRxlpl48|8(JHWm8YBCkzK6@pv-D>SNqX5338sC)6D;dx<FPKj3i+E~7f`aa+PLg8<
z^IhijPSKppgw|5W8qt}GVBWm6X4B1`@aSEDhi1!K(0JUOT6N7Q1sh3jF0GvElwgxO
zX6IF>yIM45CvW!b<P&BE4V~z=zS;fSstR7*wXW@)o`2GDRy29qz5ajS$!cp+uy!|m
z=45oZ-f_z2k5kZeMX<=U&mC5ME?A~+x<%DB!7BBmThYA@^VOX>we>IkfP+!3Hd3Fp
zAWiE_o+!X$?I#Dw92t;<<S;oxJ|N5FC^<$>kdMg6<P6Zz#~h_b&XWt|61hx1BUj0F
GlK2Ovmt;Bs

literal 1663
zcmb7^+invv5QcwK=z(&Mp)C~Xfm4CTIkbhgv_h!2NJt>=-CZX!WY??pCQa}9ScnTA
zfQLfNPSU7U>5Amy^Ex~Kcs%>tzyJLF1z;2VQ&<w1{OH0?+mx_e!b%CNB|MRMD)CI>
zxx@>JHHnuJuOwbetV@(7lte|MDp8ZDOKeDNN^D8Ik$5YyEwLl9EAdWZPhd9U{OdMu
zIDti%Hp@EELCcgAXUop@qITKSG}2yR=9}*7@}c%dpmZjbf)0(2DPo!<XfCiCxJX4d
zNS$|$ObwDK`Zv*;J+y6`9Sf|Cj&hBL4U96qz+9Ya5Y!(8)(ca0t+!6~YL#kDMcT#!
zYlZO?S=mydZF<`jSQs7K%{RJ6olyOzDQenqr`$Z{k9}q$#S?+$3t}lznCc@N(^_+R
zjLE!Joz$vcrMg|It8TR}P|4r8#KhF#hD#%z`Qd5<dDPDLNR<aIon``R3`xH&wJ{Wl
z4YE#3ZrB?`<df9s(6@}q4o>&{ehmGQOT#2}f$^UD^<OFa7CCT1Co*w%+M$lmT=XfW
zhNhV{<lg;)Dn_OVU6AYj*DuFOp5Vi{2~00DacIJ`Rcwr#gnZB{{sbe7PfeQ+qKkdY
zCRF?GxXXHSm<b0vFDjb8x2LxAVncuS%~mg1^o&o=skRDK|GMLxaHl}nqigTGZkmBR
z=;Yf>w?Ervtot6H&&5Y|eqW(;xvl6JhIBog0D`XU{!ic%J^a7~mS~*7<r5lkg=drb
zBNi~l<1}-Id6hZKyvDrFyurN5yv4lDyu&OpCG#%x9&?U4&s<>MXFgyqG9NM@F&{G-
Fe*tug_i_LL

diff --git a/src/multimodule/ooxml/java9/module-info.class b/src/multimodule/ooxml/java9/module-info.class
index 9d0a03b62f7c8900ffa6b6a9e661cb76b0a4183c..9f991b0c367d3ff5e50a348158e276a3e0c6bf19 100644
GIT binary patch
literal 3523
zcma);2Y1{=5XWZ&#H1G~y^@|_OC)h1^bm+cAR#6PiRtL1J)LYxD|U6~b7-OW-h1!8
zL*VfN_)t7Xqq9yYok{HXes|ja@67DXtoHu-_vGIIunYd`gJ}$A1;T0ge83B9g2D7d
z^rXRA40It~!-_1s&W%WTh7hg5*PxHVj8Us;8C6Sh4Q4P{SP-IEgINr;+&C_+aw}9C
z%we!HH<4L36gmnlRLo<rCa17P5QtD2w(xy!#~ywk)L;RFr9DLsw>8ih%$ZylSaE%)
z28$TXu0)npe6JT*c&x#aZWF$6T`zPE{2UzBU>WLZpY3rCR!ojKT#dyd(qI*Co-~Tv
z4e7-b#;B`s2WuG2qjB7}Vatgq78;zxU_~xsWrcCWlAbV7gzGg}&tO?1sES5tPuP}<
zeayTRP0!&{gN+Opm8ZwNmIj*{%&c0mH)dF&7ih4R!QA%qcx*Ic59@X=MxTyVrRTU<
zx&f?yI${gTnu%dg4umSk0C6wdvEJ>$WNSOKM@OKiUD+dVVM;H^9^EEBUYNz@ZQmVg
zaB&s`6#_SPX*Qy4=|#Baat4c2f2wXt?ii9Q(U3Mr=T~4^+jC9Vpa8Dy7-+gKM<@HR
z^D>ddEOO}`PZGGF!TfY0me`8Prg8K@7Gs*HYqKp-yB|Vp_{Ei0RQK$p3#l75ILu%{
zuAGrms|qZ|_1)*8Cc>D;E7<l9H>8O1UmB_0m^8b?(cwl0tI(jC9yt>ahS?gAY9=OD
zS~f1y;n)<ChT;;>G52-2DQ%*XmG<;4JuEnGmy_EVtS-ipN^Bm{@zddsDa_;ou^4RZ
zWhRrD*z}1x9c%{1X-Q3&i-5;+LI=)Z{VCSet%&R3p4xaK#58xd=P_8)%Q!ZI4rA$S
zqbtKnev<alA(&z|iChPK#U`)S{91ag>Tp+i9nF{yZ|b1RHA!c4&Cw`VKGmdwjrS^<
zgJE}iXM(}HLUb)BFEL~Er^DU7a^I!1@#v!P-m*|cJj65(j&>#d{`6Al%1b5`k*&i6
z<#y_rLWSvtc+f)&OYjhb?S*ahmYM-x2Xzat6{&Q1gu%|!Th<7>7Cu(aY{y@k{3p`e
zFu%W+QZ*f(Dz8l@@`wJJ9#tVplj9B2sorx_n950BC?}D;WfHT_{fM&h5`!&;Y!sx}
z3OrQFb*#fH43_s&SG~|mPU~ys-Xv@7x6&I^gsx)AtpG1&9o{ORk2D@Sb?@|=^=qah
zt#KXR>t!Bivu*3}L9YN&(hl&WDeR}!{UrUtlCLhly=%&(tKW2#ha32e!KOlriXyXS
z**wN{eo;<-NsEPVdUz}9@YVmjk9iRF!8Z)H72Id<4s+k+6*Juawb2LPG1yhm7v4DL
z@Zkd^hYn_Ihv<@;=z|{^^cR*Y)k(H_OvtgS5Mv!@Kb22xq1i?%m7&RXnWJAA3=|#t
zIY$*Ae>qj^V!Y$&HwHTjOIj-53g$@V;83<ObM*&<4TW{er}i=r1eVK>@DP7ZaM=fc
zGT2&Bl82-f&C1dJUGftE41bKLe+<q5n6?hiq{q!L{Y3KRY*>q&Nt{ibn+(Hz;zFWM
zTufX_Tuxj`Tuod{Tu0nM+yr~@a|>}Bv7cxV&m-<24ie8N?j~MDyo7ieaSw4X@hajF
z@oM5V#Dm1^$onwy2(ce-pwFYk5#r6nTZy+5?<7`<4zWh86Gw?YF(gJrNsNh2VvBg3
zcn|SD;tAq|#D|HG5+5f%Nqn04Eb)2bi^P|SuM%G;zDazW_%88%;)leKiJuZbCw@s}
cki^2U>VSRlHGcaRzDNEDKO=vI-;pQ(0}qG$0ssI2

literal 3083
zcma);X?xp55Xb+5Qd8PeT5af+9`vFui9~a7pM|Cb5*lh~!_8V++lnQvkmSVS4EKGX
zpM)2@-~;fXco>aiTb7-q$@Baq?HoHhv$N}e|NHwN0Mq!hgn0wo=e67Pm5Jv~Trsg=
z;sp~|O_WW%XyPRk*GybDv1sCD6R((f)x>KiUN`ZEi8oEWWkQ;$m~aGK0VPlss0q{s
zJb@*FhJY^+2!sM!AQE_6AQngjQh}zxvcQT!OJG&t9f5ZR-V=CV-~)jV1=a*U68Ko)
z6M;_!J`?y{;0u8-1-=saTHqUjZw0;+_+H?L5`HY<rxJcH;g=GAE#bEkelOt<13Lp=
z=C~JDwE>~ynk6IY)Rh%!&(gXT_y%??$z^F(WTFi0E2xl~0W&v978NDK#K357wCl}E
z$ax@1d@Lt+bP(t;u^jFD%1J$XpE7V@sD`T?1G_sGflTX@26mMr87JzZmzGu9Z|Un=
z%?oQ5J*SpPlNYl-*!gr-(nxhg%VTMxoM!B$tJYF2p-A`eAT7*t;?*dnL><mWmdG$|
z%GlEuX^^FXgPF9Vo1wGn$RzbCnXz8>TooG_8I(1=7Uj4iQ?Fr3pYpvo=RI<(6;1Md
z-m5xHd2rNKR;*L{kFB<%Rf}a*_nc(HrLs^!oo`Alr`W&|@@}__Y*Sh6)=E^hRV$69
zLw+`pHxm`pR#6mPwz>iPb=iP#x7O$TXwkMUcT~hRA2NBSkemGUFb7?^P3g}Z8L)0h
z&#oyQs5D+RaB>TSx{PS|Z{;@AqFnaYvwxUdDocBd_N9?mntB_FvQXO{nzvf-(5zDi
zhHY0Z8z`onE%Nm)*0Zh9<VXhV>GqZ5L}A{Ro0r=uZL49a?Nf5<G9IF(BNbAjrk48h
znVl(p3+-y@h&r#hJ$g<^Y<pp<;!skCFKp(ft7ivvrqrn=RZOSA<c--h!#=BG273{;
zGn^fr`31F-q&lPxXf$85fxNSPS<y+<Yt-V@nd?n^sZVa#l^^lK&khN(=O+tGg-Lc~
z8#pvfwc>>`Yq8=+<9IeYII>uhG*&X8vwKLlaIC|-CGo4a8_ShpX(UlDLxT~Kd_AIK
zOSLk$?V4pbSH5O+idGYw?*`jVJPP;B78-U{Ix3}v6?0p3MJHOk>^X{5H=8w80bO3_
z3$u0)b^B81cwgvVMAHT3!nt5CT$x>*pX(aV@a;fV94pu*NiU=JbsaY<S~q&r6g#bd
z6WWXA@=V95JH>c$3O_eR*{6%NT-PhTIVKAF?NW6bf##T-=~{IsIaM%9eBLznY#?ju
zstW10&hG1T1vU1a?Jm1~?Q);)8eq^5$o8Lso9Oc|+{~XN*tV9v+=Ao8?aUJM)@&F%
zn71)^GIud|GjC_^Vcx;q%iPB_nSwdOypy?~d4M^FgZw<iJj@(r9$_A39%CM7-o-q@
zJjp!8Jk31AyqkHJd5(FWc@J}pInK10HuGNQ1?B{Ek~zhkX5PoVpZNguLFPluhnbHs
sA7wtqe4P0N^GW7K=2Oh4nRJEI)1XQK+i;2AW^kGK3}%VX;yL2n|2O1=%m4rY

diff --git a/src/multimodule/ooxml/java9/module-info.java b/src/multimodule/ooxml/java9/module-info.java
index d8893df5bd..317a9d9ca9 100644
--- a/src/multimodule/ooxml/java9/module-info.java
+++ b/src/multimodule/ooxml/java9/module-info.java
@@ -89,9 +89,28 @@ module org.apache.poi.ooxml {
     requires org.bouncycastle.pkix;
 
     /* optional dependencies for slideshow rendering via PPTX2PNG */
-    requires batik.all;
+    requires static batik.anim;
+    requires static batik.awt.util;
+    requires static batik.bridge;
+    requires static batik.codec;
+    requires static batik.constants;
+    requires static batik.css;
+    requires static batik.dom;
+    requires static batik.ext;
+    requires static batik.gvt;
+    requires static batik.i18n;
+    requires static batik.parser;
+    requires static batik.script;
+    requires static batik.shared.resources;
+    requires static batik.svg.dom;
+    requires static batik.svggen;
+    requires static batik.svgrasterizer;
+    requires static batik.transcoder;
+    requires static batik.util;
+    requires static batik.xml;
+    requires static xmlgraphics.commons;
+
     requires org.apache.pdfbox;
     requires org.apache.fontbox;
     requires de.rototor.pdfbox.graphics2d;
-    requires xmlgraphics.commons;
 }
\ No newline at end of file
diff --git a/src/multimodule/ooxml/test9/module-info.class b/src/multimodule/ooxml/test9/module-info.class
index db5f9a34ca82b14d3326a8c0e652057877d30a0c..8fc0ead9383043aaa8ca801ad938f4e5a3c7a74f 100644
GIT binary patch
literal 4982
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

literal 4542
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
Qfp0Q?3jyOCLdMqr0iQp}=Kufz

diff --git a/src/multimodule/ooxml/test9/module-info.java b/src/multimodule/ooxml/test9/module-info.java
index 09195b1f69..152cab9e5c 100644
--- a/src/multimodule/ooxml/test9/module-info.java
+++ b/src/multimodule/ooxml/test9/module-info.java
@@ -90,11 +90,30 @@ module org.apache.poi.ooxml {
 
 
     /* optional dependencies for slideshow rendering via PPTX2PNG */
-    requires batik.all;
+    requires static batik.anim;
+    requires static batik.awt.util;
+    requires static batik.bridge;
+    requires static batik.codec;
+    requires static batik.constants;
+    requires static batik.css;
+    requires static batik.dom;
+    requires static batik.ext;
+    requires static batik.gvt;
+    requires static batik.i18n;
+    requires static batik.parser;
+    requires static batik.script;
+    requires static batik.shared.resources;
+    requires static batik.svg.dom;
+    requires static batik.svggen;
+    requires static batik.svgrasterizer;
+    requires static batik.transcoder;
+    requires static batik.util;
+    requires static batik.xml;
+    requires static xmlgraphics.commons;
+
     requires org.apache.pdfbox;
     requires org.apache.fontbox;
     requires de.rototor.pdfbox.graphics2d;
-    requires xmlgraphics.commons;
 
 
     // test specific exports
diff --git a/src/multimodule/poi/java9/module-info.class b/src/multimodule/poi/java9/module-info.class
index 3a40124eb2045997deecea48e5475a623a157fb2..5d96fed54bc64628f33c95677dbc8a8cebeecafb 100644
GIT binary patch
literal 3329
zcmai$_nO;85Wr_CF-IDSHoZ4W$XSG3=p_VlB)~z4fzV-3TFW|1S|P3NGxg}bx6nHe
z!5=&TPr;M$F&eq(yt3o(^Us!cc6RFS{`22oe*?f#__G2RFjyHXw-v}~KdLJRE9U6Q
zf{PifSBX~@v2Yr)8Y@5hT2NsywIJG}IxkXb!4!jC1u;j3p^DO~qk=#>+Q<Jh7OZ5j
zxm3uNjs>e3tnSYXg>D?NU@e1HwOAynJnrk7)E2B;t|CyL=SN-@e`gjfuuz_i>b<vM
zL;sB{)23Fj1)CVGU2vP#R+P5lSS4Dz9JVl6gO=I3mo|FHVH<-D%ir0#c^r1+-WJ4r
zLv|~b2?kOI9Ck4{P&$7oWY<-sQx1FbAQ$zyZk@xv+}q-Nxu_H2Xq9j{z`z<=pb@7y
z?Ft4vN(Su0+^fcjbYu`TBh`sGTwS6*&D2jb*fgph2W(fiIoJ$#mJQ0bjC3zDhZ*c0
zD^rNz5eC)s%h_%#47-VRRDzj2TH;t{T*3G28Eh$2+q3RQ23yO9`zzdR=CzTnkdNEK
z^AhO^EitdRjxnYu>R>Q$XRv$xYPQo5iRN$zgFTa^sNFc+Y1U=YGzY7V!-@0gO1iOD
z9PXa%X6(0>)?z-898QgKvyjSr$7maf*bN!PGQptDnMF@dw6u?1^#FryBay&vt*3+D
ze9%l^Pat!QL(L3$VI0%vXD&U=V1M~CnHGEAk3`Z<oEZ*hCrdgMP7&jV@)(1C6Lh9p
zM6Sqc_zAOziY6{*&Ht1crCf%(@R@N&Q5)9L#k8Ah8FCP2$>e&9Le99Lhr&q|=1h*W
zCi1bAJhMLXHR42J&UKfA&tQ9LY*O6ngohbvGT1mGkp{M#hz^I)w68a2ds3m7c%qF~
z4GI+Ygy+mX4F&v=mQG7&4@#Fqi@~~4+b}Afl6h%y)vg(~G{r+9!Sj#93+6u68*K%G
z!%JpVhr_neF^5;ojkX|y+d)=yxYDa;!4>3WTVUh8Zg%j9OlEj9J5Ar5xNN-@(T#w^
z+h#))RQBaCknc`(HP#-7_a}<9veWd#(sUHk_;IN{1A*Zd^=U~hrgpwTeQq`sI+cyt
z4j!%@5i~h`X`Ze5?5|B5JMr+sP=Rk492_aNK^fa8`j>;#iE8_<Oe*jlgF_?onK}Jy
zihUMyHm_83IO7Kf)1xzj!i-vgnrjW!8BY1h+-~~)cPeY4GcrPBGIM@0l@HCI6Mi&s
zVU}(=-3t81;P8k&`FSw#;bg5g+xKHI?GH0heVgzy8H#wBWlI1IFT?qV!G-wvFI+^A
zQ?Ozw`*R6BT}oU<TtmE!xSq&~8;QqYGyQHQZYS;}?k4Uf?k8SOypnj3c!*dfUPHW=
zI77UScmwe!;w{A6h{uS>iFXlai6@Eo5bq=2PdrULLwtz%2=P(k<HRS4PZOUd&J$f?
zo!B5Q5CdXFjEM<R6Whc^;`788i7ykEh_4afAihO>hxi`x1L8--Pl%rpzaV}^1kB($
Y_!hp0A2FlnFvCCN6N6vznZfV>155|W^Z)<=

literal 3314
zcmai$_kP?&5XXOlki(>r+@$wL3Gs;#hh9P;CIJi~2ZRo5Y41)xog^gPolP~p_ue}X
z!5=&TPr;M$VKmp2J;m|o<F75v?CjKC{qx^ne*-vzKTCMf!t$BWZTq^6hst=kj5B3C
zQpTfYJXXfzWjs;FlVv<bc$)AGK@nyN4#6d8LXA)-GzcDHj?g6dgcczngoKFjEFmT&
zgp|-GbO>F-JYj+G9N~Gw3xpR5FA-iQED~NJyh?bD@H*iQ!kdJ*2yYYKA-qd?kMKU>
z1Hy-dj|d+VJ|TQc_>Ay5;S0i-gs%u+6TTsQOZblPJ>dt!k0tz6!p|lAQo^q#{8qy6
zCH!GwMN49z^nzMwVO<#4D=Jb>Lsz2E%YH3P%&Cs5%&J6N*qKvs!d5E`l8O`hzIIZN
z|DUq3sZhh!j)hf&6)lxE4qI4RjZ~cIV_sU-Desf5O#Ir^9E)U6KdjfipgwqXb<#}3
z$ikXAw^?ZiNjr+dIMuF&)x6g3Ic|&7>(72+_qOf@kW=ixx7&%1ITPBqu)lESNW-p$
zL7Mb(mAB-&wO;i3mwG;pm6L|Cg|cC{5hc7}d%;^fx2jOy)xO^h!fsGtHOZ`QG_CSm
z+tnQlJBlQ_ql2^`{+@Fx<Z@Iwzmn~?TdjpyJ7LWA84DwGC>Q4DB7=R8wiL+*hRtd<
zGQ&Ngt?Kny*Hx;yT7?eu^&HOFu5)i<I}H_cf9_sNMP^~Vz4Goj+&Aa35-&t4kKs~5
zMP4UNQ#I@JG!_PxD^sDJq1<k0KhiNLC!5)P*NWHe)Z=N`YKVBaYRPb#%+mCwSs3Ff
z%?Y_QUKYT<V(Zy@d)5n7ybwE6ORG7OGZpbcwRZ_?NvZ-@WvysVK;EtSY*5W?^b}-z
ziv5-Gsc}HbLXzs%co+06<TZ-Z+EPv&7SyA+KJd6T%#!y+Q5<q5(*+CL3UiR~38d<r
z@C}AI@ohI&-SIm21$JGB9FXZQOLN0(o;ED?TC!cix?%fSSZg}Np^vRd@;jNONfJJd
zW4=x-m?ubI)b`bQ(nc~{rF@^5XI@UuLz}e@Z(#OKPDyuE!Np-HWS%y&yK0HuYVANS
z((zu-85<}SoN76(DCK+8?3SFoon2Q2+0NC+oF`sAl#ULMv6f;jIXbd$h5V_KEoXu4
z@a@%AeslctDn4?$(P&!>2MnvjKD3Vy?%Gpv*zsJ=qkPa%J}ZJVT#wl>Y>w0?O?7{?
zvt9MsX0;J^NBZV*Fc_MXS@)mT0sD}7VVWJeJfpl|==QXHDDVs)GTi7L$Ad2v`$V-m
zJ@9?F#!Sn=75=ztspu?+76FUDetSO_F5t(1aiKg;VA*2!&qW!qTv!rbESwNtB3vO{
zDLjf*@^`gxjqp<8TH!ijSxCb5!VSWW!cD@>!Y#tB!fnFs!X3h$!d=4M!ac&h!hOR1
z!pnr03$GAfDLf#&N_bE>DXa)>;nl)J!fS+wg;T;K!fS=s39lF4AiPm{lkjHYEy7!c
zw+W95Zx<dD-XXkGcw9Iwyi0gOcv5(`@E+m4LSPwYa3Ai+DX!%VSNH*bvT&N8EmZ#p
DBLu@<

diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java b/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
index 33c5703f8b..27f053dc85 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
+++ b/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
@@ -35,6 +35,8 @@ import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.poi.common.usermodel.GenericRecord;
 import org.apache.poi.poifs.filesystem.FileMagic;
 import org.apache.poi.sl.draw.Drawable;
@@ -47,6 +49,7 @@ import org.apache.poi.util.LocaleUtil;
  * An utility to convert slides of a .pptx slide show to a PNG image
  */
 public final class PPTX2PNG {
+    private static final Logger LOG = LogManager.getLogger(PPTX2PNG.class);
 
     private static final String INPUT_PAT_REGEX =
         "(?<slideno>[^|]+)\\|(?<format>[^|]+)\\|(?<basename>.+)\\.(?<ext>[^.]++)";
@@ -350,8 +353,14 @@ public final class PPTX2PNG {
 
     private OutputFormat getOutput() {
         switch (format) {
-            case "svg":
-                return new SVGFormat(textAsShapes);
+            case "svg": {
+                try {
+                    return new SVGFormat(textAsShapes);
+                } catch (Exception | NoClassDefFoundError e) {
+                    LOG.atError().withThrowable(e).log("Batik is not not added to/working on the module-path. Use classpath mode instead of JPMS. Fallback to PNG.");
+                    return new BitmapFormat("png");
+                }
+            }
             case "pdf":
                 return new PDFFormat(textAsShapes,fontDir,fontTtf);
             case "log":
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
index 798b559047..d7fc0b4471 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
@@ -910,6 +910,8 @@ class TestSignatureInfo {
                 si.setSignatureConfig(sic);
                 // hash > sha1 doesn't work in excel viewer ...
                 si.confirmSignature();
+            } catch (java.util.ServiceConfigurationError e) {
+                assumeFalse(true, "running on module-path / JPMS and batik is \"kaputt\" WRT JPMS");
             }
 
             XmlDocumentPackageInit reinit =
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
index b4bd226083..0df21b2720 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
@@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import java.awt.geom.Rectangle2D;
 import java.io.ByteArrayInputStream;
@@ -46,7 +47,7 @@ import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
 
 class TestXSLFPictureShape {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
+    private static final POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
     @Test
     void testCreate() throws Exception {
@@ -287,6 +288,8 @@ class TestXSLFPictureShape {
         } catch (IIOException ignore) {
             // Ignore all ImageIO related exceptions like "Can't create output stream!"
             // which fail often in maven builds because of missing/wrong temp directory
+        } catch (NoClassDefFoundError ignore) {
+            assumeFalse(true, "Batik doesn't work on th module-path");
         }
     }
 }
\ No newline at end of file
-- 
2.39.5