Update lombok-pg, grab it from sonatype

Fix weird line endings

Change-Id: I01b623b71b33e50ee4017369a403bcf355066892
Reviewed-on: http://gerrit.dmdirc.com/2416
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

etc/ivy/ivysettings.xml

@@ -1,31 +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>
+<ivysettings>
+    <settings defaultResolver="default"/>
+    <resolvers>
+        <ibiblio name="default" m2compatible="true"/>
+
+        <ibiblio name="jgit" root="http://download.eclipse.org/jgit/maven" m2compatible="true"/>
+
+        <ibiblio name="sonatype" root="https://oss.sonatype.org/content/repositories/snapshots/" 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"/>
+        <module organisation="com.github.peichhorn" name="*" resolver="sonatype"/>
+    </modules>
+</ivysettings>

ivy.xml

@@ -1,31 +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>
+<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.8-SNAPSHOT" 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>