Merge branch 'master' into cachescrubber-gh-3950

# Conflicts:
#	src/core/lombok/eclipse/handlers/HandleJacksonized.java
#	src/core/lombok/javac/handlers/HandleJacksonized.java

test/transform/resource/before/ExtensionMethodInLambda.java

@@ -4,6 +4,8 @@ import lombok.experimental.ExtensionMethod;
 
 @ExtensionMethod(value = ExtensionMethodInLambda.Extensions.class)
 public class ExtensionMethodInLambda {
+	private static final Function<String, String> testStatic = s -> s.reverse();
+	
 	public void testSimple() {
 		String test = "test";
 		test = test.map(s -> s.reverse());

test/transform/resource/before/JacksonizedAccessorsTransient.java

@@ -0,0 +1,9 @@
+@lombok.extern.jackson.Jacksonized
+@lombok.experimental.Accessors(fluent = true)
+@lombok.Getter
+@lombok.Setter
+public class JacksonizedAccessorsTransient {
+	private transient int intValue;
+	@com.fasterxml.jackson.annotation.JsonIgnore private transient long longValue;
+	@com.fasterxml.jackson.annotation.JsonIgnore private double doubleValue;
+}

test/transform/resource/before/LoggerCommonsAccess.java

@@ -5,10 +5,6 @@ import lombok.extern.apachecommons.CommonsLog;
 class LoggerCommonsAccessPublic {
 }
 
-@CommonsLog(access = AccessLevel.MODULE)
-class LoggerCommonsAccessModule {
-}
-
 @CommonsLog(access = AccessLevel.PROTECTED)
 class LoggerCommonsAccessProtected {
 }

test/transform/resource/before/LoggerCustomAccess.java

@@ -6,10 +6,6 @@ import lombok.CustomLog;
 class LoggerCustomAccessPublic {
 }
 
-@CustomLog(access = AccessLevel.MODULE)
-class LoggerCustomAccessModule {
-}
-
 @CustomLog(access = AccessLevel.PROTECTED)
 class LoggerCustomAccessProtected {
 }

test/transform/resource/before/LoggerFloggerAccess.java

@@ -5,10 +5,6 @@ import lombok.extern.flogger.Flogger;
 class LoggerFloggerAccessPublic {
 }
 
-@Flogger(access = AccessLevel.MODULE)
-class LoggerFloggerAccessModule {
-}
-
 @Flogger(access = AccessLevel.PROTECTED)
 class LoggerFloggerAccessProtected {
 }

test/transform/resource/before/LoggerJBossLogAccess.java

@@ -5,10 +5,6 @@ import lombok.extern.jbosslog.JBossLog;
 class LoggerJBossLogAccessPublic {
 }
 
-@JBossLog(access = AccessLevel.MODULE)
-class LoggerJBossLogAccessModule {
-}
-
 @JBossLog(access = AccessLevel.PROTECTED)
 class LoggerJBossLogAccessProtected {
 }

test/transform/resource/before/LoggerJulAccess.java

@@ -5,10 +5,6 @@ import lombok.extern.java.Log;
 class LoggerJulAccessPublic {
 }
 
-@Log(access = AccessLevel.MODULE)
-class LoggerJulAccessModule {
-}
-
 @Log(access = AccessLevel.PROTECTED)
 class LoggerJulAccessProtected {
 }

test/transform/resource/before/LoggerLog4j2.java

@@ -1,4 +1,4 @@
-//version 8:
+//version 8: Our Log4j2 version doesn't support Java 6
 import lombok.extern.log4j.Log4j2;
 
 @lombok.extern.log4j.Log4j2

test/transform/resource/before/LoggerLog4j2Access.java

@@ -1,3 +1,4 @@
+// version 8: Our Log4j2 version doesn't support Java 6
 import lombok.AccessLevel;
 import lombok.extern.log4j.Log4j2;
 
@@ -5,10 +6,6 @@ import lombok.extern.log4j.Log4j2;
 class LoggerLog4j2AccessPublic {
 }
 
-@Log4j2(access = AccessLevel.MODULE)
-class LoggerLog4j2AccessModule {
-}
-
 @Log4j2(access = AccessLevel.PROTECTED)
 class LoggerLog4j2AccessProtected {
 }

test/transform/resource/before/LoggerLog4jAccess.java

@@ -5,10 +5,6 @@ import lombok.extern.log4j.Log4j;
 class LoggerLog4jAccessPublic {
 }
 
-@Log4j(access = AccessLevel.MODULE)
-class LoggerLog4jAccessModule {
-}
-
 @Log4j(access = AccessLevel.PROTECTED)
 class LoggerLog4jAccessProtected {
 }

test/transform/resource/before/LoggerSlf4jAccess.java

@@ -5,10 +5,6 @@ import lombok.extern.slf4j.Slf4j;
 class LoggerSlf4jAccessPublic {
 }
 
-@Slf4j(access = AccessLevel.MODULE)
-class LoggerSlf4jAccessModule {
-}
-
 @Slf4j(access = AccessLevel.PROTECTED)
 class LoggerSlf4jAccessProtected {
 }

test/transform/resource/before/LoggerXSlf4jAccess.java

@@ -2,25 +2,21 @@ import lombok.AccessLevel;
 import lombok.extern.slf4j.XSlf4j;
 
 @XSlf4j(access = AccessLevel.PUBLIC)
-class LoggerXslf4jAccessPublic {
-}
-
-@XSlf4j(access = AccessLevel.MODULE)
-class LoggerXslf4jAccessModule {
+class LoggerXSlf4jAccessPublic {
 }
 
 @XSlf4j(access = AccessLevel.PROTECTED)
-class LoggerXslf4jAccessProtected {
+class LoggerXSlf4jAccessProtected {
 }
 
 @XSlf4j(access = AccessLevel.PACKAGE)
-class LoggerXslf4jAccessPackage {
+class LoggerXSlf4jAccessPackage {
 }
 
 @XSlf4j(access = AccessLevel.PRIVATE)
-class LoggerXslf4jAccessPrivate {
+class LoggerXSlf4jAccessPrivate {
 }
 
 @XSlf4j(access = AccessLevel.NONE)
-class LoggerXslf4jAccessNone {
+class LoggerXSlf4jAccessNone {
 }