From f219a1a09fbd88a9cd6472676214a8eb4e6dcc26 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 9 Oct 2024 20:47:05 +0000 Subject: [PATCH] try batik 1.18 again git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1921224 13f79535-47bb-0310-9956-ffa450edef68 --- poi-ooxml/src/main/java9/module-info.java | 37 +++++++++++----------- poi-ooxml/src/test/java9/module-info.java | 38 +++++++++++------------ 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/poi-ooxml/src/main/java9/module-info.java b/poi-ooxml/src/main/java9/module-info.java index 2137980f4f..d740345f59 100644 --- a/poi-ooxml/src/main/java9/module-info.java +++ b/poi-ooxml/src/main/java9/module-info.java @@ -93,24 +93,25 @@ module org.apache.poi.ooxml { requires static org.bouncycastle.pkix; /* optional dependencies for slideshow rendering via PPTX2PNG */ - 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.svg.dom; - requires static batik.svggen; - requires static batik.svgrasterizer; - requires static batik.transcoder; - requires static batik.util; - requires static batik.xml; + requires static org.apache.xmlgraphics.batik.anim; + requires static org.apache.xmlgraphics.batik.awt.util; + /* this typo appears in Batik 1.18 and will be fixed in a future release */ + requires static org.apache.xmlgraphics.batik.brdige; + requires static org.apache.xmlgraphics.batik.codec; + requires static org.apache.xmlgraphics.batik.constants; + requires static org.apache.xmlgraphics.batik.css; + requires static org.apache.xmlgraphics.batik.dom; + requires static org.apache.xmlgraphics.batik.ext; + requires static org.apache.xmlgraphics.batik.gvt; + requires static org.apache.xmlgraphics.batik.i18n; + requires static org.apache.xmlgraphics.batik.parser; + requires static org.apache.xmlgraphics.batik.script; + requires static org.apache.xmlgraphics.batik.svgdom; + requires static org.apache.xmlgraphics.batik.svggen; + requires static org.apache.xmlgraphics.batik.svgrasterizer; + requires static org.apache.xmlgraphics.batik.transcoder; + requires static org.apache.xmlgraphics.batik.util; + requires static org.apache.xmlgraphics.batik.xml; requires static xmlgraphics.commons; requires static org.apache.pdfbox; diff --git a/poi-ooxml/src/test/java9/module-info.java b/poi-ooxml/src/test/java9/module-info.java index 70298d365a..3c6276dfd6 100644 --- a/poi-ooxml/src/test/java9/module-info.java +++ b/poi-ooxml/src/test/java9/module-info.java @@ -93,26 +93,26 @@ module org.apache.poi.ooxml { requires static org.bouncycastle.provider; requires static org.bouncycastle.pkix; - /* optional dependencies for slideshow rendering via PPTX2PNG */ - 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.svg.dom; - requires static batik.svggen; - requires static batik.svgrasterizer; - requires static batik.transcoder; - requires static batik.util; - requires static batik.xml; + requires static org.apache.xmlgraphics.batik.anim; + requires static org.apache.xmlgraphics.batik.awt.util; + /* this typo appears in Batik 1.18 and will be fixed in a future release */ + requires static org.apache.xmlgraphics.batik.brdige; + requires static org.apache.xmlgraphics.batik.codec; + requires static org.apache.xmlgraphics.batik.constants; + requires static org.apache.xmlgraphics.batik.css; + requires static org.apache.xmlgraphics.batik.dom; + requires static org.apache.xmlgraphics.batik.ext; + requires static org.apache.xmlgraphics.batik.gvt; + requires static org.apache.xmlgraphics.batik.i18n; + requires static org.apache.xmlgraphics.batik.parser; + requires static org.apache.xmlgraphics.batik.script; + requires static org.apache.xmlgraphics.batik.svgdom; + requires static org.apache.xmlgraphics.batik.svggen; + requires static org.apache.xmlgraphics.batik.svgrasterizer; + requires static org.apache.xmlgraphics.batik.transcoder; + requires static org.apache.xmlgraphics.batik.util; + requires static org.apache.xmlgraphics.batik.xml; requires static xmlgraphics.commons; requires static org.apache.pdfbox; -- 2.39.5