From 212863741fc4790259d345a70608d25cec31a4d6 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Mon, 28 Jun 2021 16:28:21 +0000
Subject: [PATCH] upgrade pdfbox dependency

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

diff --git a/build.xml b/build.xml
index a347d42b02..e709ae0b22 100644
--- a/build.xml
+++ b/build.xml
@@ -323,9 +323,9 @@ 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.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.31" usage="ooxml-provided"/>
+    <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.graphics2d" artifact="de.rototor.pdfbox:graphics2d:0.32" 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"/>
@@ -336,7 +336,7 @@ under the License.
     <dependency prefix="ooxml.test.reflections" artifact="org.reflections:reflections:0.9.12" usage="ooxml-tests"/>
     <dependency prefix="ooxml.test.guava" artifact="com.google.guava:guava:30.1-jre" usage="ooxml-tests"/>
     <dependency prefix="ooxml.test.javassist" artifact="org.javassist:javassist:3.27.0-GA" usage="ooxml-tests"/>
-    <dependency prefix="ooxml.test.slf4j-api" artifact="org.slf4j:slf4j-api:1.7.30" usage="ooxml-tests"/>
+    <dependency prefix="ooxml.test.slf4j-api" artifact="org.slf4j:slf4j-api:1.7.31" usage="ooxml-tests"/>
 
     <!-- coverage libs -->
     <dependency prefix="jacoco" artifact="org.jacoco:jacoco:0.8.6" usage="util" packaging="zip"/>
@@ -692,6 +692,7 @@ under the License.
                 <include name="bc*-1.65.jar"/>
                 <include name="bc*-1.66.jar"/>
                 <include name="batik*.jar"/>
+                <include name="slf4j*-1.7.30.jar"/>
                 <include name="xmlsec*-2.2.1.jar"/>
             </fileset>
             <fileset dir="${basedir}/lib/ooxml-tests">
diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index 0450e9464a..0c6668afd8 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -60,7 +60,7 @@ dependencies {
     implementation "org.apache.xmlgraphics:batik-codec:${batikVersion}"
     implementation "org.apache.xmlgraphics:batik-svgrasterizer:${batikVersion}"
 
-    api 'de.rototor.pdfbox:graphics2d:0.30'
+    api 'de.rototor.pdfbox:graphics2d:0.32'
 
 
     testImplementation project(':poi-scratchpad')
@@ -73,7 +73,7 @@ dependencies {
     testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.26'
     testImplementation 'com.google.guava:guava:30.0-jre'
 
-    // prevent slf4j warnings coming from xmlsec -> slf4j-api 1.7.30 dependency
+    // prevent slf4j warnings coming from xmlsec -> slf4j-api 1.7.31 dependency
     // see https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/
     testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1'
 
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index ed947471c9..41f1523351 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -175,7 +175,7 @@
         <dependency>
             <groupId>de.rototor.pdfbox</groupId>
             <artifactId>graphics2d</artifactId>
-            <version>0.31</version>
+            <version>0.32</version>
         </dependency>
 
         <dependency>
-- 
2.39.5