[configuration] Merge branch 'master' as we work on configuration.

* Conflict due to adding topic() feature to logger in master, and 'field name' feature in config branch.
* master has since updated to shiny new eclipse dep versions and the 'ant eclipseForDebugging' feature, but this branch added deps. Addressed that.
* Renamed 'loggerCategory' to 'loggerTopic'. I know, that wasn't exactly right to do in a merge, but, there you have it.
* Test infrastructure changed in configuration branch, and tests had been added in master branch.

Conflicts:
	build.xml
	buildScripts/ivy.xml
	src/core/lombok/eclipse/handlers/HandleLog.java
	src/core/lombok/extern/apachecommons/CommonsLog.java
	src/core/lombok/extern/java/Log.java
	src/core/lombok/extern/log4j/Log4j.java
	src/core/lombok/extern/log4j/Log4j2.java
	src/core/lombok/javac/handlers/HandleLog.java
	test/transform/resource/after-ecj/ValInTryWithResources.java

10 files changed, 114 insertions, 16 deletions

diff --git a/buildScripts/ivy-repo/org.eclipse.custom-core.jobs-3.5.300.xml b/buildScripts/ivy-repo/org.eclipse.custom-core.jobs-3.5.300.xml
new file mode 100644
index 00000000..4ac11822
--- /dev/null
+++ b/buildScripts/ivy-repo/org.eclipse.custom-core.jobs-3.5.300.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.eclipse.custom" module="core.jobs" revision="3.5.300" publication="20130429181300">
+		<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/org.eclipse.core.jobs_3.5.300.v20130429-1813.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.jobs_3.5.300.v20130429-1813-sources.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/org.eclipse.custom-core.resources-3.8.100.xml b/buildScripts/ivy-repo/org.eclipse.custom-core.resources-3.8.100.xml
new file mode 100644
index 00000000..c76dba24
--- /dev/null
+++ b/buildScripts/ivy-repo/org.eclipse.custom-core.resources-3.8.100.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.eclipse.custom" module="core.resources" revision="3.8.100" publication="20130521202600">
+		<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/org.eclipse.core.resources_3.8.100.v20130521-2026.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.resources_3.8.100.v20130521-2026-sources.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.9.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.9.0.xml
new file mode 100644
index 00000000..45d6a9c3
--- /dev/null
+++ b/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.9.0.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.eclipse.custom" module="core.runtime" revision="3.9.0" publication="20130326125500">
+		<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/org.eclipse.core.runtime_3.9.0.v20130326-1255.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.runtime_3.9.0.v20130326-1255-sources.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/org.eclipse.custom-ecj-4.3.1.xml b/buildScripts/ivy-repo/org.eclipse.custom-ecj-4.3.1.xml
new file mode 100644
index 00000000..4ebfc8a4
--- /dev/null
+++ b/buildScripts/ivy-repo/org.eclipse.custom-ecj-4.3.1.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.eclipse.custom" module="ecj" revision="4.3.1" publication="20140210214200">
+		<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-4.3.1.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/ecjsrc-4.3.1.zip" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.200.xml b/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.200.xml
new file mode 100644
index 00000000..74f7a705
--- /dev/null
+++ b/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.200.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.eclipse.custom" module="equinox.common" revision="3.6.200" publication="20130402150500">
+		<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/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.equinox.common_3.6.200.v20130402-1505-sources.jar" />
+	</publications>
+</ivy-module>
\ No newline at end of file
diff --git a/buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.9.1.xml b/buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.9.1.xml
new file mode 100644
index 00000000..0e7c5363
--- /dev/null
+++ b/buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.9.1.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.eclipse.custom" module="jdt.core" revision="3.9.1" publication="20130905083700">
+		<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/org.eclipse.jdt.core_3.9.1.v20130905-0837.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.core_3.9.1.v20130905-0837-sources.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.9.1.xml b/buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.9.1.xml
new file mode 100644
index 00000000..0577ee8a
--- /dev/null
+++ b/buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.9.1.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.eclipse.custom" module="jdt.ui" revision="3.9.1" publication="20130820142700">
+		<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/org.eclipse.jdt.ui_3.9.1.v20130820-1427.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.ui_3.9.1.v20130820-1427-sources.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.9.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.9.0.xml
new file mode 100644
index 00000000..247d76de
--- /dev/null
+++ b/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.9.0.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.eclipse.custom" module="osgi" revision="3.9.0" publication="20130529171000">
+		<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/org.eclipse.osgi_3.9.0.v20130529-1710.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.osgi_3.9.0.v20130529-1710-sources.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.6.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.12.xml
index e952ce9d..f402dcc9 100644
--- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.6.xml
+++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.12.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.6" publication="20120109234200">
+	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.12" publication="20140301023600">
 		<license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
 		<ivyauthor name="rzwitserloot" url="http://zwitserloot.com/" />
 		<ivyauthor name="rspilker" url="http://github.com/rspilker" />
@@ -9,6 +9,6 @@
 		<conf name="default" />
 	</configurations>
 	<publications>
-		<artifact conf="default" url="http://projectlombok.org/downloads/lombok.patcher-0.6.jar" />
+		<artifact conf="default" url="http://projectlombok.org/downloads/lombok.patcher-0.12.jar" />
 	</publications>
 </ivy-module>
diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.7.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.7.xml
deleted file mode 100644
index ca41f64c..00000000
--- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.7.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.7" publication="20130708220900">
-		<license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
-		<ivyauthor name="rzwitserloot" url="http://zwitserloot.com/" />
-		<ivyauthor name="rspilker" url="http://github.com/rspilker" />
-		<description homepage="http://projectlombok.org/" />
-	</info>
-	<configurations>
-		<conf name="default" />
-	</configurations>
-	<publications>
-		<artifact conf="default" url="http://projectlombok.org/downloads/lombok.patcher-0.7.jar" />
-	</publications>
-</ivy-module>