Move to mvn for dependancies

18 files changed, 48 insertions, 1 deletions

diff --git a/fop/build.xml b/fop/build.xml
index 5c983e2f9..b891f1ec0 100644
--- a/fop/build.xml
+++ b/fop/build.xml
@@ -165,6 +165,15 @@ list of possible build targets.
   <property name="samedir" value="${basedir}"/>
   <property name="junit.reports.dir" value="${build.dir}/test-reports"/>
   <property name="junit.html.reports.dir" value="${build.dir}/test-reports/html"/>
+  <property name="copy.dependencies.arg" value=""/>
+  
+  <condition property="isWindows">
+    <os family="windows" />
+  </condition>
+  <condition property="isUnix">
+    <os family="unix" />
+  </condition>    
+  
 <!-- Importing Apache Forrest for building the docs -->
 <!--
   <property environment="env"/>
@@ -471,6 +480,44 @@ list of possible build targets.
       </fileset>
     </jar>
   </target>
+  <target name="mvn-jars" depends="mvn-jars-unix,mvn-jars-windows" unless="dev">
+    <delete failonerror="false">
+      <fileset dir="${basedir}/lib">
+        <include name="*.jar"/>
+        <exclude name="checkstyle*.jar"/>
+        <exclude name="jacocoant*.jar"/>
+        <exclude name="twelvemonkeys*.jar"/>
+        <exclude name="zxing*.jar"/>
+        <exclude name="avalon*.jar"/>
+        <exclude name="barcode4j*.jar"/>
+        <exclude name="bcprov*.jar"/>
+        <exclude name="fop-pdf-images*.jar"/>
+        <exclude name="jai_imageio*.jar"/>
+        <exclude name="levigo*.jar"/>
+      </fileset>
+    </delete>
+    <copy todir="${basedir}/lib">
+      <fileset dir="${basedir}/../fop-core/target/dependency">
+        <include name="*.jar"/>
+        <exclude name="fop*SNAPSHOT.jar"/>
+        <exclude name="ant*.jar"/>
+      </fileset>
+    </copy>
+  </target>
+  <target name="mvn-jars-unix" if="isUnix" unless="dev">
+    <exec executable="mvn" dir="${basedir}/.." failonerror="true">
+      <arg value="clean"/>
+      <arg line="${copy.dependencies.arg} dependency:copy-dependencies -DskipTests"/>
+    </exec>
+  </target>
+  <target name="mvn-jars-windows" if="isWindows" unless="dev">
+    <exec executable="cmd" dir="${basedir}/.." failonerror="true">
+	  <arg value="/c"/>
+	  <arg value="mvn"/>    
+      <arg value="clean"/>
+      <arg line="${copy.dependencies.arg} dependency:copy-dependencies -DskipTests"/>
+    </exec>
+  </target>
   <target name="uptodate-jar-sandbox" depends="compile">
     <uptodate property="jar.sandbox.uptodate" targetfile="${build.dir}/fop-sandbox.jar">
       <srcfiles dir="${build.sandbox-classes.dir}"/>
@@ -522,7 +569,7 @@ list of possible build targets.
 <!-- =================================================================== -->
 <!-- Creates the class package                                           -->
 <!-- =================================================================== -->
-  <target name="package" depends="jar-main,jar-hyphenation,jar-sandbox" description="Generates the jar files"/>
+  <target name="package" depends="mvn-jars,jar-main,jar-hyphenation,jar-sandbox" description="Generates the jar files"/>
   <target name="servlet" depends="package" description="Generates the WAR with the sample FOP servlet">
     <echo message="Creating the WAR file"/>
     <war warfile="${build.dir}/fop.war" webxml="${servlet.src.dir}/main/webapp/WEB-INF/web.xml">
diff --git a/fop/lib/batik-all-1.11.0-SNAPSHOT.jar b/fop/lib/batik-all-1.11.0-SNAPSHOT.jar
deleted file mode 100644
index 66b0aaa0f..000000000
--- a/fop/lib/batik-all-1.11.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/fop/lib/build/asm-3.1.jar b/fop/lib/build/asm-3.1.jar
deleted file mode 100644
index 8217cae0a..000000000
--- a/fop/lib/build/asm-3.1.jar
+++ /dev/null
diff --git a/fop/lib/build/byte-buddy-1.9.10.jar b/fop/lib/build/byte-buddy-1.9.10.jar
deleted file mode 100644
index 239fc8025..000000000
--- a/fop/lib/build/byte-buddy-1.9.10.jar
+++ /dev/null
diff --git a/fop/lib/build/hamcrest.core-1.1.0.jar b/fop/lib/build/hamcrest.core-1.1.0.jar
deleted file mode 100644
index 5b2b48430..000000000
--- a/fop/lib/build/hamcrest.core-1.1.0.jar
+++ /dev/null
diff --git a/fop/lib/build/jaxen-1.1.1.jar b/fop/lib/build/jaxen-1.1.1.jar
deleted file mode 100644
index b63363113..000000000
--- a/fop/lib/build/jaxen-1.1.1.jar
+++ /dev/null
diff --git a/fop/lib/build/mockito-core-2.28.2.jar b/fop/lib/build/mockito-core-2.28.2.jar
deleted file mode 100644
index 525ff4765..000000000
--- a/fop/lib/build/mockito-core-2.28.2.jar
+++ /dev/null
diff --git a/fop/lib/build/objenesis-1.0.0.jar b/fop/lib/build/objenesis-1.0.0.jar
deleted file mode 100644
index 1f1b76d2a..000000000
--- a/fop/lib/build/objenesis-1.0.0.jar
+++ /dev/null
diff --git a/fop/lib/build/pmd-4.2.5.jar b/fop/lib/build/pmd-4.2.5.jar
deleted file mode 100644
index 986ad2010..000000000
--- a/fop/lib/build/pmd-4.2.5.jar
+++ /dev/null
diff --git a/fop/lib/build/qdox-1.12.jar b/fop/lib/build/qdox-1.12.jar
deleted file mode 100644
index 3d850e5f5..000000000
--- a/fop/lib/build/qdox-1.12.jar
+++ /dev/null
diff --git a/fop/lib/build/xmlunit-1.2.jar b/fop/lib/build/xmlunit-1.2.jar
deleted file mode 100644
index e61df62b8..000000000
--- a/fop/lib/build/xmlunit-1.2.jar
+++ /dev/null
diff --git a/fop/lib/commons-io-2.11.0.jar b/fop/lib/commons-io-2.11.0.jar
deleted file mode 100644
index be507d94f..000000000
--- a/fop/lib/commons-io-2.11.0.jar
+++ /dev/null
diff --git a/fop/lib/commons-logging-1.0.4.jar b/fop/lib/commons-logging-1.0.4.jar
deleted file mode 100644
index b73a80fab..000000000
--- a/fop/lib/commons-logging-1.0.4.jar
+++ /dev/null
diff --git a/fop/lib/fontbox-2.0.27.jar b/fop/lib/fontbox-2.0.27.jar
deleted file mode 100644
index d2737d9af..000000000
--- a/fop/lib/fontbox-2.0.27.jar
+++ /dev/null
diff --git a/fop/lib/servlet-2.2.jar b/fop/lib/servlet-2.2.jar
deleted file mode 100644
index 872854a43..000000000
--- a/fop/lib/servlet-2.2.jar
+++ /dev/null
diff --git a/fop/lib/xml-apis-1.4.01.jar b/fop/lib/xml-apis-1.4.01.jar
deleted file mode 100644
index 46733464f..000000000
--- a/fop/lib/xml-apis-1.4.01.jar
+++ /dev/null
diff --git a/fop/lib/xml-apis-ext-1.3.04.jar b/fop/lib/xml-apis-ext-1.3.04.jar
deleted file mode 100644
index a7869d68a..000000000
--- a/fop/lib/xml-apis-ext-1.3.04.jar
+++ /dev/null
diff --git a/fop/lib/xmlgraphics-commons-svn-trunk.jar b/fop/lib/xmlgraphics-commons-svn-trunk.jar
deleted file mode 100644
index 8c9b59232..000000000
--- a/fop/lib/xmlgraphics-commons-svn-trunk.jar
+++ /dev/null