Merge branch 'master' of git@github.com:rzwitserloot/lombok

32 files changed, 391 insertions, 168 deletions

diff --git a/.gitignore b/.gitignore
index c6194f44..5eae78c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@ ivyCache
 google.properties
 debug
 LombokizedEclipse.launch
-libertad-upload.key
+escudo-upload.key
 findbugsReport.html
 lib
 .settings
@@ -14,4 +14,4 @@ lib
 .factorypath
 lombok.iml
 .idea
-*.markdown.html
\ No newline at end of file
+*.markdown.html
diff --git a/build.xml b/build.xml
index d1d4146e..676c34d7 100644
--- a/build.xml
+++ b/build.xml
@@ -164,12 +164,15 @@ 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" />
-		<jar destfile="dist/lombok-${lombok.version}.jar">
+		<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/build/jarjar.jar" />
+		<jarjar destfile="dist/lombok-${lombok.version}.jar">
 			<fileset dir="build/lombok">
 				<exclude name="com/sun/**"/>
 			</fileset>
 			<fileset dir="build" includes="changelog.txt" />
 			<fileset dir="." includes="LICENSE" />
+			<rule pattern="com.zwitserloot.cmdreader.**" result="lombok.libs.com.zwitserloot.cmdreader.@1" />
+			<rule pattern="org.objectweb.asm.**" result="lombok.libs.org.objectweb.asm.@1" />
 			<manifest>
 				<attribute name="Premain-Class" value="lombok.core.Agent" />
 				<attribute name="Agent-Class" value="lombok.core.Agent" />
@@ -177,7 +180,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 				<attribute name="Main-Class" value="lombok.core.Main" />
 				<attribute name="Lombok-Version" value="${lombok.version}" />
 			</manifest>
-		</jar>
+		</jarjar>
 		<copy file="dist/lombok-${lombok.version}.jar" tofile="dist/lombok.jar" />
 		<property name="lombok.dist.built" value="true" />
 	</target>
@@ -274,42 +277,60 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		<echo level="info">All tests successful.</echo>
 	</target>
 	
-	<target name="maven" depends="version, dist, test" description="Build a maven repository.">
-		<ivy:make-maven-repo
-				group="org.projectlombok" artifact="lombok"
-				version="${lombok.version}"
-				url="http://projectlombok.org/mavenrepo"
-				outfile="dist/maven.tar.bz2"
-				artifactfile="dist/lombok-${lombok.version}.jar"
-				pomfile="doc/maven-pom.xml">
-				
-				<sources>
-					<fileset dir="src/core" />
-					<fileset dir="src/eclipseAgent" />
-					<fileset dir="src/installer" />
-					<fileset dir="src/delombok" />
-					<fileset dir="experimental/src" />
-					<fileset dir="test/transform/src" />
-					<fileset dir="test/core/src" />
-				</sources>
-		</ivy:make-maven-repo>
+	<target name="maven" depends="version, dist, test" description="Build a maven artifact bundle.">
+		<ant antfile="buildScripts/website.ant.xml" target="javadoc" inheritAll="false">
+			<property name="lombok.version" value="${lombok.version}" />
+		</ant>
+		<jar destfile="dist/lombok-${lombok.version}-javadoc.jar">
+			<fileset dir="doc/api" />
+		</jar>
+		<jar destfile="dist/lombok-${lombok.version}-sources.jar">
+			<fileset dir="src/core" />
+			<fileset dir="src/eclipseAgent" />
+			<fileset dir="src/installer" />
+			<fileset dir="src/delombok" />
+			<fileset dir="test/transform/src" />
+			<fileset dir="test/core/src" />
+		</jar>
+		<mkdir dir="build/mavenPublish" />
+		<copy tofile="build/mavenPublish/pom.xml" overwrite="true" file="doc/maven-pom.xml">
+			<filterchain>
+				<replacetokens>
+					<token key="VERSION" value="${lombok.version}" />
+				</replacetokens>
+			</filterchain>
+		</copy>
+		<tar destfile="build/mavenPublish/mavenPublish.tar.bz2" compression="bzip2">
+			<tarfileset dir="dist">
+				<include name="lombok-${lombok.version}.jar" />
+				<include name="lombok-${lombok.version}-sources.jar" />
+				<include name="lombok-${lombok.version}-javadoc.jar" />
+			</tarfileset>
+			<tarfileset dir="build/mavenPublish" includes="pom.xml" />
+		</tar>
 	</target>
 	
-	<target name="maven-publish" depends="maven" description="Build a maven repository then upload it to projectlombok.org.">
+	<target name="maven-publish" depends="maven" description="Build a maven artifact bundle then upload it to projectlombok.org and ask the server to upload it to maven central">
 		<taskdef name="scp" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.Scp" classpathref="build.path" />
 		<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" />
-		<available file="libertad-upload.key" property="libertad.key.available" />
-		<fail unless="libertad.key.available">You don't have the libertad-upload.key; you'll need it to get write access to the server.</fail>
+		<available file="escudo-upload.key" property="escudo.key.available" />
+		<fail unless="escudo.key.available">You don't have the escudo-upload.key; you'll need it to get write access to the server.</fail>
 		<scp
-			localFile="dist/maven.tar.bz2"
+			localFile="build/mavenPublish/mavenPublish.tar.bz2"
 			todir="lombokup@projectlombok.org:/staging"
-			keyfile="libertad-upload.key" passphrase=""
-			sftp="true" verbose="true" trust="true" />
+			keyfile="escudo-upload.key" passphrase=""
+			sftp="false" verbose="true" trust="true" />
+		<sshexec
+			host="projectlombok.org"
+			username="lombokup"
+			keyfile="escudo-upload.key" passphrase=""
+			trust="true" command="./publishToMavenCentral" />
+		<echo>The artifact has been published to staging. Now go to http://oss.sonatype.org/ and log in as Reinier, then doublecheck if all is well and 'release' it.</echo>
 		<sshexec
 			host="projectlombok.org"
 			username="lombokup"
-			keyfile="libertad-upload.key" passphrase=""
-			trust="true" command="./deployMavenRepo" />
+			keyfile="escudo-upload.key" passphrase=""
+			trust="true" command="./showMavenCentralPassword" />
 	</target>
 	
 	<target name="-credentials">
diff --git a/buildScripts/ivy-repo/eclipse.org-ecj-3.6.0.xml b/buildScripts/ivy-repo/eclipse.org-ecj-3.6.0.xml
deleted file mode 100644
index e3b8aceb..00000000
--- a/buildScripts/ivy-repo/eclipse.org-ecj-3.6.0.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="eclipse.org" module="ecj" revision="3.6.0" publication="20100608091100">
-		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
-		<description homepage="http://www.eclipse.org/eclipse/" />
-	</info>
-	<configurations>
-		<conf name="runtime" />
-		<conf name="sources" />
-	</configurations>
-	<publications>
-		<artifact conf="runtime" url="http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.6-201006080911/ecj-3.6.jar" />
-		<artifact type="zip" conf="sources" url="http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.6-201006080911/ecjsrc-3.6.zip" />
-	</publications>
-</ivy-module>
diff --git a/buildScripts/ivy-repo/jcraft.com-jsch-0.1.42.xml b/buildScripts/ivy-repo/jcraft.com-jsch-0.1.42.xml
deleted file mode 100644
index 8c91c0cf..00000000
--- a/buildScripts/ivy-repo/jcraft.com-jsch-0.1.42.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="jcraft.com" module="jsch" revision="0.1.42" publication="20100225011200">
-		<license name="BSD" url="http://www.jcraft.com/jsch/LICENSE.txt" />
-		<description homepage="http://www.jcraft.com/jsch/" />
-	</info>
-	<configurations>
-		<conf name="build" />
-	</configurations>
-	<publications>
-		<artifact conf="build" url="http://mesh.dl.sourceforge.net/project/jsch/jsch.jar/0.1.42/jsch-0.1.42.jar" />
-	</publications>
-</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-core.runtime-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.6.0.xml
index d1232780..fe812bbc 100644
--- a/buildScripts/ivy-repo/eclipse.org-core.runtime-3.6.0.xml
+++ b/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.6.0.xml
@@ -1,14 +1,14 @@
 <ivy-module version="2.0">
-	<info organisation="eclipse.org" module="core.runtime" revision="3.6.0" publication="20100505120000">
+	<info organisation="org.eclipse.custom" module="core.runtime" revision="3.6.0" publication="20100505120000">
 		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
 		<description homepage="http://www.eclipse.org/eclipse/" />
 	</info>
 	<configurations>
-		<conf name="runtime" />
+		<conf name="default" />
 		<conf name="sources" />
 	</configurations>
 	<publications>
-		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.runtime_3.6.0.v20100505.jar" />
+		<artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.runtime_3.6.0.v20100505.jar" />
 		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.runtime_3.6.0.v20100505-sources.jar" />
 	</publications>
 </ivy-module>
diff --git a/buildScripts/ivy-repo/org.eclipse.custom-ecj-3.6.2.xml b/buildScripts/ivy-repo/org.eclipse.custom-ecj-3.6.2.xml
new file mode 100644
index 00000000..fc9fa661
--- /dev/null
+++ b/buildScripts/ivy-repo/org.eclipse.custom-ecj-3.6.2.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.eclipse.custom" module="ecj" revision="3.6.2" publication="20110401190400">
+		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
+		<description homepage="http://www.eclipse.org/eclipse/" />
+	</info>
+	<configurations>
+		<conf name="default" />
+		<conf name="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/ecj-3.6.2.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/ecjsrc-3.6.2.zip" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-equinox.common-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.0.xml
index acb748b0..889a2ceb 100644
--- a/buildScripts/ivy-repo/eclipse.org-equinox.common-3.6.0.xml
+++ b/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.0.xml
@@ -1,14 +1,14 @@
 <ivy-module version="2.0">
-	<info organisation="eclipse.org" module="equinox.common" revision="3.6.0" publication="20100503120000">
+	<info organisation="org.eclipse.custom" module="equinox.common" revision="3.6.0" publication="20100503120000">
 		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
 		<description homepage="http://www.eclipse.org/eclipse/" />
 	</info>
 	<configurations>
-		<conf name="runtime" />
+		<conf name="default" />
 		<conf name="sources" />
 	</configurations>
 	<publications>
-		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar" />
+		<artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar" />
 		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.equinox.common_3.6.0.v20100503-sources.jar" />
 	</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
diff --git a/buildScripts/ivy-repo/eclipse.org-jdt.core-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.6.0.xml
index 7a3225d8..f9a8f52d 100644
--- a/buildScripts/ivy-repo/eclipse.org-jdt.core-3.6.0.xml
+++ b/buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.6.0.xml
@@ -1,14 +1,14 @@
 <ivy-module version="2.0">
-	<info organisation="eclipse.org" module="jdt.core" revision="3.6.0" publication="20100505120000">
+	<info organisation="org.eclipse.custom" module="jdt.core" revision="3.6.0" publication="20100505120000">
 		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
 		<description homepage="http://www.eclipse.org/eclipse/" />
 	</info>
 	<configurations>
-		<conf name="runtime" />
+		<conf name="default" />
 		<conf name="sources" />
 	</configurations>
 	<publications>
-		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.core_3.6.0.v_A58.jar" />
+		<artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.core_3.6.0.v_A58.jar" />
 		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.core_3.6.0.v_A58-sources.jar" />
 	</publications>
 </ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.6.0.xml
index 6244df5b..dbee2865 100644
--- a/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.6.0.xml
+++ b/buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.6.0.xml
@@ -1,14 +1,14 @@
 <ivy-module version="2.0">
-	<info organisation="eclipse.org" module="jdt.ui" revision="3.6.0" publication="20100602160000">
+	<info organisation="org.eclipse.custom" module="jdt.ui" revision="3.6.0" publication="20100602160000">
 		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
 		<description homepage="http://www.eclipse.org/eclipse/" />
 	</info>
 	<configurations>
-		<conf name="runtime" />
+		<conf name="default" />
 		<conf name="sources" />
 	</configurations>
 	<publications>
-		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.ui_3.6.0.v20100602-1600.jar" />
+		<artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.ui_3.6.0.v20100602-1600.jar" />
 		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.ui_3.6.0.v20100602-1600-sources.jar" />
 	</publications>
 </ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-osgi-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.6.0.xml
index 55bae381..93a7f381 100644
--- a/buildScripts/ivy-repo/eclipse.org-osgi-3.6.0.xml
+++ b/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.6.0.xml
@@ -1,14 +1,14 @@
 <ivy-module version="2.0">
-	<info organisation="eclipse.org" module="osgi" revision="3.6.0" publication="20100517120000">
+	<info organisation="org.eclipse.custom" module="osgi" revision="3.6.0" publication="20100517120000">
 		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
 		<description homepage="http://www.eclipse.org/eclipse/" />
 	</info>
 	<configurations>
-		<conf name="runtime" />
+		<conf name="default" />
 		<conf name="sources" />
 	</configurations>
 	<publications>
-		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.osgi_3.6.0.v20100517.jar" />
+		<artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.osgi_3.6.0.v20100517.jar" />
 		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.osgi_3.6.0.v20100517-sources.jar" />
 	</publications>
 </ivy-module>
diff --git a/buildScripts/ivy-repo/projectlombok.org-junit-4.8.1.xml b/buildScripts/ivy-repo/projectlombok.org-junit-4.8.1.xml
deleted file mode 100644
index aa31e5b0..00000000
--- a/buildScripts/ivy-repo/projectlombok.org-junit-4.8.1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="projectlombok.org" module="junit" revision="4.8.1" publication="20100225011200">
-		<license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
-		<ivyauthor name="KentBeck" url="http://www.threeriversinstitute.org/Kent%20Beck.htm" />
-		<description homepage="http://junit.org/" />
-	</info>
-	<configurations>
-		<conf name="test" />
-	</configurations>
-	<publications>
-		<artifact conf="test" url="http://cloud.github.com/downloads/KentBeck/junit/junit-4.8.1.jar" />
-	</publications>
-</ivy-module>
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index 25f21928..7ff6bdc9 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -12,31 +12,32 @@
 		<dependency org="projectlombok.org" name="lombok.patcher" rev="0.4" conf="build; runtime->build" />
 		<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="build->runtime; runtime" />
 		
-		<dependency org="projectlombok.org" name="junit" rev="4.8.1" conf="test" />
-		<dependency org="log4j" name="log4j" rev="1.2.16" conf="test->master"/>
-		<dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="test->master"/>
-		<dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="test->master"/>
+		<dependency org="junit" name="junit" rev="4.8.2" conf="test->default; contrib->sources" />
+		<dependency org="log4j" name="log4j" rev="1.2.16" conf="test->default; contrib->sources" />
+		<dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="test->default; contrib->sources"/>
+		<dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="test->default; contrib->sources"/>
+		<dependency org="com.googlecode.jarjar" name="jarjar" rev="1.1" conf="build->default" />
 		
-		<dependency org="org.apache.ant" name="ant" rev="1.8.0" conf="build->master" />
+		<dependency org="org.apache.ant" name="ant" rev="1.8.0" conf="build->default; contrib->sources" />
 		<dependency org="projectlombok.org" name="spi" rev="0.2.4" conf="build" />
 		<dependency org="projectlombok.org" name="ant-googlecode" rev="0.0.2" conf="build" />
-		<dependency org="jcraft.com" name="jsch" rev="0.1.42" conf="build" />
+		<dependency org="com.jcraft" name="jsch" rev="0.1.42" conf="build->default" />
 		<dependency org="projectlombok.org" name="jsch-ant-fixed" rev="0.1.42" conf="build" />
 		<dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="build" />
-		<dependency org="de.java2html" name="java2html" rev="5.0" conf="build->master" />
+		<dependency org="de.java2html" name="java2html" rev="5.0" conf="build->default" />
 		
 		<dependency org="projectlombok.org" name="javac" rev="1.6.0.18" conf="build->runtime; contrib->sources" />
-		<dependency org="eclipse.org" name="ecj" rev="3.6.0" conf="build->runtime; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="ecj" rev="3.6.2" conf="build->default; contrib->sources" />
 		
 		<dependency org="netbeans.org" name="boot" rev="6.8beta" conf="netbeansBuild->build" />
 		<dependency org="netbeans.org" name="openide.modules" rev="6.8beta" conf="netbeansBuild->build" />
 		<dependency org="netbeans.org" name="openide.util" rev="6.8beta" conf="netbeansBuild->build" />
 		<dependency org="netbeans.org" name="modules.java.source" rev="6.8beta" conf="netbeansBuild->build" />
 		
-		<dependency org="eclipse.org" name="core.runtime" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" />
-		<dependency org="eclipse.org" name="jdt.core" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" />
-		<dependency org="eclipse.org" name="jdt.ui" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" />
-		<dependency org="eclipse.org" name="equinox.common" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" />
-		<dependency org="eclipse.org" name="osgi" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="core.runtime" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="jdt.core" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="jdt.ui" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="equinox.common" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="osgi" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" />
 	</dependencies>
 </ivy-module>
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index aabc337c..68e20eae 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -144,6 +144,9 @@ such as converting the changelog into HTML, and creating javadoc.
 		<antcall target="-integrateSnippet">
 			<param name="transformationName" value="Delegate" />
 		</antcall>
+		<antcall target="-integrateSnippet">
+			<param name="transformationName" value="onX" />
+		</antcall>
 	</target>
 	
 	<target name="-website-dist">
diff --git a/doc/maven-pom.xml b/doc/maven-pom.xml
index bf22ea5d..34955ab8 100644
--- a/doc/maven-pom.xml
+++ b/doc/maven-pom.xml
@@ -12,20 +12,37 @@
 	<licenses>
 		<license>
 			<name>The MIT License</name>
-			<url>http://www.opensource.org/licenses/mit-license.php</url>
+			<url>http://projectlombok.org/LICENSE</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
 	<scm>
 		<connection>scm:git:git://github.com/rzwitserloot/lombok.git</connection>
-		<url>scm:git:git://github.com/rzwitserloot/lombok.git</url>
+		<url>http://github.com/rzwitserloot/lombok</url>
 	</scm>
-	<!--
-		For auto-syncing to the main maven repository:
-		"org.projectlombok","mavensync@projectlombok.org:/home/mavensync/public_html/m2repo","rsync_ssh","Reinier Zwitserloot", "reinier@projectlombok.org",,
-		
-		For deploying to the remote repo on projectlombok.org:
-		mvn deploy:deploy-file -DrepositoryId=projectlombok.org url=scp://reinier@projectlombok.org/home/mavensync/public_html/m2repo -Dfile=dist/lombok.jar -DpomFile=doc/maven-pom.xml
-	-->
+	<issueManagement>
+		<system>Google Code</system>
+		<url>http://code.google.com/p/projectlombok/issues</url>
+	</issueManagement>
+	<developers>
+		<developer>
+			<id>rzwitserloot</id>
+			<name>Reinier Zwitserloot</name>
+			<email>reinier@projectlombok.org</email>
+			<url>http://zwitserloot.com</url>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>rspilker</id>
+			<name>Roel Spilker</name>
+			<email>roel@projectlombok.org</email>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>rgrootjans</id>
+			<name>Robbert Jan Grootjans</name>
+			<timezone>+1</timezone>
+		</developer>
+	</developers>
 </project>
 
diff --git a/doc/publishing.txt b/doc/publishing.txt
index 01a2c294..85a13a9c 100644
--- a/doc/publishing.txt
+++ b/doc/publishing.txt
@@ -10,4 +10,6 @@ Step #4: git push && git push --tags
 
 Step #5: ant publish-all
 
+Step #6: Follow the instructions that flew by when the maven-publish task ran, which involves going to http://oss.sonatype.org/ and logging in with the username/pass that are in your scroll log, to test and then 'release' the staged repo to maven central. Note that once you do this there's no turning back, and that version number is forever associated with this release.
+
 Step #6: Change src/core/lombok/core/Version.java to "0.8.2-EDGE", and commit this.
diff --git a/src/core/lombok/eclipse/Eclipse.java b/src/core/lombok/eclipse/Eclipse.java
index ddba726a..8910bb3e 100644
--- a/src/core/lombok/eclipse/Eclipse.java
+++ b/src/core/lombok/eclipse/Eclipse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
+ * Copyright © 2009-2011 Reinier Zwitserloot and Roel Spilker.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -89,46 +89,85 @@ public class Eclipse {
 	
 	/**
 	 * Generates an error in the Eclipse error log. Note that most people never look at it!
+	 * 
+	 * @param cud The {@code CompilationUnitDeclaration} where the error occurred.
+	 *     An error will be generated on line 0 linking to the error log entry. Can be {@code null}.
+	 * @param message Human readable description of the problem.
+	 * @param error The associated exception. Can be {@code null}.
 	 */
-	public static void error(CompilationUnitDeclaration cud, String message) {
-		error(cud, message, DEFAULT_BUNDLE, null);
+	public static void error(CompilationUnitDeclaration cud, String message, Throwable error) {
+		error(cud, message, null, error);
 	}
 	
 	/**
 	 * Generates an error in the Eclipse error log. Note that most people never look at it!
+	 * 
+	 * @param cud The {@code CompilationUnitDeclaration} where the error occurred.
+	 *     An error will be generated on line 0 linking to the error log entry. Can be {@code null}.
+	 * @param message Human readable description of the problem.
+	 * @param bundleName Can be {@code null} to default to {@code org.eclipse.jdt.core} which is usually right.
+	 * @param error The associated exception. Can be {@code null}.
 	 */
-	public static void error(CompilationUnitDeclaration cud, String message, Throwable error) {
-		error(cud, message, DEFAULT_BUNDLE, error);
+	public static void error(CompilationUnitDeclaration cud, String message, String bundleName, Throwable error) {
+		if (bundleName == null) bundleName = DEFAULT_BUNDLE;
+		try {
+			new EclipseWorkspaceLogger().error(message, bundleName, error);
+		} catch (NoClassDefFoundError e) {  //standalone ecj does not jave Platform, ILog, IStatus, and friends.
+			new TerminalLogger().error(message, bundleName, error);
+		}
+		if (cud != null) EclipseAST.addProblemToCompilationResult(cud, false, message + " - See error log.", 0, 0);
 	}
 	
 	/**
-	 * Generates an error in the Eclipse error log. Note that most people never look at it!
+	 * Generates a warning in the Eclipse error log. Note that most people never look at it!
+	 * 
+	 * @param cud The {@code CompilationUnitDeclaration} where the error occurred.
+	 *     An error will be generated on line 0 linking to the error log entry. Can be {@code null}.
+	 * @param message Human readable description of the problem.
+	 * @param error The associated exception. Can be {@code null}.
 	 */
-	public static void error(CompilationUnitDeclaration cud, String message, String bundleName) {
-		error(cud, message, bundleName, null);
+	public static void warning(String message, Throwable error) {
+		warning(message, null, error);
 	}
 	
 	/**
-	 * Generates an error in the Eclipse error log. Note that most people never look at it!
+	 * Generates a warning in the Eclipse error log. Note that most people never look at it!
+	 * 
+	 * @param message Human readable description of the problem.
+	 * @param bundleName Can be {@code null} to default to {@code org.eclipse.jdt.core} which is usually right.
+	 * @param error The associated exception. Can be {@code null}.
 	 */
-	public static void error(CompilationUnitDeclaration cud, String message, String bundleName, Throwable error) {
+	public static void warning(String message, String bundleName, Throwable error) {
+		if (bundleName == null) bundleName = DEFAULT_BUNDLE;
 		try {
-			new EclipseWorkspaceLogger().error(message, bundleName, error);
-		} catch (NoClassDefFoundError e) {	//standalone ecj does not jave Platform, ILog, IStatus, and friends.
-			new TerminalLogger().error(message, bundleName, error);
+			new EclipseWorkspaceLogger().warning(message, bundleName, error);
+		} catch (NoClassDefFoundError e) {  //standalone ecj does not jave Platform, ILog, IStatus, and friends.
+			new TerminalLogger().warning(message, bundleName, error);
 		}
-		if (cud != null) EclipseAST.addProblemToCompilationResult(cud, false, message + " - See error log.", 0, 0);
 	}
 	
 	private static class TerminalLogger {
 		void error(String message, String bundleName, Throwable error) {
 			System.err.println(message);
-			error.printStackTrace();
+			if (error != null) error.printStackTrace();
+		}
+		
+		void warning(String message, String bundleName, Throwable error) {
+			System.err.println(message);
+			if (error != null) error.printStackTrace();
 		}
 	}
 	
 	private static class EclipseWorkspaceLogger {
 		void error(String message, String bundleName, Throwable error) {