Use util from maven.

Change-Id: Id161c77c7414b278876041fcd6a627444f5552bb
Depends-On: I579afbde086d5761fe3743b23f4655cb4ea5b8df
Reviewed-on: http://gerrit.dmdirc.com/3910
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

build.xml

@@ -92,6 +92,12 @@
         </jar>
     </target>
 
+    <target name="-bundle-util">
+        <jar destfile="${dist.jar}" update="true">
+            <zipfileset src="lib/main/util.jar" includes="com/dmdirc/**" />
+        </jar>
+    </target>
+
     <target name="-init-submodule-dependencies">
         <subant buildpath="modules/plugins" target="init-dependencies"/>
     </target>
@@ -99,6 +105,6 @@
     <target name="-pre-init" depends="-init-dependencies,-init-submodule-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,-bundle-dagger,-bundle-base64,-bundle-guava,-bundle-mbassador,-bundle-raven,-bundle-yamlreader"/>
+    <target name="-post-jar" depends="-update-bundled-plugins,-bundle-slf4j,-bundle-dagger,-bundle-base64,-bundle-guava,-bundle-mbassador,-bundle-raven,-bundle-yamlreader,-bundle-util"/>
 
 </project>

etc/ivy/ivysettings.xml

@@ -26,6 +26,6 @@
         <module organisation="net.sourceforge.fikin-ant-tasks" name="ant-fikin" resolver="packager"/>
         <module organisation="org.eclipse.jgit" name="*" resolver="jgit"/>
         <module organisation="net.miginfocom" name="*" resolver="dmdirc-thirdparty"/>
-        <module organisation="com.dmdirc" name="*" resolver="dmdirc-releases"/>
+        <module organisation="com.dmdirc" name="*" resolver="dmdirc-snapshots"/>
     </modules>
 </ivysettings>

ivy.xml

@@ -37,6 +37,7 @@
 
         <dependency org="com.google.guava" name="guava" rev="17.+" conf="bundled,main->default" />
         <dependency org="net.engio" name="mbassador" rev="1.1.10" conf="bundled,main->default" />
+        <dependency org="com.dmdirc" name="util" rev="latest.integration" conf="bundled,main->default" />
 
         <dependency org="junit" name="junit" rev="4.+" conf="test->default" />
         <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test->default" />

nbproject/build-impl.xml

@@ -67,14 +67,12 @@ is divided into following sections:
             <and>
                 <available file="${main.test.dir}"/>
                 <available file="${parser.test.dir}"/>
-                <available file="${util.test.dir}"/>
             </and>
         </condition>
         <condition property="have.sources">
             <and>
                 <available file="${main.src.dir}"/>
                 <available file="${parser.src.dir}"/>
-                <available file="${util.src.dir}"/>
             </and>
         </condition>
         <condition property="netbeans.home+have.tests">
@@ -127,8 +125,6 @@ is divided into following sections:
         <fail unless="main.test.dir">Must set main.test.dir</fail>
         <fail unless="parser.src.dir">Must set parser.src.dir</fail>
         <fail unless="parser.test.dir">Must set parser.test.dir</fail>
-        <fail unless="util.src.dir">Must set util.src.dir</fail>
-        <fail unless="util.test.dir">Must set util.test.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
         <fail unless="dist.dir">Must set dist.dir</fail>
         <fail unless="build.classes.dir">Must set build.classes.dir</fail>
@@ -149,7 +145,7 @@ is divided into following sections:
     </target>
     <target name="-init-macrodef-javac">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${util.src.dir}:${parser.src.dir}:${main.src.dir}" name="srcdir"/>
+            <attribute default="${parser.src.dir}:${main.src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${includes}" name="includes"/>
@@ -170,7 +166,7 @@ is divided into following sections:
             </sequential>
         </macrodef>
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${util.src.dir}:${parser.src.dir}:${main.src.dir}" name="srcdir"/>
+            <attribute default="${parser.src.dir}:${main.src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -216,9 +212,6 @@ is divided into following sections:
                         <fileset dir="${parser.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
-                        <fileset dir="${util.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
                     </batchtest>
                     <classpath>
                         <path path="${run.test.classpath}"/>
@@ -344,7 +337,6 @@ is divided into following sections:
         <copy todir="${build.classes.dir}">
             <fileset dir="${main.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${parser.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${util.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile">
@@ -359,7 +351,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${main.src.dir}:${parser.src.dir}:${util.src.dir}"/>
+        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${main.src.dir}:${parser.src.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -489,9 +481,6 @@ is divided into following sections:
             <fileset dir="${parser.src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${util.src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
         </javadoc>
     </target>
 
@@ -507,7 +496,7 @@ is divided into following sections:
 
     <target depends="init,-doccheck-check" name="-doccheck-build" if="doccheck.run">
         <mkdir dir="${doccheck.dir}"/>
-        <javadoc additionalparam="-doclet com.sun.tools.doclets.doccheck.DocCheck -docletpath ${doccheck.path} -skipPkg net.miginfocom.*" author="${javadoc.author}" destdir="${doccheck.dir}" failonerror="true" private="${javadoc.private}" source="${javac.source}" sourcepath="${main.src.dir}:${parser.src.dir}:${util.src.dir}" useexternalfile="true" version="${javadoc.version}">
+        <javadoc additionalparam="-doclet com.sun.tools.doclets.doccheck.DocCheck -docletpath ${doccheck.path} -skipPkg net.miginfocom.*" author="${javadoc.author}" destdir="${doccheck.dir}" failonerror="true" private="${javadoc.private}" source="${javac.source}" sourcepath="${main.src.dir}:${parser.src.dir}" useexternalfile="true" version="${javadoc.version}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
@@ -543,14 +532,13 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${util.test.dir}"/>
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}"/>
     </target>
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${util.test.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${main.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${parser.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${util.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-test">
@@ -565,11 +553,10 @@ is divided into following sections:
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${main.test.dir}:${parser.test.dir}:${util.test.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${util.test.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${main.test.dir}:${parser.test.dir}" srcdir="${main.test.dir}:${parser.test.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${main.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${parser.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${util.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-test-single">

nbproject/project.properties

@@ -111,8 +111,6 @@ main.src.dir=src
 main.test.dir=test
 parser.src.dir=modules/parser/src
 parser.test.dir=modules/parser/test
-util.src.dir=modules/util/src
-util.test.dir=modules/util/test
 
 # Classpaths
 # The plugin libraries are automatically added at compile time by the javac

nbproject/project.xml

@@ -8,12 +8,10 @@
             <source-roots>
                 <root id="main.src.dir" name="Main Source"/>
                 <root id="parser.src.dir" name="Parser Source"/>
-                <root id="util.src.dir" name="Utilities Source"/>
             </source-roots>
             <test-roots>
                 <root id="main.test.dir" name="Main Test Packages"/>
                 <root id="parser.test.dir" name="Parser Test Packages"/>
-                <root id="util.test.dir" name="Utilities Test Packages"/>
             </test-roots>
         </data>
         <junit-version xmlns="http://www.netbeans.org/ns/junit/1" value="junit4"/>