[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

1 files changed, 21 insertions, 19 deletions

diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index e7515ae4..b2d3ab21 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -3,7 +3,9 @@
 	<configurations>
 		<conf name="eclipseBuild" />
 		<conf name="netbeansBuild" />
-		<conf name="build" extends="eclipseBuild, netbeansBuild, javac6" />
+		<conf name="buildBase" extends="netbeansBuild, javac6" />
+		<conf name="build" extends="buildBase, eclipseBuild" />
+		<conf name="buildWithoutEclipse" extends="buildBase" />
 		<conf name="runtime" />
 		<conf name="test" extends="runtime" />
 		<conf name="contrib" />
@@ -12,8 +14,8 @@
 		<conf name="javac7" />
 	</configurations>
 	<dependencies>
-		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.7" conf="build->default; runtime->default" />
-		<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="build->runtime; runtime" />
+		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.12" conf="buildBase->default; runtime->default" />
+		<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="buildBase->runtime; runtime" />
 		
 		<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" />
@@ -21,31 +23,31 @@
 		<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="org.slf4j" name="slf4j-ext" rev="1.6.1" conf="test->default; contrib->sources"/>
-		<dependency org="com.googlecode.jarjar" name="jarjar" rev="1.1" conf="build->default" />
+		<dependency org="com.googlecode.jarjar" name="jarjar" rev="1.1" conf="buildBase->default" />
 		
-		<dependency org="org.apache.ant" name="ant" rev="1.8.1" conf="build->default; contrib->sources" />
-		<dependency org="projectlombok.org" name="spi" rev="0.2.7" conf="build" />
-		<dependency org="projectlombok.org" name="ant-googlecode" rev="0.0.2" 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->default" />
+		<dependency org="org.apache.ant" name="ant" rev="1.8.1" conf="buildBase->default; contrib->sources" />
+		<dependency org="projectlombok.org" name="spi" rev="0.2.7" conf="buildBase->build" />
+		<dependency org="projectlombok.org" name="ant-googlecode" rev="0.0.2" conf="buildBase->build" />
+		<dependency org="com.jcraft" name="jsch" rev="0.1.42" conf="buildBase->default" />
+		<dependency org="projectlombok.org" name="jsch-ant-fixed" rev="0.1.42" conf="buildBase->build" />
+		<dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="buildBase->build" />
+		<dependency org="de.java2html" name="java2html" rev="5.0" conf="buildBase->default" />
 		
 		<dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="javac6->runtime; contrib->sources" />
 		<dependency org="net.java.openjdk.custom" name="javac7" rev="1.7.0" conf="javac7->runtime; contrib->sources" />
-		<dependency org="org.eclipse.custom" name="ecj" rev="3.6.2" conf="ecj->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="ecj" rev="4.3.1" conf="ecj->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="org.eclipse.custom" name="core.runtime" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" />
-		<dependency org="org.eclipse.custom" name="core.resources" rev="3.7.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" />
-		<dependency org="org.eclipse.custom" name="core.jobs" rev="3.5.200" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="core.runtime" rev="3.9.0" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="jdt.core" rev="3.9.1" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="jdt.ui" rev="3.9.1" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="equinox.common" rev="3.6.200" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="osgi" rev="3.9.0" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="core.resources" rev="3.8.100" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="core.jobs" rev="3.5.300" conf="eclipseBuild->default; contrib->sources" />
 	</dependencies>
 </ivy-module>