Update to a version of lombok-pg built against latest lombok

Make build-properties include client libs as well as plugin libs
Go back to just using private.classpath instead of stupid references

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

build-properties.xml

@@ -25,7 +25,7 @@
     </target>
 
     <target name="-init-private-properties" depends="-create-private-properties,-check-private-classpath,-create-private-classpath">
-        <propertyregex property="private.classpath.value" input="${toString:plugins.libs}" regexp="\\" replace="/" global="true" defaultValue="${toString:plugins.libs}"/>
+        <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>
     

nbproject/build-impl.xml

@@ -26,10 +26,11 @@ is divided into following sections:
                 INITIALIZATION SECTION
                 ======================
             -->
-    <path id="plugins.libs">
+    <path id="all.libs">
+        <fileset dir="lib" includes="*.jar"/>
         <fileset dir="modules/plugins/lib" includes="*.jar"/>
     </path>
-    
+
     <property name="test_profile_dir" value="./test_profile"/>
     <target name="-pre-init">
         <!-- Empty placeholder for easier customization. -->
@@ -164,7 +165,7 @@ is divided into following sections:
             <element name="customize" optional="true"/>
             <sequential>
                 <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
-                    <classpath refid="plugins.libs"/>
+                    <classpath refid="all.libs"/>
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -182,7 +183,7 @@ is divided into following sections:
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
-                    <classpath refid="plugins.libs"/>
+                    <classpath refid="all.libs"/>
                 </depend>
             </sequential>
         </macrodef>
@@ -217,7 +218,7 @@ is divided into following sections:
                         <pathelement path="${clover.jar}"/>
                     </classpath>
                     <env key="DMDIRC_HOME" value="${test_profile_dir}"/>
-                    <classpath refid="plugins.libs"/>
+                    <classpath refid="all.libs"/>
                     <batchtest todir="${build.test.results.dir}">
                         <clover-optimized-testset>
                             <fileset dir="${main.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
@@ -262,7 +263,7 @@ is divided into following sections:
             <sequential>
                 <delete dir="${test_profile_dir}"/>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" timeout="120000">
-                    <classpath refid="plugins.libs"/>
+                    <classpath refid="all.libs"/>
                     <env key="DMDIRC_HOME" value="${test_profile_dir}"/>
                     <batchtest todir="${build.test.results.dir}">
                         <fileset dir="${main.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
@@ -303,7 +304,7 @@ is divided into following sections:
                 <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
                     <classpath>
                         <path path="@{classpath}"/>
-                        <path refid="plugins.libs"/>
+                        <path refid="all.libs"/>
                     </classpath>
                 </nbjpdastart>
             </sequential>
@@ -338,7 +339,7 @@ is divided into following sections:
             <element name="customize" optional="true"/>
             <sequential>
                 <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <classpath refid="plugins.libs"/>
+                    <classpath refid="all.libs"/>
                     <jvmarg line="${debug-args-line}"/>
                     <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
                     <jvmarg line="${run.jvmargs}"/>
@@ -360,7 +361,7 @@ is divided into following sections:
             <element name="customize" optional="true"/>
             <sequential>
                 <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <classpath refid="plugins.libs"/>
+                    <classpath refid="all.libs"/>
                     <jvmarg line="${run.jvmargs}"/>
                     <classpath>
                         <path path="${run.classpath}"/>
@@ -553,7 +554,7 @@ is divided into following sections:
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
-            <classpath refid="plugins.libs"/>
+            <classpath refid="all.libs"/>
             <fileset dir="${main.src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -585,7 +586,7 @@ is divided into following sections:
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
-            <classpath refid="plugins.libs"/>
+            <classpath refid="all.libs"/>
         </javadoc>
     </target>
 

nbproject/project.properties

@@ -2,42 +2,6 @@ annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=true
 annotation.processing.run.all.processors=true
 endorsed.classpath=
-file.reference.ant-contrib-1.0b3.jar=lib\\ant-contrib-1.0b3.jar
-file.reference.ant-contrib-1.0b3.jar-1=modules\\plugins\\lib\\ant-contrib-1.0b3.jar
-file.reference.asm-3.1.jar=lib\\asm-3.1.jar
-file.reference.checkstyle-5.3-all.jar=lib\\checkstyle-5.3-all.jar
-file.reference.cinch.jar=modules\\plugins\\lib\\cinch.jar
-file.reference.cinchsupport.jar=modules\\plugins\\lib\\cinchsupport.jar
-file.reference.clover.jar=lib\\clover.jar
-file.reference.commons-codec-1.3.jar=lib\\commons-codec-1.3.jar
-file.reference.commons-codec-1.3.jar-1=modules\\plugins\\lib\\commons-codec-1.3.jar
-file.reference.commons-httpclient-3.0-rc1.jar=lib\\commons-httpclient-3.0-rc1.jar
-file.reference.commons-lang-2.4.jar=modules\\plugins\\lib\\commons-lang-2.4.jar
-file.reference.commons-logging-1.0.3.jar=lib\\commons-logging-1.0.3.jar
-file.reference.fikin-ant-1.7.3.jar=lib\\fikin-ant-1.7.3.jar
-file.reference.findbugs-ant.jar=lib\\findbugs-ant.jar
-file.reference.httpcore.jar=modules\\plugins\\lib\\httpcore.jar
-file.reference.jaxen-1.1.1.jar=lib\\jaxen-1.1.1.jar
-file.reference.jetty-6.1.22.jar=modules\\plugins\\lib\\jetty-6.1.22.jar
-file.reference.jetty-util-6.1.22.jar=modules\\plugins\\lib\\jetty-util-6.1.22.jar
-file.reference.jml-1.0b4-full.jar=modules\\plugins\\lib\\jml-1.0b4-full.jar
-file.reference.jna.jar=modules\\plugins\\lib\\jna.jar
-file.reference.junit-4.8.1.jar=lib\\junit-4.8.1.jar
-file.reference.jxlayer.jar=modules\\plugins\\lib\\jxlayer.jar
-file.reference.lombok-pg-0.10.0.jar=lib\\lombok-pg-0.10.0.jar
-file.reference.lombok-pg-0.10.0.jar-1=modules\\plugins\\lib\\lombok-pg-0.10.0.jar
-file.reference.menuscroller.jar=modules\\plugins\\lib\\menuscroller.jar
-file.reference.miglayout-3.7.4-swing.jar=modules\\plugins\\lib\\miglayout-3.7.4-swing.jar
-file.reference.mockito-all-1.8.2.jar=lib\\mockito-all-1.8.2.jar
-file.reference.nsisant-1.3.jar=lib\\nsisant-1.3.jar
-file.reference.platform.jar=modules\\plugins\\lib\\platform.jar
-file.reference.pmd-4.2.5.jar=lib\\pmd-4.2.5.jar
-file.reference.servlet-api-2.5-20081211.jar=modules\\plugins\\lib\\servlet-api-2.5-20081211.jar
-file.reference.signpost-core-1.1-SNAPSHOT.jar=modules\\plugins\\lib\\signpost-core-1.1-SNAPSHOT.jar
-file.reference.smack.jar=modules\\plugins\\lib\\smack.jar
-file.reference.smackx.jar=modules\\plugins\\lib\\smackx.jar
-file.reference.uispec4j-2.2.jar=modules\\plugins\\lib\\uispec4j-2.2.jar
-file.reference.xercesImpl.jar=lib\\xercesImpl.jar
 javac.processorpath=\
     ${javac.classpath}
 jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
@@ -109,56 +73,16 @@ util.test.dir=modules/util/test
 # have the private.classpath variable that will be updated in dynamic.propeties
 # automatically by ant.
 javac.classpath=\
-    ${file.reference.lombok-pg-0.10.0.jar}:\
-    ${file.reference.ant-contrib-1.0b3.jar}:\
-    ${file.reference.asm-3.1.jar}:\
-    ${file.reference.checkstyle-5.3-all.jar}:\
-    ${file.reference.clover.jar}:\
-    ${file.reference.commons-codec-1.3.jar}:\
-    ${file.reference.commons-httpclient-3.0-rc1.jar}:\
-    ${file.reference.commons-logging-1.0.3.jar}:\
-    ${file.reference.fikin-ant-1.7.3.jar}:\
-    ${file.reference.findbugs-ant.jar}:\
-    ${file.reference.jaxen-1.1.1.jar}:\
-    ${file.reference.junit-4.8.1.jar}:\
-    ${file.reference.lombok-pg-0.10.0.jar}:\
-    ${file.reference.mockito-all-1.8.2.jar}:\
-    ${file.reference.nsisant-1.3.jar}:\
-    ${file.reference.pmd-4.2.5.jar}:\
-    ${file.reference.xercesImpl.jar}:\
-    ${file.reference.ant-contrib-1.0b3.jar-1}:\
-    ${file.reference.commons-codec-1.3.jar-1}:\
-    ${file.reference.commons-lang-2.4.jar}:\
-    ${file.reference.httpcore.jar}:\
-    ${file.reference.jetty-6.1.22.jar}:\
-    ${file.reference.jetty-util-6.1.22.jar}:\
-    ${file.reference.jml-1.0b4-full.jar}:\
-    ${file.reference.jna.jar}:\
-    ${file.reference.jxlayer.jar}:\
-    ${file.reference.lombok-pg-0.10.0.jar-1}:\
-    ${file.reference.menuscroller.jar}:\
-    ${file.reference.miglayout-3.7.4-swing.jar}:\
-    ${file.reference.platform.jar}:\
-    ${file.reference.servlet-api-2.5-20081211.jar}:\
-    ${file.reference.signpost-core-1.1-SNAPSHOT.jar}:\
-    ${file.reference.smack.jar}:\
-    ${file.reference.smackx.jar}:\
-    ${file.reference.uispec4j-2.2.jar}:\
-    ${file.reference.cinch.jar}:\
-    ${file.reference.cinchsupport.jar}
+    ${private.classpath}
 javac.test.classpath=\
     ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${file.reference.junit-4.8.1.jar}:\
-    ${file.reference.mockito-all-1.8.2.jar}
+    ${build.classes.dir}
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}:\
-    ${file.reference.junit-4.8.1.jar}:\
-    ${file.reference.mockito-all-1.8.2.jar}
 debug.classpath=\
     ${run.classpath}
 debug.test.classpath=\