From f3b51d41a43e4401f2dcf1f6400a021c9f6bfaf7 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Mon, 20 Dec 2021 20:56:05 +0000
Subject: [PATCH] pdfbox dependency

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

diff --git a/build.gradle b/build.gradle
index c8874f9d1c..352b3e3db1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -124,6 +124,8 @@ subprojects {
         hamcrestVersion = '2.2'
         xmlbeansVersion = '5.0.2'
         batikVersion = '1.14'
+        graphics2dVersion = '0.34'
+        pdfboxVersion = '2.0.25'
         saxonVersion = '10.6'
         apiGuardianVersion = '1.1.2'
 
diff --git a/build.xml b/build.xml
index afc5a76cd1..ebb781c4fc 100644
--- a/build.xml
+++ b/build.xml
@@ -324,8 +324,8 @@ under the License.
     <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.24" usage="ooxml-provided"/>
-    <dependency prefix="pdf.fontbox" artifact="org.apache.pdfbox:fontbox:2.0.24" usage="ooxml-provided"/>
+    <dependency prefix="pdf.pdfbox" artifact="org.apache.pdfbox:pdfbox:2.0.25" usage="ooxml-provided"/>
+    <dependency prefix="pdf.fontbox" artifact="org.apache.pdfbox:fontbox:2.0.25" usage="ooxml-provided"/>
     <dependency prefix="pdf.graphics2d" artifact="de.rototor.pdfbox:graphics2d:0.34" usage="ooxml-provided"/>
 
     <!-- jars in the ooxml-lib directory, see the fetch-ooxml-jars target-->
diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index 3c225a8b18..f29c0f79ca 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -82,7 +82,8 @@ dependencies {
     rendersignImplementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
     rendersignImplementation "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}"
 
-    renderImplementation 'de.rototor.pdfbox:graphics2d:0.34'
+    renderImplementation "org.apache.pdfbox:pdfbox:${pdfboxVersion}"
+    renderImplementation "de.rototor.pdfbox:graphics2d:${graphics2dVersion}"
     renderImplementation "org.apache.xmlgraphics:batik-svggen:${batikVersion}"
     renderImplementation("org.apache.xmlgraphics:batik-svgrasterizer:${batikVersion}") {
         exclude group: 'xalan', module: 'xalan'
@@ -103,7 +104,8 @@ dependencies {
         }
     }
 
-    rendersignImplementation 'de.rototor.pdfbox:graphics2d:0.34'
+    rendersignImplementation "org.apache.pdfbox:pdfbox:${pdfboxVersion}"
+    rendersignImplementation "de.rototor.pdfbox:graphics2d:${graphics2dVersion}"
     rendersignImplementation "org.apache.xmlgraphics:batik-svggen:${batikVersion}"
     rendersignImplementation("org.apache.xmlgraphics:batik-svgrasterizer:${batikVersion}") {
         exclude group: 'xalan', module: 'xalan'