Merge branch 'master' into jdk8. Also added some major fixes whilst merging.

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	src/utils/lombok/javac/CommentCatcher.java
	src/utils/lombok/javac/Javac.java

1 files changed, 7 insertions, 13 deletions

diff --git a/build.xml b/build.xml
index 6f35e696..2ed0ba71 100644
--- a/build.xml
+++ b/build.xml
@@ -27,7 +27,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	
 	<property name="credentialsFile" value="google.properties" />
 	<property name="build.compiler" value="javac1.6" />
-	<property name="ivy.retrieve.pattern" value="lib/[conf]/[artifact].[ext]" />
+	<property name="ivy.retrieve.pattern" value="lib/[conf]/[organisation]-[artifact].[ext]" />
 	<available file="lib/ivyplusplus.jar" property="ivyplusplus.available" />
 	
 	<path id="build.path">
@@ -81,7 +81,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	
 	<target name="load-ipp" depends="download-ipp">
 		<taskdef classpath="lib/ivyplusplus.jar" resource="com/zwitserloot/ivyplusplus/antlib.xml" uri="antlib:com.zwitserloot.ivyplusplus" />
-		<ivy:ensureippversion version="1.7" property="ivyplusplus.minimumAvailable" />
+		<ivy:ensureippversion version="1.12" property="ivyplusplus.minimumAvailable" />
 	</target>
 	
 	<target name="redownload-ipp" unless="ivyplusplus.minimumAvailable">
@@ -147,6 +147,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		</ivy:compile>
 		<ivy:compile destdir="build/stubs" source="1.5" target="1.5" includeantruntime="false">
 			<src path="src/stubs" />
+			<src path="src/javac-only-stubs" />
 			<classpath location="build/stubsstubs" />
 		</ivy:compile>
 		
@@ -196,7 +197,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	<target name="dist" description="Builds THE lombok.jar file which contains everything." depends="version, compile">
 		<mkdir dir="dist" />
 		<copy file="doc/changelog.markdown" tofile="build/changelog.txt" />
-		<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/build/jarjar.jar" />
+		<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/build/com.googlecode.jarjar-jarjar.jar" />
 		<jarjar destfile="dist/lombok-${lombok.version}.jar">
 			<fileset dir="build/lombok">
 				<exclude name="com/sun/tools/javac/**"/>
@@ -255,7 +256,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	</target>
 	
 	<target name="eclipse" depends="deps, contrib" description="Creates eclipse project files and downloads all dependencies. Open this directory as project in eclipse after running this target.">
-		<ivy:eclipsegen>
+		<ivy:eclipsegen source="1.6">
 			<srcdir dir="src/core" />
 			<srcdir dir="src/utils" />
 			<srcdir dir="src/eclipseAgent" />
@@ -271,21 +272,14 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<settings>
 				<url url="http://projectlombok.org/downloads/lombok.eclipse.settings" />
 			</settings>
-			<apt location="lib/build/spi.jar" />
+			<apt location="lib/build/projectlombok.org-spi.jar" />
 		</ivy:eclipsegen>
 		
-		<condition property="startOnFirstThread" value="-XstartOnFirstThread" else="">
-			<os family="mac" />
-		</condition>
-		
 		<copy
 				file="buildScripts/eclipse-debug-target.template"
 				tofile="LombokizedEclipse.launch"
 				preservelastmodified="true"
 				overwrite="true">
-			<filterset>
-				<filter token="START_ON_FIRST_THREAD" value="${startOnFirstThread}" />
-			</filterset>
 		</copy>
 	</target>
 	
@@ -306,7 +300,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	</target>
 	
 	<target name="test-ecj" depends="dist, contrib" unless="tests.skip">
-		<java jar="lib/ecj/ecj.jar" fork="true" failonerror="true">
+		<java jar="lib/ecj/org.eclipse.custom-ecj.jar" fork="true" failonerror="true">
 			<jvmarg value="-javaagent:dist/lombok.jar=ecj" />
 			<arg value="-source" />
 			<arg value="1.6" />