Use Ivy instead of a bajillion jars

Change-Id: Ib6de50728ca8beba69cb4f49441b15e1ecc39558
Reviewed-on: http://gerrit.dmdirc.com/2389
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

build-installer.xml

@@ -2,17 +2,19 @@
 <project name="DMDirc-installer" default="default" basedir=".">
     <description>Tasks to build the DMDirc installer.</description>
 
-    <taskdef name="nsis" classname="com.danielreese.nsisant.Task">
-        <classpath location="lib/nsisant-1.3.jar" />
-    </taskdef>
+    <target name="-init-installer">
+        <taskdef name="nsis" classname="com.danielreese.nsisant.Task">
+            <classpath location="lib/nsisant-1.3.jar" />
+        </taskdef>
 
-    <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask">
-        <classpath>
-            <fileset dir="lib" includes="*jgit*.jar"/>
-        </classpath>
-    </taskdef>
+        <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask">
+            <classpath>
+                <fileset dir="lib" includes="*jgit*.jar"/>
+           </classpath>
+        </taskdef>
+    </target>
 
-    <target name="installer"
+    <target name="installer" depends="-init-installer"
             description="Build the installer.">
         <exec executable="bash" dir="modules/installer" resultproperty="installer.result">
             <arg value="makeAll.sh"/>
@@ -28,7 +30,7 @@
         <echo message=""/>
     </target>
 
-    <target name="installer-stable"
+    <target name="installer-stable" depends="-init-installer"
             description="Build the installer for a stable release.">
         <exec executable="bash" dir="modules/installer" resultproperty="installer.result">
             <arg value="makeAll.sh"/>
@@ -47,7 +49,7 @@
         <echo message=""/>
     </target>
 
-    <target name="installer-unstable"
+    <target name="installer-unstable" depends="-init-installer"
             description="Build the installer for an unstable release.">
         <exec executable="bash" dir="modules/installer" resultproperty="installer.result">
             <arg value="release.sh"/>
@@ -66,7 +68,7 @@
     </target>
 
     <target name="installer-nsis" description="Builds the Windows installer"
-        depends="jar">
+        depends="-init-installer,jar">
        <git-describe dir="modules/installer/.git" property="version.git.nsis" subdir="windows" />
 
         <mkdir dir="modules\installer\windows\files\" />

build-ivy.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-ivy" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+    <description>Ivy utilities for DMDirc</description>
+    
+    <property name="ivy.install.version" value="2.2.0"/>
+    <property name="ivy.cache.ttl.default" value="7d"/>
+    
+    <target name="-init-ivy">
+        <mkdir dir="lib"/>
+        <path id="ivy.classpath">
+           <fileset dir="lib" includes="*.jar"/>
+        </path>
+
+        <available classname="org.apache.ivy.ant.IvyConfigure" 
+              property="ivy.available" classpathref="ivy.classpath" />
+    </target>
+          
+    <target name="-download-ivy" depends="-init-ivy" unless="ivy.available">
+        <echo message="Retrieving Ivy"/>
+        <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+             dest="lib/ivy-${ivy.install.version}.jar"/>
+    </target>
+    
+    <target name="-init-dependencies" depends="-download-ivy">
+        <!-- Regenerate the classpath as we may have just downloaded Ivy -->
+        <path id="ivy.classpath">
+            <fileset dir="lib" includes="*.jar"/>
+        </path>
+        
+        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.classpath"/>
+        <ivy:settings file="etc/ivy/ivysettings.xml"/>
+        <ivy:retrieve symlink="true" pattern="lib/[artifact]-[revision].[ext]" />
+    </target>
+</project>

build-parsers.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-parsers" default="default" basedir=".">
+
+    <target name="build-parsers" description="Build all parsers">
+        <subant buildpath="modules/parser" target="jar"/>
+    </target>
+
+    <target name="clean-parsers" description="Clean parsers">
+        <subant buildpath="modules/parser" target="clean"/>
+    </target>
+
+</project>

build-plugins.xml

@@ -8,12 +8,14 @@
 
     <import file="modules/plugins/build-pluginutils.xml"/>
 
-    <path id="libclasspath">
-        <fileset dir="lib" includes="*.jar"/>
-    </path>
+    <target name="-init-plugins">
+        <path id="libclasspath">
+            <fileset dir="lib" includes="*.jar"/>
+        </path>
 
-    <taskdef resource="net/sf/fikin/ant/ant.properties" classpathref="libclasspath"/>
-    <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="libclasspath"/>
+        <taskdef resource="net/sf/fikin/ant/ant.properties" classpathref="libclasspath"/>
+        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="libclasspath"/>
+    </target>
 
     <target name="build-plugins" description="Build all plugins">
         <subant buildpath="modules/plugins" target="jar">
@@ -21,7 +23,11 @@
         </subant>
     </target>
 
-    <target name="-update-bundled-plugins">
+    <target name="clean-plugins" description="Clean all plugins">
+        <subant buildpath="modules/plugins" target="clean"/>
+    </target>
+
+    <target name="-update-bundled-plugins" depends="-init-plugins">
         <bundleplugins jar="${dist.jar}">
             <fileset dir="modules/plugins/dist/">
                 <include name="tabcompletion_*.jar"/>
@@ -51,7 +57,7 @@
     </target>
 
     <target name="publish-all-plugins" description="Publishes all plugins to the addons site"
-            depends="-check-addons-key,-check-addon-channel">
+            depends="-init-plugins,-check-addons-key,-check-addon-channel">
       <foreach target="publish-plugin" param="addon.file" inheritall="true" parallel="true">
         <path>
           <fileset dir="plugins">
@@ -62,7 +68,7 @@
     </target>
 
     <target name="publish-plugin" description="Publish a plugin to the addons site"
-            depends="-check-addons-key,-check-addon-channel,-check-addon-file">
+            depends="-init-plugins,-check-addons-key,-check-addon-channel,-check-addon-file">
       <tempfile property="temp.dir" prefix="plugintmp"/>
       <mkdir dir="${temp.dir}"/>
       <unzip src="${addon.file}" dest="${temp.dir}">
@@ -85,7 +91,7 @@
     </target>
     
     <target name="publish-addon" description="Publish an addon to the addons site"
-            depends="-check-addons-key,-check-addon-id,-check-addon-channel,-check-addon-file">
+            depends="-init-plugins,-check-addons-key,-check-addon-id,-check-addon-channel,-check-addon-file">
        <httpmpost url="http://addons.dmdirc.com/editaddon/${addon.id}" logLevel="none">
            <postString name="apikey" value="${dmdirc.addons.apikey}"/>
            <postString name="channel" value="${addon.channel}"/>

build-properties.xml

@@ -5,6 +5,15 @@
     <condition property="private.properties.exists">
         <available file="nbproject/private/private.properties"/>
     </condition>
+
+    <target name="-init-properties">
+        <path id="libclasspath">
+            <fileset dir="lib" includes="*.jar"/>
+        </path>
+
+        <taskdef resource="net/sf/fikin/ant/ant.properties" classpathref="libclasspath"/>
+        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="libclasspath"/>
+    </target>
     
     <target name="-create-private-properties" unless="private.properties.exists">
         <mkdir dir="nbproject/private"/>
@@ -24,7 +33,7 @@
         <echo append="true" file="nbproject/private/private.properties">${line.separator}private.classpath=${line.separator}</echo>
     </target>
 
-    <target name="-init-private-properties" depends="-create-private-properties,-check-private-classpath,-create-private-classpath">
+    <target name="-init-private-properties" depends="-init-properties,-create-private-properties,-check-private-classpath,-create-private-classpath">
         <propertyregex property="private.classpath.value" input="${toString:all.libs}" regexp="\\" replace="/" global="true" defaultValue="${toString:all.libs}"/>
         <replaceregexp file="nbproject/private/private.properties" match="^private.classpath=(.*)$" flags="im" replace="private.classpath=${private.classpath.value}"/>
     </target>

build-reports.xml

@@ -12,8 +12,32 @@
     <target name="-allreports" depends="findbugs, cpd, pmd, checkstyle" /> 
     <target name="-mostreports" depends="cpd, pmd, checkstyle" /> 
 
-    <target name="-init-checkstyle">
-        <taskdef resource="checkstyletask.properties" classpath="lib/checkstyle-5.3-all.jar"/>
+    <target name="-init-checkstyle" depends="-init-dependencies">
+        <path id="libclasspath">
+            <fileset dir="lib" includes="*.jar"/>
+        </path>
+        <taskdef resource="checkstyletask.properties" classpathref="libclasspath"/>
+    </target>
+
+    <target name="-init-pmd" depends="-init-dependencies">
+        <path id="libclasspath">
+            <fileset dir="lib" includes="*.jar"/>
+        </path>
+        <taskdef name="pmd" classpathref="libclasspath" classname="net.sourceforge.pmd.ant.PMDTask" />
+    </target>
+
+    <target name="-init-cpd" depends="-init-dependencies">
+        <path id="libclasspath">
+            <fileset dir="lib" includes="*.jar"/>
+        </path>
+        <taskdef name="cpd" classpathref="libclasspath" classname="net.sourceforge.pmd.cpd.CPDTask" />
+    </target>
+
+    <target name="-init-findbugs" depends="-init-dependencies">
+        <path id="libclasspath">
+            <fileset dir="lib" includes="*.jar"/>
+        </path>
+        <taskdef name="findbugs" classpathref="libclasspath" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" />
     </target>
     
     <target name="checkstyle-all" depends="-init-checkstyle">
@@ -32,11 +56,8 @@
         <copy file="checkstyle/sorttable.js" tofile="reports/sorttable.js"/>
     </target>
     
-    <target name="pmd" description="Run PMD.">
-        <taskdef name="pmd" classpath="lib/pmd-4.2.5.jar:lib/jaxen-1.1.1.jar:lib/asm-3.1.jar"
-                         classname="net.sourceforge.pmd.ant.PMDTask" />
+    <target name="pmd" description="Run PMD." depends="-init-pmd">
         <pmd shortFilenames="true">
-            
             <ruleset>checkstyle/pmd_checks.xml</ruleset>
             <formatter type="xml" toFile="reports/report-pmd.xml" linkPrefix="http://pmd.sourceforge.net/xref/"/>
             <fileset dir="src/" includes="com/dmdirc/**/*.java" />
@@ -47,11 +68,8 @@
         <xslt in="reports/report-pmd.xml" style="checkstyle/pmd.xslt" out="reports/report-pmd.html" />
     </target>
 
-    <target name="pmd-minimal" description="Run PMD with minimal ruleset.">
-        <taskdef name="pmd" classpath="lib/pmd-4.2.5.jar:lib/jaxen-1.1.1.jar:lib/asm-3.1.jar"
-                         classname="net.sourceforge.pmd.ant.PMDTask" />
+    <target name="pmd-minimal" description="Run PMD with minimal ruleset." depends="-init-pmd">
         <pmd shortFilenames="true">
-
             <ruleset>checkstyle/pmd_minimal.xml</ruleset>
             <formatter type="xml" toFile="reports/report-pmd.xml" linkPrefix="http://pmd.sourceforge.net/xref/"/>
             <fileset dir="src/" includes="com/dmdirc/**/*.java" />
@@ -62,9 +80,7 @@
         <xslt in="reports/report-pmd.xml" style="checkstyle/pmd.xslt" out="reports/report-pmd.html" />
     </target>
     
-    <target name="cpd" description="Run CPD.">
-        <taskdef name="cpd" classpath="lib/pmd-4.2.5.jar:lib/jaxen-1.1.1.jar:lib/asm-3.1.jar" classname="net.sourceforge.pmd.cpd.CPDTask" />
-        
+    <target name="cpd" description="Run CPD." depends="-init-cpd">
         <cpd format="xml" minimumTokenCount="50" outputFile="reports/report-cpd.xml">
             <fileset dir="src/com/">
                 <include name="**/*.java"/>
@@ -73,9 +89,8 @@
         <xslt in="reports/report-cpd.xml" style="checkstyle/cpd.xslt" out="reports/report-cpd.html" />
     </target>
     
-    <target name="findbugs" depends="jar" description="Run Findbugs.">
+    <target name="findbugs" depends="-init-findbugs,jar" description="Run Findbugs.">
         <mkdir dir="reports/findbugs" />
-        <taskdef name="findbugs" classpath="lib/findbugs-ant.jar" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" />
         <findbugs home="/usr/share/java/findbugs/" effort="max"
                             jvmargs="-Xmx512M"
                             output="xml:withMessages"

build-versioning.xml

@@ -9,9 +9,12 @@
     <property name="modealiases.target" value="${defaults.output}modealiases/generic"/>
 
     <available file=".git" property="is.git"/>
-    <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="libclasspath"/>
 
-    <target name="-write-version" depends="-write-version-header, -add-version, -write-updater, -write-identities, -write-disable-updates"/>
+    <target name="-init-version">
+        <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="libclasspath"/>
+    </target>
+
+    <target name="-write-version" depends="-init-version, -write-version-header, -add-version, -write-updater, -write-identities, -write-disable-updates"/>
 
     <target name="-write-version-header">
         <echo file="${version.config}"># This is a DMDirc configuration file automatically generated by

build.xml

@@ -9,6 +9,7 @@
     <import file="build-tests.xml"/>
     <import file="build-versioning.xml"/>
     <import file="build-properties.xml"/>
+    <import file="build-ivy.xml"/>
 
     <target name="init-private">
         <echo>Downloading private files, if this fails please pass username and</echo>
@@ -48,7 +49,7 @@
         </jar>
     </target>
 
-    <target name="-pre-init" depends="-init-private-properties"/>
+    <target name="-pre-init" depends="-init-dependencies,-init-private-properties"/>
     <target name="-post-compile" depends="-write-version, build-plugins"/>
     <target name="-post-test-run" depends="-do-test-reports"/>
     <target name="-post-jar" depends="-update-bundled-plugins,-bundle-slf4j"/>

etc/ivy/ant-fikin/ivy.xml

@@ -0,0 +1,6 @@
+<ivy-module version="2.0">
+    <info organisation="net.sourceforge.fikin-ant-tasks" module="ant-fikin"/>
+    <dependencies>
+        <dependency org="commons-httpclient" name="commons-httpclient" rev="3.1" conf="default" />
+    </dependencies>
+</ivy-module>

etc/ivy/ant-fikin/packager.xml

@@ -0,0 +1,9 @@
+<packager-module version="1.0">
+    <property name="name" value="${ivy.packager.module}"/>
+    <property name="version" value="${ivy.packager.revision}"/>
+
+    <resource dest="archive" url="http://sourceforge.net/projects/fikin-ant-tasks/files/fikin-ant-tasks/${version}%20release/fikin-ant-${version}-bin.tar.gz/download" sha1="e7677de1feae55d8d4bd27cb562f9d84d7386204" type="tar.gz"/>
+    <build>
+        <move file="archive/fikin-ant-${version}/fikin-ant-${version}.jar" tofile="artifacts/jars/${name}.jar"/>
+    </build>
+</packager-module>

etc/ivy/ivysettings.xml

@@ -0,0 +1,31 @@
+<ivysettings>
+    <settings defaultResolver="default"/>
+    <resolvers>
+        <chain name="default">
+            <ibiblio name="dmdirc" root="http://archiva.dmdirc.com/archiva/repository/public/" m2compatible="true"/>
+            <ibiblio name="central" m2compatible="true"/>
+        </chain>
+
+        <ibiblio name="jgit" root="http://download.eclipse.org/jgit/maven" m2compatible="true"/>
+
+        <url name="ant-nsis">
+            <artifact pattern="http://cloud.github.com/downloads/dreese/nsis-ant/nsisant-[revision].jar"/>
+        </url>
+
+        <url name="jgit-describe">
+            <ivy pattern="file:///${basedir}/etc/ivy/[module]/ivy.xml"/>
+            <artifact pattern="http://shanemcc.github.com/jgit-describe/releases/jgit-describe-[revision].jar"/>
+        </url>
+
+        <packager name="packager" buildRoot="${user.home}/.ivy2/packager/build" resourceCache="${user.home}/.ivy2/packager/cache" preserveBuildDirectories="true">
+            <ivy pattern="file:///${basedir}/etc/ivy/[module]/ivy.xml"/>
+            <artifact pattern="file:///${basedir}/etc/ivy/[module]/packager.xml"/>
+        </packager>
+    </resolvers>
+    <modules>
+        <module organisation="org.sourceforce.ant-nsis" name="ant-nsis" resolver="ant-nsis"/>
+        <module organisation="com.github.shanemcc" name="jgit-describe" resolver="jgit-describe"/>
+        <module organisation="net.sourceforge.fikin-ant-tasks" name="ant-fikin" resolver="packager"/>
+        <module organisation="org.eclipse.jgit" name="*" resolver="jgit"/>
+    </modules>
+</ivysettings>

etc/ivy/jgit-describe/ivy.xml

@@ -0,0 +1,6 @@
+<ivy-module version="2.0">
+    <info organisation="com.github.shanemcc" module="jgit-describe"/>
+    <dependencies>
+        <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="latest.integration" conf="default" />
+    </dependencies>
+</ivy-module>

ivy.xml

@@ -0,0 +1,31 @@
+<ivy-module version="2.0">
+    <info organisation="com.dmdirc" module="client"/>
+
+    <configurations>
+        <conf name="build" description="Everything needed to support the build process"/>
+        <conf name="compile" description="Everything needed to compile DMDirc separately"/>
+        <conf name="test" description="Everything needed to test DMDirc"/>
+        <conf name="default" extends="build,compile,test"/>
+    </configurations>
+
+    <dependencies>
+        <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="build->default" />
+        <dependency org="org.sourceforce.ant-nsis" name="ant-nsis" rev="1.3" conf="build->default" />
+        <dependency org="com.github.shanemcc" name="jgit-describe" rev="0.1" conf="build->default" />
+        <dependency org="net.sourceforge.fikin-ant-tasks" name="ant-fikin" rev="1.7.3" conf="build->default" />
+
+        <dependency org="org.slf4j" name="slf4j-api" rev="1.6.+" conf="compile->default" />
+        <dependency org="ch.qos.logback" name="logback-classic" rev="1.+" conf="test->default" />
+
+        <dependency org="com.github.peichhorn" name="lombok-pg" rev="0.10.6-DMDirc" conf="compile->default" />
+        
+        <dependency org="pmd" name="pmd" rev="4.+" conf="test->default" />
+        <dependency org="junit" name="junit" rev="4.+" conf="test->default" />
+        <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test->default" />
+        <dependency org="com.cenqua.clover" name="clover" rev="3.+" conf="test->default" />
+        <dependency org="com.puppycrawl.tools" name="checkstyle" rev="5.+" conf="test->default" />
+        <dependency org="net.sourceforge.findbugs" name="findbugs-ant" rev="1.+" conf="test->default" />
+
+        <exclude org="ant" module="ant"/>
+    </dependencies>
+</ivy-module>