[test] work in progress: Make test.javac6 pass all tests.

The `test.javac6` job causes a ton of errors because many tests use java8+ features. Marking them off as java8+ targeted only.

38 files changed, 43 insertions, 35 deletions

diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index 5dded177..94549a00 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -52,6 +52,9 @@
 		<dependency org="com.google.flogger" name="flogger" rev="0.2" conf="test->default; sources" />
 		<dependency org="com.google.guava" name="guava" rev="18.0" conf="test->default; sources" />
 		<dependency org="com.google.code.findbugs" name="findbugs" rev="3.0.1" conf="test->master" />
+		<dependency org="org.springframework" name="spring-core" rev="5.3.4" conf="test->master" />
+		<dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.10.0" conf="test->master" />
+		<dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="2.10.0" conf="test->master" />
 		
 		<!-- build tooling -->
 		<dependency org="com.hierynomus" name="sshj" rev="0.26.0" conf="buildtools->default" />
diff --git a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java
index f6fa22de..7568d812 100644
--- a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java
+++ b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java
@@ -1,3 +1,4 @@
+//version 8:
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.Set;
diff --git a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java
index 6dbbeee4..d58caf4d 100644
--- a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java
@@ -1,3 +1,4 @@
+//version 8:
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.Set;
diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java
index f7f38b29..2beafc4c 100644
--- a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java
+++ b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java
@@ -1,3 +1,4 @@
+//version 8:
 class CheckerFrameworkBasic {
 	private final int x;
 	private final int y;
diff --git a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java
index e1ac7c00..8dcdaf10 100644
--- a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java
+++ b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java
@@ -1,3 +1,4 @@
+//version 8:
 import java.util.List;
 class CheckerFrameworkSuperBuilder {
 	public static class Parent {
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java b/test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java
index 64b6f4d3..d99fc71c 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java
@@ -1,3 +1,4 @@
+//version 8:
 import java.lang.annotation.*;
 
 class EqualsAndHashCodeAnnotated {
diff --git a/test/transform/resource/after-delombok/ExtensionMethodFunctional.java b/test/transform/resource/after-delombok/ExtensionMethodFunctional.java
index fb58eb91..45602fa6 100644
--- a/test/transform/resource/after-delombok/ExtensionMethodFunctional.java
+++ b/test/transform/resource/after-delombok/ExtensionMethodFunctional.java
@@ -1,3 +1,4 @@
+// version 8:
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.List;
diff --git a/test/transform/resource/after-delombok/GetterLazyArguments.java b/test/transform/resource/after-delombok/GetterLazyArguments.java
index a8a422c0..604513cd 100644
--- a/test/transform/resource/after-delombok/GetterLazyArguments.java
+++ b/test/transform/resource/after-delombok/GetterLazyArguments.java
@@ -1,3 +1,4 @@
+// version 8:
 class GetterLazyArguments {
 	static String fun() {
 		return null;
diff --git a/test/transform/resource/after-delombok/JacksonBuilderSingular.java b/test/transform/resource/after-delombok/JacksonBuilderSingular.java
index feaa6832..b56ed0c0 100644
--- a/test/transform/resource/after-delombok/JacksonBuilderSingular.java
+++ b/test/transform/resource/after-delombok/JacksonBuilderSingular.java
@@ -1,3 +1,4 @@
+//version 8:
 import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
diff --git a/test/transform/resource/after-delombok/JacksonJsonProperty.java b/test/transform/resource/after-delombok/JacksonJsonProperty.java
index 14e50447..efb45f35 100644
--- a/test/transform/resource/after-delombok/JacksonJsonProperty.java
+++ b/test/transform/resource/after-delombok/JacksonJsonProperty.java
@@ -1,3 +1,4 @@
+//version 8:
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
diff --git a/test/transform/resource/after-delombok/LoggerLog4j2.java b/test/transform/resource/after-delombok/LoggerLog4j2.java
index b32c7722..cba516f2 100644
--- a/test/transform/resource/after-delombok/LoggerLog4j2.java
+++ b/test/transform/resource/after-delombok/LoggerLog4j2.java
@@ -1,3 +1,4 @@
+//version 8:
 class LoggerLog4j2 {
 	@java.lang.SuppressWarnings("all")
 	private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2.class);
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jInvalidTopic.java b/test/transform/resource/after-delombok/LoggerSlf4jInvalidTopic.java
deleted file mode 100644
index 86e6ae2c..00000000
--- a/test/transform/resource/after-delombok/LoggerSlf4jInvalidTopic.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j(topic = 42)
-class LoggerSlf4jWithIntegerTopic {
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/NonNullTypeUse.java b/test/transform/resource/after-delombok/NonNullTypeUse.java
index 7c438501..b80a6da8 100644
--- a/test/transform/resource/after-delombok/NonNullTypeUse.java
+++ b/test/transform/resource/after-delombok/NonNullTypeUse.java
@@ -1,3 +1,4 @@
+//version 8:
 import lombok.NonNull;
 class NonNullTypeUse {
 	void test1(@NonNull String[][][] args) {
diff --git a/test/transform/resource/after-delombok/NullLibrary1.java b/test/transform/resource/after-delombok/NullLibrary1.java
index e19c535d..e299be3d 100644
--- a/test/transform/resource/after-delombok/NullLibrary1.java
+++ b/test/transform/resource/after-delombok/NullLibrary1.java
@@ -1,3 +1,4 @@
+//version 8:
 public class NullLibrary1 {
 	String foo;
 	@java.lang.Override
diff --git a/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java b/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java
index f6e0f024..ad51816a 100644
--- a/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java
+++ b/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java
@@ -1,3 +1,4 @@
+//version 8:
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.Set;
diff --git a/test/transform/resource/after-delombok/TypeUseAnnotations.java b/test/transform/resource/after-delombok/TypeUseAnnotations.java
index fbf32577..37c24c53 100644
--- a/test/transform/resource/after-delombok/TypeUseAnnotations.java
+++ b/test/transform/resource/after-delombok/TypeUseAnnotations.java
@@ -1,3 +1,4 @@
+//version 8:
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.List;
diff --git a/test/transform/resource/after-delombok/ValDelegateMethodReference.java b/test/transform/resource/after-delombok/ValDelegateMethodReference.java
index 186e2aaa..c62edd66 100644
--- a/test/transform/resource/after-delombok/ValDelegateMethodReference.java
+++ b/test/transform/resource/after-delombok/ValDelegateMethodReference.java
@@ -1,3 +1,4 @@
+//version 8:
 import java.util.function.Function;
 
 public class ValDelegateMethodReference {
diff --git a/test/transform/resource/after-delombok/WithByNullAnnos.java b/test/transform/resource/after-delombok/WithByNullAnnos.java
index cdaed973..04d64f16 100644
--- a/test/transform/resource/after-delombok/WithByNullAnnos.java
+++ b/test/transform/resource/after-delombok/WithByNullAnnos.java
@@ -1,3 +1,4 @@
+//version 8:
 import java.util.List;
 public class WithByNullAnnos {
 	final List<String> test;
diff --git a/test/transform/resource/after-delombok/WithByTypes.java b/test/transform/resource/after-delombok/WithByTypes.java
index e5e2fb07..f1f1ef5f 100644
--- a/test/transform/resource/after-delombok/WithByTypes.java
+++ b/test/transform/resource/after-delombok/WithByTypes.java
@@ -1,3 +1,4 @@
+//version 8:
 public class WithByTypes<T> {
 	private final int a;
 	private final long b;
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jInvalidTopic.java b/test/transform/resource/after-ecj/LoggerSlf4jInvalidTopic.java
deleted file mode 100644
index 33e212e3..00000000
--- a/test/transform/resource/after-ecj/LoggerSlf4jInvalidTopic.java
+++ /dev/null
@@ -1,9 +0,0 @@
-import lombok.extern.slf4j.Slf4j;
-@Slf4j(topic = 42) class LoggerSlf4jWithIntegerTopic {
-  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(42);
-  <clinit>() {
-  }
-  LoggerSlf4jWithIntegerTopic() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/before/BuilderSingularNullBehavior2.java b/test/transform/resource/before/BuilderSingularNullBehavior2.java
index 7d1d0e57..544a270d 100644
--- a/test/transform/resource/before/BuilderSingularNullBehavior2.java
+++ b/test/transform/resource/before/BuilderSingularNullBehavior2.java
@@ -1,3 +1,4 @@
+//version 8:
 //CONF: lombok.addNullAnnotations = spring
 //CONF: lombok.nonNull.exceptionType = JDK
 import java.util.List;
diff --git a/test/transform/resource/before/CheckerFrameworkBasic.java b/test/transform/resource/before/CheckerFrameworkBasic.java
index fb43ad08..4bf1ac73 100644
--- a/test/transform/resource/before/CheckerFrameworkBasic.java
+++ b/test/transform/resource/before/CheckerFrameworkBasic.java
@@ -1,3 +1,4 @@
+//version 8:
 //CONF: checkerframework = 4.0
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/test/transform/resource/before/CheckerFrameworkBuilder.java b/test/transform/resource/before/CheckerFrameworkBuilder.java
index 440b80e9..0f24e1b7 100644
--- a/test/transform/resource/before/CheckerFrameworkBuilder.java
+++ b/test/transform/resource/before/CheckerFrameworkBuilder.java
@@ -1,3 +1,4 @@
+//version 8:
 //CONF: checkerframework = 4.0
 import java.util.List;
 import lombok.Builder;
diff --git a/test/transform/resource/before/CheckerFrameworkSuperBuilder.java b/test/transform/resource/before/CheckerFrameworkSuperBuilder.java
index ed9e14cb..fefff676 100644
--- a/test/transform/resource/before/CheckerFrameworkSuperBuilder.java
+++ b/test/transform/resource/before/CheckerFrameworkSuperBuilder.java
@@ -1,3 +1,4 @@
+//version 8:
 //CONF: checkerframework = 4.0
 import java.util.List;
 import lombok.Singular;
diff --git a/test/transform/resource/before/EqualsAndHashCodeAnnotated.java b/test/transform/resource/before/EqualsAndHashCodeAnnotated.java
index d672b982..f65d7b5b 100644
--- a/test/transform/resource/before/EqualsAndHashCodeAnnotated.java
+++ b/test/transform/resource/before/EqualsAndHashCodeAnnotated.java
@@ -1,4 +1,4 @@
-//version 8
+//version 8:
 import java.lang.annotation.*;
 
 @lombok.EqualsAndHashCode
diff --git a/test/transform/resource/before/JacksonBuilderSingular.java b/test/transform/resource/before/JacksonBuilderSingular.java
index c179c760..a5afdc42 100644
--- a/test/transform/resource/before/JacksonBuilderSingular.java
+++ b/test/transform/resource/before/JacksonBuilderSingular.java
@@ -1,3 +1,4 @@
+//version 8:
 import java.util.List;
 import java.util.Map;
 
diff --git a/test/transform/resource/before/JacksonJsonProperty.java b/test/transform/resource/before/JacksonJsonProperty.java
index f0b7b2f2..efdda29d 100644
--- a/test/transform/resource/before/JacksonJsonProperty.java
+++ b/test/transform/resource/before/JacksonJsonProperty.java
@@ -1,3 +1,4 @@
+//version 8:
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
diff --git a/test/transform/resource/before/JacksonizedBuilderComplex.java b/test/transform/resource/before/JacksonizedBuilderComplex.java
index dec1cd3b..8881c3d8 100644
--- a/test/transform/resource/before/JacksonizedBuilderComplex.java
+++ b/test/transform/resource/before/JacksonizedBuilderComplex.java
@@ -1,10 +1,10 @@
-//CONF: lombok.builder.className = Test*Name

-import java.util.List;

-import lombok.Builder;

-import lombok.extern.jackson.Jacksonized;

-

-class JacksonizedBuilderComplex {

-	@Jacksonized

-	@Builder(buildMethodName = "execute", setterPrefix = "with")

-	private static <T extends Number> void testVoidWithGenerics(T number, int arg2, String arg3, JacksonizedBuilderComplex selfRef) {}

-}

+//CONF: lombok.builder.className = Test*Name
+import java.util.List;
+import lombok.Builder;
+import lombok.extern.jackson.Jacksonized;
+
+class JacksonizedBuilderComplex {
+	@Jacksonized
+	@Builder(buildMethodName = "execute", setterPrefix = "with")
+	private static <T extends Number> void testVoidWithGenerics(T number, int arg2, String arg3, JacksonizedBuilderComplex selfRef) {}
+}
diff --git a/test/transform/resource/before/LoggerLog4j2.java b/test/transform/resource/before/LoggerLog4j2.java
index 10b3aae5..1dd48d7a 100644
--- a/test/transform/resource/before/LoggerLog4j2.java
+++ b/test/transform/resource/before/LoggerLog4j2.java
@@ -1,3 +1,4 @@
+//version 8:
 import lombok.extern.log4j.Log4j2;
 
 @lombok.extern.log4j.Log4j2
diff --git a/test/transform/resource/before/LoggerSlf4jInvalidTopic.java b/test/transform/resource/before/LoggerSlf4jInvalidTopic.java
deleted file mode 100644
index eed02f01..00000000
--- a/test/transform/resource/before/LoggerSlf4jInvalidTopic.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j(topic=42)
-class LoggerSlf4jWithIntegerTopic {
-}
\ No newline at end of file
diff --git a/test/transform/resource/before/NullLibrary1.java b/test/transform/resource/before/NullLibrary1.java
index 95433270..d57d3d09 100644
--- a/test/transform/resource/before/NullLibrary1.java
+++ b/test/transform/resource/before/NullLibrary1.java
@@ -1,3 +1,4 @@
+//version 8:
 //CONF: lombok.addNullAnnotations = eclipse
 @lombok.EqualsAndHashCode
 @lombok.ToString
diff --git a/test/transform/resource/before/SuperBuilderSingularAnnotatedTypes.java b/test/transform/resource/before/SuperBuilderSingularAnnotatedTypes.java
index d26352d2..097f4e60 100644
--- a/test/transform/resource/before/SuperBuilderSingularAnnotatedTypes.java
+++ b/test/transform/resource/before/SuperBuilderSingularAnnotatedTypes.java
@@ -1,4 +1,4 @@
-//VERSION 8:
+//version 8:
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.Set;
diff --git a/test/transform/resource/before/ValDelegateMethodReference.java b/test/transform/resource/before/ValDelegateMethodReference.java
index 21b781aa..3d1f082c 100644
--- a/test/transform/resource/before/ValDelegateMethodReference.java
+++ b/test/transform/resource/before/ValDelegateMethodReference.java
@@ -1,3 +1,4 @@
+//version 8:
 //platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 import lombok.Getter;
 import lombok.Setter;
diff --git a/test/transform/resource/before/WithByNullAnnos.java b/test/transform/resource/before/WithByNullAnnos.java
index 3fd8087f..a3ef6ac3 100644
--- a/test/transform/resource/before/WithByNullAnnos.java
+++ b/test/transform/resource/before/WithByNullAnnos.java
@@ -1,3 +1,4 @@
+//version 8:
 //CONF: lombok.addNullAnnotations=checkerframework
 import java.util.List;
 @lombok.RequiredArgsConstructor
diff --git a/test/transform/resource/before/WithByTypes.java b/test/transform/resource/before/WithByTypes.java
index 9d2fe358..e33b0dd6 100644
--- a/test/transform/resource/before/WithByTypes.java
+++ b/test/transform/resource/before/WithByTypes.java
@@ -1,3 +1,4 @@
+//version 8:
 @lombok.RequiredArgsConstructor
 @lombok.experimental.FieldDefaults(level = lombok.AccessLevel.PRIVATE, makeFinal = true)
 @lombok.experimental.WithBy
diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jInvalidTopic.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jInvalidTopic.java.messages
deleted file mode 100644
index 8de0a120..00000000
--- a/test/transform/resource/messages-delombok/LoggerSlf4jInvalidTopic.java.messages
+++ /dev/null
@@ -1,2 +0,0 @@
-3 incompatible types: int cannot be converted to java.lang.String
--1 not flagged modified
\ No newline at end of file
diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jInvalidTopic.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jInvalidTopic.java.messages
deleted file mode 100644
index 9bc2a82b..00000000
--- a/test/transform/resource/messages-ecj/LoggerSlf4jInvalidTopic.java.messages
+++ /dev/null
@@ -1 +0,0 @@
-3 Type mismatch: cannot convert from int to String
\ No newline at end of file
diff --git a/test/transform/resource/messages-idempotent/LoggerSlf4jInvalidTopic.java.messages b/test/transform/resource/messages-idempotent/LoggerSlf4jInvalidTopic.java.messages
deleted file mode 100644
index d894fad1..00000000
--- a/test/transform/resource/messages-idempotent/LoggerSlf4jInvalidTopic.java.messages
+++ /dev/null
@@ -1 +0,0 @@
-3 incompatible types: int cannot be converted to java.lang.String
\ No newline at end of file