[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.

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" />

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;

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;

test/transform/resource/after-delombok/CheckerFrameworkBasic.java

@@ -1,3 +1,4 @@
+//version 8:
 class CheckerFrameworkBasic {
 	private final int x;
 	private final int y;

test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java

@@ -1,3 +1,4 @@
+//version 8:
 import java.util.List;
 class CheckerFrameworkSuperBuilder {
 	public static class Parent {

test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java

@@ -1,3 +1,4 @@
+//version 8:
 import java.lang.annotation.*;
 
 class EqualsAndHashCodeAnnotated {

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;

test/transform/resource/after-delombok/GetterLazyArguments.java

@@ -1,3 +1,4 @@
+// version 8:
 class GetterLazyArguments {
 	static String fun() {
 		return null;

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;

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;

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);

test/transform/resource/after-delombok/LoggerSlf4jInvalidTopic.java

@@ -1,5 +0,0 @@
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j(topic = 42)
-class LoggerSlf4jWithIntegerTopic {
-}

test/transform/resource/after-delombok/NonNullTypeUse.java

@@ -1,3 +1,4 @@
+//version 8:
 import lombok.NonNull;
 class NonNullTypeUse {
 	void test1(@NonNull String[][][] args) {

test/transform/resource/after-delombok/NullLibrary1.java

@@ -1,3 +1,4 @@
+//version 8:
 public class NullLibrary1 {
 	String foo;
 	@java.lang.Override

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;

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;

test/transform/resource/after-delombok/ValDelegateMethodReference.java

@@ -1,3 +1,4 @@
+//version 8:
 import java.util.function.Function;
 
 public class ValDelegateMethodReference {

test/transform/resource/after-delombok/WithByNullAnnos.java

@@ -1,3 +1,4 @@
+//version 8:
 import java.util.List;
 public class WithByNullAnnos {
 	final List<String> test;

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;

test/transform/resource/after-ecj/LoggerSlf4jInvalidTopic.java

@@ -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();
-  }
-}

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;

test/transform/resource/before/CheckerFrameworkBasic.java

@@ -1,3 +1,4 @@
+//version 8:
 //CONF: checkerframework = 4.0
 import lombok.AllArgsConstructor;
 import lombok.Data;

test/transform/resource/before/CheckerFrameworkBuilder.java

@@ -1,3 +1,4 @@
+//version 8:
 //CONF: checkerframework = 4.0
 import java.util.List;
 import lombok.Builder;

test/transform/resource/before/CheckerFrameworkSuperBuilder.java

@@ -1,3 +1,4 @@
+//version 8:
 //CONF: checkerframework = 4.0
 import java.util.List;
 import lombok.Singular;

test/transform/resource/before/EqualsAndHashCodeAnnotated.java

@@ -1,4 +1,4 @@
-//version 8
+//version 8:
 import java.lang.annotation.*;
 
 @lombok.EqualsAndHashCode

test/transform/resource/before/JacksonBuilderSingular.java

@@ -1,3 +1,4 @@
+//version 8:
 import java.util.List;
 import java.util.Map;
 

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;

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) {}
+}

test/transform/resource/before/LoggerLog4j2.java

@@ -1,3 +1,4 @@
+//version 8:
 import lombok.extern.log4j.Log4j2;
 
 @lombok.extern.log4j.Log4j2

test/transform/resource/before/LoggerSlf4jInvalidTopic.java

@@ -1,5 +0,0 @@
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j(topic=42)
-class LoggerSlf4jWithIntegerTopic {
-}

test/transform/resource/before/NullLibrary1.java

@@ -1,3 +1,4 @@
+//version 8:
 //CONF: lombok.addNullAnnotations = eclipse
 @lombok.EqualsAndHashCode
 @lombok.ToString

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;

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;

test/transform/resource/before/WithByNullAnnos.java

@@ -1,3 +1,4 @@
+//version 8:
 //CONF: lombok.addNullAnnotations=checkerframework
 import java.util.List;
 @lombok.RequiredArgsConstructor

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

test/transform/resource/messages-delombok/LoggerSlf4jInvalidTopic.java.messages

@@ -1,2 +0,0 @@
-3 incompatible types: int cannot be converted to java.lang.String
--1 not flagged modified

test/transform/resource/messages-ecj/LoggerSlf4jInvalidTopic.java.messages

@@ -1 +0,0 @@
-3 Type mismatch: cannot convert from int to String

test/transform/resource/messages-idempotent/LoggerSlf4jInvalidTopic.java.messages

@@ -1 +0,0 @@
-3 incompatible types: int cannot be converted to java.lang.String