Add ant files to publish to maven

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

build-ivy.xml

@@ -27,6 +27,9 @@
     <target name="-init-dependencies" depends="-download-ivy" unless="ivy.done">
         <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="lib.classpath"/>
         <ivy:settings file="etc/ivy/ivysettings.xml"/>
+        <ivy:resolve file="ivy.common.xml" />
+        <ivy:retrieve symlink="true" pattern="lib/[artifact]-[revision].[ext]" />
+        <ivy:resolve file="ivy.irc.xml" />
         <ivy:retrieve symlink="true" pattern="lib/[artifact]-[revision].[ext]" />
         <pathconvert property="lib.classpath.computed" dirsep="/" pathsep=":">
             <path>

build-publish.xml

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-Publish" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+    <description>Publish artifacts for DMDirc</description>
+
+    <available file="${git.dir}" property="is.git" />
+
+    <target name="-init-version">
+        <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="lib.classpath"/>
+    </target>
+
+    <target name="-get-git-version" depends="-init-version" if="is.git">
+        <git-describe dir="${git.dir}" property="parsers.version.main" subdir="${basedir}/${src.dir}/com/dmdirc/parser/common/;${basedir}/${src.dir}/com/dmdirc/parser/interfaces/" />
+        <git-describe dir="${git.dir}" property="parsers.version.irc" subdir="${basedir}/${src.dir}/com/dmdirc/parser/irc/" />
+    </target>
+
+    <target name="-publish-release" depends="-get-git-version">
+        <tstamp>
+            <format property="timestamp" pattern="yyyyddMM" />
+        </tstamp>
+        <ivy:resolve file="ivy.common.xml"/>
+        <ivy:deliver deliverpattern="${build.dir}/ivy.common.xml" pubrevision="${parsers.version.main}" />
+        <ivy:makepom ivyfile="${build.dir}/ivy.common.xml" pomfile="dist/parser.common.pom">
+            <mapping conf="default" scope="compile"/>
+        </ivy:makepom>
+        <ivy:retrieve/>
+        <ivy:publish
+            pubrevision="${parsers.version.main}"
+            status="release"
+            overwrite="true"
+            publishivy="false"
+            artifactspattern="dist/parser.common.[ext]"
+            resolver="upload-release"/>
+
+        <ivy:resolve file="ivy.irc.xml"/>
+        <ivy:deliver deliverpattern="${build.dir}/ivy.irc.xml" pubrevision="${parsers.version.irc}" />
+        <ivy:makepom ivyfile="${build.dir}/ivy.irc.xml" pomfile="dist/parser.irc.pom">
+            <mapping conf="default" scope="compile"/>
+            <dependency group="com.dmdirc.parser" artifact="common" version="${parsers.version.main}"/>
+        </ivy:makepom>
+        <ivy:retrieve/>
+        <ivy:publish
+            pubrevision="${parsers.version.irc}"
+            status="release"
+            overwrite="true"
+            publishivy="false"
+            artifactspattern="dist/parser.irc.[ext]"
+            resolver="upload-release"/>
+    </target>
+
+    <target name="-publish-nightlies" depends="-get-git-version">
+        <tstamp>
+            <format property="timestamp" pattern="yyyyddMM" />
+        </tstamp>
+        <ivy:resolve file="ivy.common.xml"/>
+        <ivy:deliver deliverpattern="${build.dir}/ivy.common.xml" pubrevision="Nightly-${timestamp}_${parsers.version.main}" />
+        <ivy:makepom ivyfile="${build.dir}/ivy.common.xml" pomfile="dist/parser.common.pom">
+            <mapping conf="default" scope="compile"/>
+        </ivy:makepom>
+        <ivy:retrieve/>
+        <ivy:publish
+            pubrevision="Nightly-${timestamp}_${parsers.version.main}"
+            status="release"
+            overwrite="true"
+            publishivy="false"
+            artifactspattern="dist/parser.common.[ext]"
+            resolver="upload-nightlies"/>
+
+        <ivy:resolve file="ivy.irc.xml"/>
+        <ivy:deliver deliverpattern="${build.dir}/ivy.irc.xml" pubrevision="Nightly-${timestamp}_${parsers.version.irc}" />
+        <ivy:makepom ivyfile="${build.dir}/ivy.irc.xml" pomfile="dist/parser.irc.pom">
+            <mapping conf="default" scope="compile"/>
+            <dependency group="com.dmdirc.parser" artifact="common" version="Nightly-${timestamp}_${parsers.version.main}"/>
+        </ivy:makepom>
+        <ivy:retrieve/>
+        <ivy:publish
+            pubrevision="Nightly-${timestamp}_${parsers.version.irc}"
+            status="release"
+            overwrite="true"
+            publishivy="false"
+            artifactspattern="dist/parser.irc.[ext]"
+            resolver="upload-nightlies"/>
+    </target>
+
+
+    <target name="-publish-snapshot" depends="-get-git-version">
+        <tstamp>
+            <format property="timestamp" pattern="yyyyddMM" />
+        </tstamp>
+        <ivy:resolve file="ivy.common.xml"/>
+        <ivy:deliver deliverpattern="${build.dir}/ivy.common.xml" pubrevision="${parsers.version.main}-SNAPSHOT" />
+        <ivy:makepom ivyfile="${build.dir}/ivy.common.xml" pomfile="dist/parser.common.pom">
+            <mapping conf="default" scope="compile"/>
+        </ivy:makepom>
+        <ivy:retrieve/>
+        <ivy:publish
+            pubrevision="${parsers.version.main}-SNAPSHOT"
+            status="release"
+            overwrite="true"
+            publishivy="false"
+            artifactspattern="dist/parser.common.[ext]"
+            resolver="upload-snapshot"/>
+
+        <ivy:resolve file="ivy.irc.xml"/>
+        <ivy:deliver deliverpattern="${build.dir}/ivy.irc.xml" pubrevision="${parsers.version.irc}-SNAPSHOT" />
+        <ivy:makepom ivyfile="${build.dir}/ivy.irc.xml" pomfile="dist/parser.irc.pom">
+            <mapping conf="default" scope="compile"/>
+            <dependency group="com.dmdirc.parser" artifact="common" version="${parsers.version.main}-SNAPSHOT"/>
+        </ivy:makepom>
+        <ivy:retrieve/>
+        <ivy:publish
+            pubrevision="${parsers.version.irc}-SNAPSHOT"
+            status="release"
+            overwrite="true"
+            publishivy="false"
+            artifactspattern="dist/parser.irc.[ext]"
+            resolver="upload-snapshot"/>
+    </target>
+</project>

build-versioning.xml

@@ -2,7 +2,7 @@
 <project name="DMDirc-versioning" default="default" basedir=".">
     <description>Adds automatic versioning information to DMDirc</description>
 
-    <available file=".git" property="is.git"/>
+    <available file="${git.dir}" property="is.git"/>
 
     <target name="-init-version">
         <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="lib.classpath"/>
@@ -11,8 +11,8 @@
     <target name="-add-version" depends="-init-version, -add-git-version" />
 
     <target name="-add-git-version" if="is.git">
-       <git-describe dir=".git" property="parsers.version.main" subdir="${src.dir}/com/dmdirc/parser/common/;${src.dir}/com/dmdirc/parser/interfaces/" />
-       <git-describe dir=".git" property="parsers.version.irc" subdir="${src.dir}/com/dmdirc/parser/irc/" />
+       <git-describe dir="${git.dir}" property="parsers.version.main" subdir="${basedir}/${src.dir}/com/dmdirc/parser/common/;${basedir}/${src.dir}/com/dmdirc/parser/interfaces/" />
+       <git-describe dir="${git.dir}" property="parsers.version.irc" subdir="${basedir}/${src.dir}/com/dmdirc/parser/irc/" />
     </target>
 
 </project>

build.xml

@@ -5,6 +5,9 @@
     <import file="nbproject/build-impl.xml"/>
     <import file="build-ivy.xml"/>
     <import file="build-versioning.xml"/>
+    <import file="build-publish.xml"/>
+
+    <property name="git.dir" value=".git"/>
 
     <target name="-pre-init" depends="-init-dependencies"/>
     <target name="-post-compile" depends="-add-version"/>
@@ -35,4 +38,6 @@
     <target name="-post-test-run">
         <delete file="${manifest.file}"/>
     </target>
+    <target name="publish-nightlies" depends="clean, jar, -publish-nightlies" />
+    <target name="publish-release" depends="clean, jar, -publish-release" />
 </project>

etc/ivy/ivysettings.xml

@@ -1,17 +1,10 @@
 <ivysettings>
     <settings defaultResolver="default"/>
+    <credentials host="nexus.dmdirc.com" realm="Sonatype Nexus Repository Manager" username="${username}" passwd="${password}"/>
     <resolvers>
-        <ibiblio name="default" m2compatible="true"/>
-
-        <ibiblio name="jgit" root="http://download.eclipse.org/jgit/maven" m2compatible="true"/>
-
-        <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>
+        <ibiblio name="default" root="http://nexus.dmdirc.com/nexus/content/groups/public" m2compatible="true"/>
+        <ibiblio name="upload-snapshot" root="http://nexus.dmdirc.com/nexus/content/repositories/snapshots" m2compatible="true" />
+        <ibiblio name="upload-nightlies" root="http://nexus.dmdirc.com/nexus/content/repositories/nightlies" m2compatible="true" />
+        <ibiblio name="upload-release" root="http://nexus.dmdirc.com/nexus/content/repositories/releases" m2compatible="true" />
     </resolvers>
-    <modules>
-        <module organisation="com.github.shanemcc" name="jgit-describe" resolver="jgit-describe"/>
-        <module organisation="org.eclipse.jgit" name="*" resolver="jgit"/>
-    </modules>
 </ivysettings>

etc/ivy/jgit-describe/ivy.xml

@@ -1,6 +0,0 @@
-<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.common.xml

@@ -0,0 +1,23 @@
+<ivy-module version="2.0">
+    <info organisation="com.dmdirc.parser" module="common"/>
+
+    <configurations>
+        <conf name="build" description="Everything needed to build"/>
+        <conf name="compile" description="Everything needed to compile"/>
+        <conf name="test" description="Everything needed to test"/>
+        <conf name="default" extends="build,compile,test"/>
+    </configurations>
+
+    <publications>
+        <artifact type="jar" ext="jar" conf="default"/>
+        <artifact type="pom" ext="pom" conf="default"/>
+    </publications>
+
+    <dependencies defaultconfmapping="*->default">
+        <dependency org="com.github.shanemcc" name="jgit-describe" rev="0.2" conf="build" />
+        <dependency org="junit" name="junit" rev="4.+" conf="test" />
+        <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test" />
+
+        <exclude org="ant" module="ant"/>
+    </dependencies>
+</ivy-module>

ivy.xml → ivy.irc.xml

@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="com.dmdirc" module="utils"/>
+    <info organisation="com.dmdirc.parser" module="irc"/>
 
     <configurations>
         <conf name="build" description="Everything needed to build"/>
@@ -8,6 +8,11 @@
         <conf name="default" extends="build,compile,test"/>
     </configurations>
 
+    <publications>
+        <artifact type="jar" ext="jar" conf="default"/>
+        <artifact type="pom" ext="pom" conf="default"/>
+    </publications>
+
     <dependencies defaultconfmapping="*->default">
         <dependency org="com.github.shanemcc" name="jgit-describe" rev="0.3" conf="build" />
         <dependency org="junit" name="junit" rev="4.+" conf="test" />