[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
This commit is contained in:
Reinier Zwitserloot committed 2014-03-04 23:16:49 +01:00
commit f956ba1e33
148 files changed
+1165 -376

No files matched your search

@@ -0,0 +1,13 @@
//skip compare content
import lombok.Delegate;
import lombok.Getter;
class DelegateOnStatic {
@Delegate private static final java.lang.Runnable staticField = null;
}
class DelegateOnStaticMethod {
@Delegate private static final java.lang.Runnable staticMethod() {
return null;
};
}