[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, 2 insertions, 1 deletions

diff --git a/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java b/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java
index 38ce2c2a..d023a399 100644
--- a/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java
+++ b/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java
@@ -34,6 +34,7 @@ import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic.Kind;
 
+import lombok.patcher.ClassRootFinder;
 import lombok.patcher.Hook;
 import lombok.patcher.MethodTarget;
 import lombok.patcher.ScriptManager;
@@ -56,7 +57,7 @@ public class DisableCheckedExceptionsAgent extends AbstractProcessor {
 			procEnv.getMessager().printMessage(Kind.WARNING, "You aren't using a compiler based around javac v1.6, so disableCheckedExceptions will not work.\n" +
 					"Your processor class is: " + className);
 		} else {
-			new LiveInjector().inject(LiveInjector.findPathJar(DisableCheckedExceptionsAgent.class));
+			new LiveInjector().inject(ClassRootFinder.findClassRootOfClass(DisableCheckedExceptionsAgent.class));
 		}
 	}