27 files changed, 47 insertions, 27 deletions
diff --git a/test/transform/resource/before/BuilderSingularNullBehavior2.java b/test/transform/resource/before/BuilderSingularNullBehavior2.java
index 7d1d0e57..dde4eea9 100644
--- a/test/transform/resource/before/BuilderSingularNullBehavior2.java
+++ b/test/transform/resource/before/BuilderSingularNullBehavior2.java
@@ -1,3 +1,4 @@
+//version 8: springframework dep is too new to run on j6
 //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/ExtensionMethodFunctional.java b/test/transform/resource/before/ExtensionMethodFunctional.java
index a9e7dd9f..8586dd7a 100644
--- a/test/transform/resource/before/ExtensionMethodFunctional.java
+++ b/test/transform/resource/before/ExtensionMethodFunctional.java
@@ -16,7 +16,7 @@ class ExtensionMethodFunctional {
 		test.consume(s -> System.out.println("1: " + s), s -> System.out.println("2: " + s));
 		test.consume(System.out::println, System.out::println);
 		
-		Stream.of("a", "b", "c").map(String::toUpperCase).toList();
+		Stream.of("a", "b", "c").map(String::toUpperCase).toList1();
 		List<Integer> i2 = Stream.of("a", "b", "c").map(String::toUpperCase).toList2();
 	}
 	
@@ -36,7 +36,7 @@ class ExtensionMethodFunctional {
 			}
 		}
 		
-		public static <T> List<T> toList(Stream<T> stream) {
+		public static <T> List<T> toList1(Stream<T> stream) {
 			return (List<T>) stream.collect(Collectors.toList());
 		}
 		
diff --git a/test/transform/resource/before/JacksonBuilderSingular.java b/test/transform/resource/before/JacksonBuilderSingular.java
index c179c760..20d6979a 100644
--- a/test/transform/resource/before/JacksonBuilderSingular.java
+++ b/test/transform/resource/before/JacksonBuilderSingular.java
@@ -1,3 +1,4 @@
+//version 8: Jackson deps are at least Java7+.
 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..c0bccfae 100644
--- a/test/transform/resource/before/JacksonJsonProperty.java
+++ b/test/transform/resource/before/JacksonJsonProperty.java
@@ -1,3 +1,4 @@
+//version 8: Jackson deps are at least Java7+.
 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..5942926d 100644
--- a/test/transform/resource/before/JacksonizedBuilderComplex.java
+++ b/test/transform/resource/before/JacksonizedBuilderComplex.java
@@ -1,10 +1,11 @@
-//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) {}
-}
+//version 8: Jackson deps are at least Java7+.
+//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/JacksonizedBuilderSimple.java b/test/transform/resource/before/JacksonizedBuilderSimple.java
index 6da015ec..b81a0f5d 100644
--- a/test/transform/resource/before/JacksonizedBuilderSimple.java
+++ b/test/transform/resource/before/JacksonizedBuilderSimple.java
@@ -1,3 +1,4 @@
+//version 8: Jackson deps are at least Java7+.
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
diff --git a/test/transform/resource/before/JacksonizedSuperBuilderSimple.java b/test/transform/resource/before/JacksonizedSuperBuilderSimple.java
index 1e3bd0fc..23e52c97 100644
--- a/test/transform/resource/before/JacksonizedSuperBuilderSimple.java
+++ b/test/transform/resource/before/JacksonizedSuperBuilderSimple.java
@@ -1,3 +1,4 @@
+//version 8: Jackson deps are at least Java7+.
 public class JacksonizedSuperBuilderSimple {
 	@lombok.extern.jackson.Jacksonized
 	@lombok.experimental.SuperBuilder
diff --git a/test/transform/resource/before/JacksonizedSuperBuilderWithJsonDeserialize.java b/test/transform/resource/before/JacksonizedSuperBuilderWithJsonDeserialize.java
index 0c80d1a6..ac0dba07 100644
--- a/test/transform/resource/before/JacksonizedSuperBuilderWithJsonDeserialize.java
+++ b/test/transform/resource/before/JacksonizedSuperBuilderWithJsonDeserialize.java
@@ -1,3 +1,4 @@
+//version 8: Jackson deps are at least Java7+.
 @lombok.extern.jackson.Jacksonized
 @lombok.experimental.SuperBuilder
 @com.fasterxml.jackson.databind.annotation.JsonDeserialize
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/NullLibrary2.java b/test/transform/resource/before/NullLibrary2.java
index 17b1e6e0..6b0ce4b0 100644
--- a/test/transform/resource/before/NullLibrary2.java
+++ b/test/transform/resource/before/NullLibrary2.java
@@ -1,3 +1,4 @@
+//version 8: springframework dep is too new to run on j6
 //CONF: lombok.addNullAnnotations = spring
 @lombok.EqualsAndHashCode
 @lombok.ToString
diff --git a/test/transform/resource/before/SuperBuilderBasicToBuilder.java b/test/transform/resource/before/SuperBuilderBasicToBuilder.java
index 93161443..bd97876e 100644
--- a/test/transform/resource/before/SuperBuilderBasicToBuilder.java
+++ b/test/transform/resource/before/SuperBuilderBasicToBuilder.java
@@ -15,7 +15,7 @@ public class SuperBuilderBasicToBuilder {
 		private int method() {
 			return 2;
 		}
-
+		
 		private static String staticMethod(Parent instance) {
 			return "staticMethod";
 		}
diff --git a/test/transform/resource/before/SuperBuilderCustomized.java b/test/transform/resource/before/SuperBuilderCustomized.java
index 8e641d90..652d0865 100644
--- a/test/transform/resource/before/SuperBuilderCustomized.java
+++ b/test/transform/resource/before/SuperBuilderCustomized.java
@@ -1,3 +1,4 @@
+//version 8: Javac 6 will error out due to `ChildBuilder` not existing before properly running lombok. Giving j6 support status, not worth fixing.
 import java.util.List;
 
 public class SuperBuilderCustomized {
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/SuperBuilderWithCustomBuilderMethod.java b/test/transform/resource/before/SuperBuilderWithCustomBuilderMethod.java
index d52cbded..b828eafe 100644
--- a/test/transform/resource/before/SuperBuilderWithCustomBuilderMethod.java
+++ b/test/transform/resource/before/SuperBuilderWithCustomBuilderMethod.java
@@ -1,3 +1,4 @@
+//version 8: Javac 6 will error out due to `ChildBuilder` not existing before properly running lombok. Giving j6 support status, not worth fixing.
 import java.util.List;
 
 public class SuperBuilderWithCustomBuilderMethod {
diff --git a/test/transform/resource/before/SuperBuilderWithExistingConstuctor.java b/test/transform/resource/before/SuperBuilderWithExistingConstuctor.java
new file mode 100644
index 00000000..13f97632
--- /dev/null
+++ b/test/transform/resource/before/SuperBuilderWithExistingConstuctor.java
@@ -0,0 +1,5 @@
+@lombok.experimental.SuperBuilder
+public class SuperBuilderWithExistingConstuctor {
+	public SuperBuilderWithExistingConstuctor() {
+	}
+}
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/ValWeirdTypes.java b/test/transform/resource/before/ValWeirdTypes.java
index 8dd63e86..f62feca6 100644
--- a/test/transform/resource/before/ValWeirdTypes.java
+++ b/test/transform/resource/before/ValWeirdTypes.java
@@ -1,3 +1,4 @@
+// version 8: In java6/7, lub types worked differently, so, the `arraysAsList` method has a slightly different inferred type there.
 import java.math.BigDecimal;
 import java.util.*;
 import lombok.val;
diff --git a/test/transform/resource/before/ValueCallSuper.java b/test/transform/resource/before/ValueCallSuper.java
index e236b404..bf561998 100644
--- a/test/transform/resource/before/ValueCallSuper.java
+++ b/test/transform/resource/before/ValueCallSuper.java
@@ -1,7 +1,7 @@
-//CONF: lombok.equalsAndHashCode.callSuper = call
-
-class ValueParent {
-}
-@lombok.Value
-class ValueCallSuper extends ValueParent {
-}
+//CONF: lombok.equalsAndHashCode.callSuper = call
+
+class ValueParent {
+}
+@lombok.Value
+class ValueCallSuper extends ValueParent {
+}
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/before/WithPlain.java b/test/transform/resource/before/WithPlain.java
index 4f048242..9be8d4d5 100644
--- a/test/transform/resource/before/WithPlain.java
+++ b/test/transform/resource/before/WithPlain.java
@@ -1,3 +1,4 @@
+//version 8: springframework dep is too new to run on j6
 //CONF: lombok.addNullAnnotations = spring
 import lombok.With;
 class WithPlain {