#64867 - Provide PDF rendering with PPTX2PNG

add dependencies to gradle and maven builds

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1883075 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.gradle b/build.gradle
index 97ee04ad47dcfee0ff2c22ca81556340aa214bde..47aa68d6b331cac78d8a09497f651c46ae5fcc70 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -293,6 +293,10 @@ project('ooxml') {
         compile 'xml-apis:xml-apis-ext:1.3.04'
         compile 'org.apache.xmlgraphics:xmlgraphics-commons:2.4'
 
+        compile 'org.apache.pdfbox:pdfbox:2.0.19'
+        compile 'org.apache.pdfbox:fontbox:2.0.19'
+        compile 'de.rototor.pdfbox:graphics2d:0.27'
+
         // for ooxml-lite, should we move this somewhere else?
         compile "junit:junit:${junitVersion}"
 

diff --git a/build.xml b/build.xml
index 673d1bb983de1588089b626aa8fce75ff7ec20ab..6ac84afbd1376a0c9faf259e8befe79590d8e362 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -2484,6 +2484,9 @@ under the License.
             <auxClasspath path="${svg.batik-all.jar}"/>
             <auxClasspath path="${svg.xml-apis-ext.jar}"/>
             <auxClasspath path="${svg.xmlgraphics-commons.jar}"/>
+            <auxClasspath path="${pdf.pdfbox.jar}"/>
+            <auxClasspath path="${pdf.fontbox.jar}"/>
+            <auxClasspath path="${pdf.graphics2d.jar}"/>
             <sourcePath path="src/java" />
             <sourcePath path="src/ooxml/java" />
             <sourcePath path="src/scratchpad/src" />

diff --git a/osgi/README.md b/osgi/README.md
index bca3ccfc6ad02d06d352369ec0f417cc73d1fc20..0ccbebf5d997d9a78f04397429024db07f025c2f 100644 (file)
--- a/osgi/README.md
+++ b/osgi/README.md
@@ -28,6 +28,15 @@ These are required to sign or validate signed Office documents. The OSGi bundles
     - XML Commons Resolver: https://mvnrepository.com/artifact/xml-resolver/xml-resolver/1.2-osgi
     
     - Bouncy Castle: https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk15on/1.66, https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on/1.66
+4. PDFBox and PDFBox Graphics2D  
+Required to render to PDF documents.
+The required jars can be downloaded from:
+
+    - PDFBox:  
+      https://mvnrepository.com/artifact/org.apache.pdfbox/pdfbox
+      https://mvnrepository.com/artifact/org.apache.pdfbox/fontbox
+    - PDFBox Graphics2D:  
+      https://mvnrepository.com/artifact/de.rototor.pdfbox/graphics2d
 
 ## Blocked Imports
 

diff --git a/osgi/pom.xml b/osgi/pom.xml
index 967225244445087c992bb1fb37be53e75aba7832..99a1bba145c3e0287c8de3ac2373b02d7ceb0ad4 100644 (file)
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -75,6 +75,9 @@
                             !com.zaxxer.sparsebits.*,
                             !com.graphbuilder.*,
                             org.apache.batik.*;resolution:=optional,
+                            org.apache.pdfbox.*;resolution:=optional,
+                            org.apache.fontbox.*;resolution:=optional,
+                            de.rototor.pdfbox.graphics2d.*;resolution:=optional,
                             net.sf.saxon.*;resolution:=optional,
                             !com.github.javaparser.*,
                             !org.apache.tools.ant.*,

diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index dd908ed814af7e13410024771c17c1052dfee8a9..36bddf0d32aea57b27cba809fafc1c02c61c30c6 100644 (file)
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -189,5 +189,12 @@
             <artifactId>batik-all</artifactId>
             <version>1.13</version>
         </dependency>
+
+        <dependency>
+            <!-- don't add it to the distribution -->
+            <groupId>de.rototor.pdfbox</groupId>
+            <artifactId>graphics2d</artifactId>
+            <version>0.27</version>
+        </dependency>
     </dependencies>
 </project>