FOP-3162: Missing jars in servlet

diff --git a/fop-servlet/pom.xml b/fop-servlet/pom.xml
index 67caf220e5786278a88002b8d45abad6beb765d3..2c4b984e47f86a2b61e8cc0bda02759d4b0f7c85 100644 (file)
--- a/fop-servlet/pom.xml
+++ b/fop-servlet/pom.xml
@@ -56,8 +56,9 @@
             WEB-INF/lib/batik-all-*.jar,
             WEB-INF/lib/commons-io-${commons.io.version}.jar,
             WEB-INF/lib/commons-logging-${commons.logging.version}.jar,
-            WEB-INF/lib/fop-${project.version}.jar,
-            WEB-INF/lib/xmlgraphics-commons-*.jar
+            WEB-INF/lib/fop-*${project.version}.jar,
+            WEB-INF/lib/xmlgraphics-commons-*.jar,
+            WEB-INF/lib/fontbox-*.jar,
           </packagingIncludes>
           <archive>
             <addMavenDescriptor>false</addMavenDescriptor>

diff --git a/fop/build.xml b/fop/build.xml
index ad3b55b45251a268a1fdcaf031b4fabc9a2a8eca..781128dd83998bb300779c559ee9b7a9860f868b 100644 (file)
--- a/fop/build.xml
+++ b/fop/build.xml
@@ -578,6 +578,7 @@ list of possible build targets.
         <include name="batik*.jar"/>
         <include name="commons-io*.jar"/>
         <include name="xmlgraphics*.jar"/>
+        <include name="fontbox*.jar"/>
       </lib>
       <lib dir="${build.dir}">
         <include name="fop.jar"/>