[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, 6 insertions, 3 deletions

diff --git a/test/transform/resource/after-ecj/SneakyThrowsSingle.java b/test/transform/resource/after-ecj/SneakyThrowsSingle.java
index eea593f2..073d690a 100644
--- a/test/transform/resource/after-ecj/SneakyThrowsSingle.java
+++ b/test/transform/resource/after-ecj/SneakyThrowsSingle.java
@@ -8,7 +8,8 @@ class SneakyThrowsSingle {
       {
         System.out.println("test1");
       }
-    catch (final Throwable $ex)       {
+    catch (final Throwable $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
@@ -18,7 +19,8 @@ class SneakyThrowsSingle {
         System.out.println("test2");
         throw new IOException();
       }
-    catch (final IOException $ex)       {
+    catch (final IOException $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
@@ -28,7 +30,8 @@ class SneakyThrowsSingle {
         System.out.println("test3");
         throw new IOException();
       }
-    catch (final IOException $ex)       {
+    catch (final IOException $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }