fixing tests to account for generation of javax.annotation.Generated and ConstructorProperties being default-off.

234 files changed, 819 insertions, 1667 deletions

diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java
index 426b3863..2773a17b 100644
--- a/test/transform/resource/after-delombok/Accessors.java
+++ b/test/transform/resource/after-delombok/Accessors.java
@@ -1,12 +1,10 @@
 class AccessorsFluent {
 	private String fieldName = "";
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String fieldName() {
 		return this.fieldName;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public AccessorsFluent fieldName(final String fieldName) {
 		this.fieldName = fieldName;
 		return this;
@@ -16,17 +14,14 @@ class AccessorsFluentOnClass {
 	private String fieldName = "";
 	private String otherFieldWithOverride = "";
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String fieldName() {
 		return this.fieldName;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getOtherFieldWithOverride() {
 		return this.otherFieldWithOverride;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public AccessorsFluentOnClass fieldName(final String fieldName) {
 		this.fieldName = fieldName;
 		return this;
@@ -35,7 +30,6 @@ class AccessorsFluentOnClass {
 class AccessorsChain {
 	private boolean isRunning;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public AccessorsChain setRunning(final boolean isRunning) {
 		this.isRunning = isRunning;
 		return this;
@@ -45,7 +39,6 @@ class AccessorsPrefix {
 	private String fieldName;
 	private String fActualField;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setActualField(final String fActualField) {
 		this.fActualField = fActualField;
 	}
@@ -54,12 +47,10 @@ class AccessorsPrefix2 {
 	private String fieldName;
 	private String fActualField;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setFieldName(final String fieldName) {
 		this.fieldName = fieldName;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setActualField(final String fActualField) {
 		this.fActualField = fActualField;
 	}
@@ -71,13 +62,11 @@ class AccessorsPrefix3 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "AccessorsPrefix3(fName=" + this.getName() + ")";
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof AccessorsPrefix3)) return false;
@@ -89,13 +78,11 @@ class AccessorsPrefix3 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof AccessorsPrefix3;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -107,7 +94,6 @@ class AccessorsPrefix3 {
 class AccessorsFluentGenerics<T extends Number> {
 	private String name;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public AccessorsFluentGenerics<T> name(final String name) {
 		this.name = name;
 		return this;
@@ -116,7 +102,6 @@ class AccessorsFluentGenerics<T extends Number> {
 class AccessorsFluentNoChaining {
 	private String name;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void name(final String name) {
 		this.name = name;
 	}
@@ -124,7 +109,6 @@ class AccessorsFluentNoChaining {
 class AccessorsFluentStatic<T extends Number> {
 	private static String name;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static void name(final String name) {
 		AccessorsFluentStatic.name = name;
 	}
diff --git a/test/transform/resource/after-delombok/AccessorsConfiguration.java b/test/transform/resource/after-delombok/AccessorsConfiguration.java
index 0094c55c..f6604970 100644
--- a/test/transform/resource/after-delombok/AccessorsConfiguration.java
+++ b/test/transform/resource/after-delombok/AccessorsConfiguration.java
@@ -1,12 +1,10 @@
 class AccessorsConfiguration {
 	private String m_FieldName = "";
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String fieldName() {
 		return this.m_FieldName;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void fieldName(final String m_FieldName) {
 		this.m_FieldName = m_FieldName;
 	}
@@ -14,7 +12,6 @@ class AccessorsConfiguration {
 class AccessorsConfiguration2 {
 	private String m_FieldName = "";
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setM_FieldName(final String m_FieldName) {
 		this.m_FieldName = m_FieldName;
 	}
@@ -22,7 +19,6 @@ class AccessorsConfiguration2 {
 class AccessorsConfiguration3 {
 	private String fFieldName = "";
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public AccessorsConfiguration3 setFieldName(final String fFieldName) {
 		this.fFieldName = fFieldName;
 		return this;
diff --git a/test/transform/resource/after-delombok/BuilderChainAndFluent.java b/test/transform/resource/after-delombok/BuilderChainAndFluent.java
index 9a93ab7d..f9833be6 100644
--- a/test/transform/resource/after-delombok/BuilderChainAndFluent.java
+++ b/test/transform/resource/after-delombok/BuilderChainAndFluent.java
@@ -1,40 +1,31 @@
 class BuilderChainAndFluent {
 	private final int yes;
-	@java.beans.ConstructorProperties({"yes"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderChainAndFluent(final int yes) {
 		this.yes = yes;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderChainAndFluentBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int yes;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderChainAndFluentBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public void setYes(final int yes) {
 			this.yes = yes;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderChainAndFluent build() {
 			return new BuilderChainAndFluent(yes);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static BuilderChainAndFluentBuilder builder() {
 		return new BuilderChainAndFluentBuilder();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java
index 937628f9..a89d7114 100644
--- a/test/transform/resource/after-delombok/BuilderComplex.java
+++ b/test/transform/resource/after-delombok/BuilderComplex.java
@@ -3,62 +3,49 @@ class BuilderComplex {
 	private static <T extends Number> void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class VoidBuilder<T extends Number> {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private T number;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int arg2;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private String arg3;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private BuilderComplex selfRef;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		VoidBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public VoidBuilder<T> number(final T number) {
 			this.number = number;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public VoidBuilder<T> arg2(final int arg2) {
 			this.arg2 = arg2;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public VoidBuilder<T> arg3(final String arg3) {
 			this.arg3 = arg3;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public VoidBuilder<T> selfRef(final BuilderComplex selfRef) {
 			this.selfRef = selfRef;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public void execute() {
 			BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderComplex.VoidBuilder(number=" + this.number + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ", selfRef=" + this.selfRef + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static <T extends Number> VoidBuilder<T> builder() {
 		return new VoidBuilder<T>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderDefaults.java b/test/transform/resource/after-delombok/BuilderDefaults.java
index 475b7558..02fb9727 100644
--- a/test/transform/resource/after-delombok/BuilderDefaults.java
+++ b/test/transform/resource/after-delombok/BuilderDefaults.java
@@ -3,100 +3,79 @@ public final class BuilderDefaults {
 	private final String name;
 	private final long z;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static int $default$x() {
 		return 10;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static long $default$z() {
 		return System.currentTimeMillis();
 	}
-	@java.beans.ConstructorProperties({"x", "name", "z"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderDefaults(final int x, final String name, final long z) {
 		this.x = x;
 		this.name = name;
 		this.z = z;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderDefaultsBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private boolean x$set;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int x;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private String name;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private boolean z$set;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private long z;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderDefaultsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderDefaultsBuilder x(final int x) {
 			this.x = x;
 			x$set = true;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderDefaultsBuilder name(final String name) {
 			this.name = name;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderDefaultsBuilder z(final long z) {
 			this.z = z;
 			z$set = true;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderDefaults build() {
 			return new BuilderDefaults(x$set ? x : BuilderDefaults.$default$x(), name, z$set ? z : BuilderDefaults.$default$z());
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderDefaults.BuilderDefaultsBuilder(x=" + this.x + ", name=" + this.name + ", z=" + this.z + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static BuilderDefaultsBuilder builder() {
 		return new BuilderDefaultsBuilder();
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public long getZ() {
 		return this.z;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof BuilderDefaults)) return false;
@@ -110,7 +89,6 @@ public final class BuilderDefaults {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -123,7 +101,6 @@ public final class BuilderDefaults {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "BuilderDefaults(x=" + this.getX() + ", name=" + this.getName() + ", z=" + this.getZ() + ")";
 	}
diff --git a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
index 97c94137..7e645dc1 100644
--- a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
+++ b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
@@ -3,64 +3,51 @@ public class BuilderDefaultsWarnings {
 	final int y = 5;
 	int z;
 	java.util.List<String> items;
-	@java.beans.ConstructorProperties({"x", "z", "items"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderDefaultsWarnings(final long x, final int z, final java.util.List<String> items) {
 		this.x = x;
 		this.z = z;
 		this.items = items;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderDefaultsWarningsBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private long x;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int z;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<String> items;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderDefaultsWarningsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderDefaultsWarningsBuilder x(final long x) {
 			this.x = x;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderDefaultsWarningsBuilder z(final int z) {
 			this.z = z;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderDefaultsWarningsBuilder item(final String item) {
 			if (this.items == null) this.items = new java.util.ArrayList<String>();
 			this.items.add(item);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderDefaultsWarningsBuilder items(final java.util.Collection<? extends String> items) {
 			if (this.items == null) this.items = new java.util.ArrayList<String>();
 			this.items.addAll(items);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderDefaultsWarningsBuilder clearItems() {
 			if (this.items != null) this.items.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderDefaultsWarnings build() {
 			java.util.List<String> items;
 			switch (this.items == null ? 0 : this.items.size()) {
@@ -77,13 +64,11 @@ public class BuilderDefaultsWarnings {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(x=" + this.x + ", z=" + this.z + ", items=" + this.items + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static BuilderDefaultsWarningsBuilder builder() {
 		return new BuilderDefaultsWarningsBuilder();
 	}
@@ -93,26 +78,21 @@ class NoBuilderButHasDefaults {
 	public NoBuilderButHasDefaults() {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class NoBuilderButHasDefaultsBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		NoBuilderButHasDefaultsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public NoBuilderButHasDefaults build() {
 			return new NoBuilderButHasDefaults();
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder()";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static NoBuilderButHasDefaultsBuilder builder() {
 		return new NoBuilderButHasDefaultsBuilder();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderInstanceMethod.java b/test/transform/resource/after-delombok/BuilderInstanceMethod.java
index 61e237d0..12b76a8f 100644
--- a/test/transform/resource/after-delombok/BuilderInstanceMethod.java
+++ b/test/transform/resource/after-delombok/BuilderInstanceMethod.java
@@ -4,62 +4,49 @@ class BuilderInstanceMethod<T> {
 		return "" + show + yes + also + $andMe;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public class StringBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int show;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int yes;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private List<T> also;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int $andMe;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		StringBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public StringBuilder show(final int show) {
 			this.show = show;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public StringBuilder yes(final int yes) {
 			this.yes = yes;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public StringBuilder also(final List<T> also) {
 			this.also = also;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public StringBuilder $andMe(final int $andMe) {
 			this.$andMe = $andMe;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public String build() {
 			return BuilderInstanceMethod.this.create(show, yes, also, $andMe);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderInstanceMethod.StringBuilder(show=" + this.show + ", yes=" + this.yes + ", also=" + this.also + ", $andMe=" + this.$andMe + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public StringBuilder builder() {
 		return new StringBuilder();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSimple.java b/test/transform/resource/after-delombok/BuilderSimple.java
index 138127b6..e3821c9a 100644
--- a/test/transform/resource/after-delombok/BuilderSimple.java
+++ b/test/transform/resource/after-delombok/BuilderSimple.java
@@ -4,52 +4,41 @@ class BuilderSimple<T> {
 	private final int yes;
 	private List<T> also;
 	private int $butNotMe;
-	@java.beans.ConstructorProperties({"yes", "also"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderSimple(final int yes, final List<T> also) {
 		this.yes = yes;
 		this.also = also;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderSimpleBuilder<T> {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int yes;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private List<T> also;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderSimpleBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSimpleBuilder<T> yes(final int yes) {
 			this.yes = yes;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSimpleBuilder<T> also(final List<T> also) {
 			this.also = also;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSimple<T> build() {
 			return new BuilderSimple<T>(yes, also);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes + ", also=" + this.also + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static <T> BuilderSimpleBuilder<T> builder() {
 		return new BuilderSimpleBuilder<T>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
index a6c475f3..cf90e883 100644
--- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
+++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
@@ -10,9 +10,7 @@ class BuilderSingularGuavaListsSets<T> {
 	private ImmutableSet rawSet;
 	private ImmutableSortedSet<String> passes;
 	private ImmutableTable<? extends Number, ? extends Number, String> users;
-	@java.beans.ConstructorProperties({"cards", "frogs", "rawSet", "passes", "users"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) {
 		this.cards = cards;
 		this.frogs = frogs;
@@ -21,129 +19,106 @@ class BuilderSingularGuavaListsSets<T> {
 		this.users = users;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularGuavaListsSetsBuilder<T> {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableList.Builder<T> cards;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableList.Builder<Number> frogs;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableSortedSet.Builder<String> passes;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderSingularGuavaListsSetsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> card(final T card) {
 			if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
 			this.cards.add(card);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> cards) {
 			if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
 			this.cards.addAll(cards);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> clearCards() {
 			this.cards = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> frog(final Number frog) {
 			if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
 			this.frogs.add(frog);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> frogs) {
 			if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
 			this.frogs.addAll(frogs);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() {
 			this.frogs = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
 			if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
 			this.rawSet.add(rawSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Iterable<?> rawSet) {
 			if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
 			this.rawSet.addAll(rawSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() {
 			this.rawSet = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> pass(final String pass) {
 			if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
 			this.passes.add(pass);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> passes) {
 			if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
 			this.passes.addAll(passes);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> clearPasses() {
 			this.passes = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> user(final Number rowKey, final Number columnKey, final String value) {
 			if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder();
 			this.users.put(rowKey, columnKey, value);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> users(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
 			if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder();
 			this.users.putAll(users);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> clearUsers() {
 			this.users = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSets<T> build() {
 			com.google.common.collect.ImmutableList<T> cards = this.cards == null ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build();
 			com.google.common.collect.ImmutableCollection<Number> frogs = this.frogs == null ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build();
@@ -154,13 +129,11 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ", users=" + this.users + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static <T> BuilderSingularGuavaListsSetsBuilder<T> builder() {
 		return new BuilderSingularGuavaListsSetsBuilder<T>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
index 7d7f996e..e29c7e94 100644
--- a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
+++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
@@ -6,92 +6,75 @@ class BuilderSingularGuavaMaps<K, V> {
 	private ImmutableSortedMap<Integer, ? extends V> vertices;
 	@SuppressWarnings("all")
 	private ImmutableBiMap rawMap;
-	@java.beans.ConstructorProperties({"battleaxes", "vertices", "rawMap"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
 		this.battleaxes = battleaxes;
 		this.vertices = vertices;
 		this.rawMap = rawMap;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularGuavaMapsBuilder<K, V> {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderSingularGuavaMapsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> battleaxe(final K key, final V value) {
 			if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder();
 			this.battleaxes.put(key, value);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> battleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) {
 			if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder();
 			this.battleaxes.putAll(battleaxes);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() {
 			this.battleaxes = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> vertex(final Integer key, final V value) {
 			if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
 			this.vertices.put(key, value);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> vertices(final java.util.Map<? extends Integer, ? extends V> vertices) {
 			if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
 			this.vertices.putAll(vertices);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> clearVertices() {
 			this.vertices = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.lang.Object key, final java.lang.Object value) {
 			if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
 			this.rawMap.put(key, value);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
 			if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
 			this.rawMap.putAll(rawMap);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() {
 			this.rawMap = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMaps<K, V> build() {
 			com.google.common.collect.ImmutableMap<K, V> battleaxes = this.battleaxes == null ? com.google.common.collect.ImmutableMap.<K, V>of() : this.battleaxes.build();
 			com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = this.vertices == null ? com.google.common.collect.ImmutableSortedMap.<Integer, V>of() : this.vertices.build();
@@ -100,13 +83,11 @@ class BuilderSingularGuavaMaps<K, V> {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static <K, V> BuilderSingularGuavaMapsBuilder<K, V> builder() {
 		return new BuilderSingularGuavaMapsBuilder<K, V>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java
index 6df4d2b9..a0be0c12 100644
--- a/test/transform/resource/after-delombok/BuilderSingularLists.java
+++ b/test/transform/resource/after-delombok/BuilderSingularLists.java
@@ -5,92 +5,75 @@ class BuilderSingularLists<T> {
 	private Collection<? extends Number> scarves;
 	@SuppressWarnings("all")
 	private List rawList;
-	@java.beans.ConstructorProperties({"children", "scarves", "rawList"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
 		this.children = children;
 		this.scarves = scarves;
 		this.rawList = rawList;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularListsBuilder<T> {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<T> children;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<Number> scarves;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<java.lang.Object> rawList;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderSingularListsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> child(final T child) {
 			if (this.children == null) this.children = new java.util.ArrayList<T>();
 			this.children.add(child);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> children(final java.util.Collection<? extends T> children) {
 			if (this.children == null) this.children = new java.util.ArrayList<T>();
 			this.children.addAll(children);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> clearChildren() {
 			if (this.children != null) this.children.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> scarf(final Number scarf) {
 			if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
 			this.scarves.add(scarf);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) {
 			if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
 			this.scarves.addAll(scarves);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> clearScarves() {
 			if (this.scarves != null) this.scarves.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> rawList(final java.lang.Object rawList) {
 			if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
 			this.rawList.add(rawList);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> rawList(final java.util.Collection<?> rawList) {
 			if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
 			this.rawList.addAll(rawList);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> clearRawList() {
 			if (this.rawList != null) this.rawList.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularLists<T> build() {
 			java.util.List<T> children;
 			switch (this.children == null ? 0 : this.children.size()) {
@@ -129,13 +112,11 @@ class BuilderSingularLists<T> {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static <T> BuilderSingularListsBuilder<T> builder() {
 		return new BuilderSingularListsBuilder<T>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularMaps.java b/test/transform/resource/after-delombok/BuilderSingularMaps.java
index 90e97d8f..6520568b 100644
--- a/test/transform/resource/after-delombok/BuilderSingularMaps.java
+++ b/test/transform/resource/after-delombok/BuilderSingularMaps.java
@@ -6,7 +6,6 @@ class BuilderSingularMaps<K, V> {
 	@SuppressWarnings("all")
 	private Map rawMap;
 	private Map<String, V> stringMap;
-	@java.beans.ConstructorProperties({"women", "men", "rawMap", "stringMap"})
 	@SuppressWarnings("all")
 	BuilderSingularMaps(Map<K, V> women, SortedMap<K, ? extends Number> men, Map rawMap, Map<String, V> stringMap) {
 		this.women = women;
diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java
index 973f024a..189408da 100644
--- a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java
+++ b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java
@@ -3,92 +3,75 @@ class BuilderSingularNoAuto {
 	private List<String> things;
 	private List<String> widgets;
 	private List<String> items;
-	@java.beans.ConstructorProperties({"things", "widgets", "items"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderSingularNoAuto(final List<String> things, final List<String> widgets, final List<String> items) {
 		this.things = things;
 		this.widgets = widgets;
 		this.items = items;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularNoAutoBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<String> things;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<String> widgets;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<String> items;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderSingularNoAutoBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutoBuilder things(final String things) {
 			if (this.things == null) this.things = new java.util.ArrayList<String>();
 			this.things.add(things);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutoBuilder things(final java.util.Collection<? extends String> things) {
 			if (this.things == null) this.things = new java.util.ArrayList<String>();
 			this.things.addAll(things);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutoBuilder clearThings() {
 			if (this.things != null) this.things.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutoBuilder widget(final String widget) {
 			if (this.widgets == null) this.widgets = new java.util.ArrayList<String>();
 			this.widgets.add(widget);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutoBuilder widgets(final java.util.Collection<? extends String> widgets) {
 			if (this.widgets == null) this.widgets = new java.util.ArrayList<String>();
 			this.widgets.addAll(widgets);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutoBuilder clearWidgets() {
 			if (this.widgets != null) this.widgets.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutoBuilder items(final String items) {
 			if (this.items == null) this.items = new java.util.ArrayList<String>();
 			this.items.add(items);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutoBuilder items(final java.util.Collection<? extends String> items) {
 			if (this.items == null) this.items = new java.util.ArrayList<String>();
 			this.items.addAll(items);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutoBuilder clearItems() {
 			if (this.items != null) this.items.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAuto build() {
 			java.util.List<String> things;
 			switch (this.things == null ? 0 : this.things.size()) {
@@ -127,13 +110,11 @@ class BuilderSingularNoAuto {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static BuilderSingularNoAutoBuilder builder() {
 		return new BuilderSingularNoAutoBuilder();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java
index d0ad06f6..938f3bbc 100644
--- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java
+++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java
@@ -5,92 +5,75 @@ class BuilderSingularRedirectToGuava {
 	private Set<String> dangerMice;
 	private NavigableMap<Integer, Number> things;
 	private Collection<Class<?>> doohickeys;
-	@java.beans.ConstructorProperties({"dangerMice", "things", "doohickeys"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
 		this.dangerMice = dangerMice;
 		this.things = things;
 		this.doohickeys = doohickeys;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularRedirectToGuavaBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableSet.Builder<String> dangerMice;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderSingularRedirectToGuavaBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) {
 			if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder();
 			this.dangerMice.add(dangerMouse);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable<? extends String> dangerMice) {
 			if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder();
 			this.dangerMice.addAll(dangerMice);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuavaBuilder clearDangerMice() {
 			this.dangerMice = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuavaBuilder thing(final Integer key, final Number value) {
 			if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
 			this.things.put(key, value);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuavaBuilder things(final java.util.Map<? extends Integer, ? extends Number> things) {
 			if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
 			this.things.putAll(things);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuavaBuilder clearThings() {
 			this.things = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuavaBuilder doohickey(final Class<?> doohickey) {
 			if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder();
 			this.doohickeys.add(doohickey);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) {
 			if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder();
 			this.doohickeys.addAll(doohickeys);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuavaBuilder clearDoohickeys() {
 			this.doohickeys = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuava build() {
 			java.util.Set<String> dangerMice = this.dangerMice == null ? com.google.common.collect.ImmutableSet.<String>of() : this.dangerMice.build();
 			java.util.NavigableMap<Integer, Number> things = this.things == null ? com.google.common.collect.ImmutableSortedMap.<Integer, Number>of() : this.things.build();
@@ -99,13 +82,11 @@ class BuilderSingularRedirectToGuava {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static BuilderSingularRedirectToGuavaBuilder builder() {
 		return new BuilderSingularRedirectToGuavaBuilder();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularSets.java b/test/transform/resource/after-delombok/BuilderSingularSets.java
index 8afdf5d0..2d75b294 100644
--- a/test/transform/resource/after-delombok/BuilderSingularSets.java
+++ b/test/transform/resource/after-delombok/BuilderSingularSets.java
@@ -6,9 +6,7 @@ class BuilderSingularSets<T> {
 	@SuppressWarnings("all")
 	private Set rawSet;
 	private Set<String> stringSet;
-	@java.beans.ConstructorProperties({"dangerMice", "octopodes", "rawSet", "stringSet"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) {
 		this.dangerMice = dangerMice;
 		this.octopodes = octopodes;
@@ -16,106 +14,87 @@ class BuilderSingularSets<T> {
 		this.stringSet = stringSet;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularSetsBuilder<T> {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<T> dangerMice;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<Number> octopodes;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<java.lang.Object> rawSet;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<String> stringSet;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderSingularSetsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> dangerMouse(final T dangerMouse) {
 			if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>();
 			this.dangerMice.add(dangerMouse);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> dangerMice(final java.util.Collection<? extends T> dangerMice) {
 			if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>();
 			this.dangerMice.addAll(dangerMice);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> clearDangerMice() {
 			if (this.dangerMice != null) this.dangerMice.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> octopus(final Number octopus) {
 			if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>();
 			this.octopodes.add(octopus);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> octopodes(final java.util.Collection<? extends Number> octopodes) {
 			if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>();
 			this.octopodes.addAll(octopodes);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> clearOctopodes() {
 			if (this.octopodes != null) this.octopodes.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
 			if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>();
 			this.rawSet.add(rawSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> rawSet(final java.util.Collection<?> rawSet) {
 			if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>();
 			this.rawSet.addAll(rawSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> clearRawSet() {
 			if (this.rawSet != null) this.rawSet.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> stringSet(final String stringSet) {
 			if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>();
 			this.stringSet.add(stringSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> stringSet(final java.util.Collection<? extends String> stringSet) {
 			if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>();
 			this.stringSet.addAll(stringSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> clearStringSet() {
 			if (this.stringSet != null) this.stringSet.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularSets<T> build() {
 			java.util.Set<T> dangerMice;
 			switch (this.dangerMice == null ? 0 : this.dangerMice.size()) {
@@ -163,13 +142,11 @@ class BuilderSingularSets<T> {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static <T> BuilderSingularSetsBuilder<T> builder() {
 		return new BuilderSingularSetsBuilder<T>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java b/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java
index 4eee4fc2..e103d6dd 100644
--- a/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java
+++ b/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java
@@ -1,43 +1,34 @@
 class BuilderSingularWithPrefixes {
 	private java.util.List<String> _elems;
-	@java.beans.ConstructorProperties({"elems"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderSingularWithPrefixes(final java.util.List<String> elems) {
 		this._elems = elems;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularWithPrefixesBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<String> elems;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderSingularWithPrefixesBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularWithPrefixesBuilder elem(final String elem) {
 			if (this.elems == null) this.elems = new java.util.ArrayList<String>();
 			this.elems.add(elem);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularWithPrefixesBuilder elems(final java.util.Collection<? extends String> elems) {
 			if (this.elems == null) this.elems = new java.util.ArrayList<String>();
 			this.elems.addAll(elems);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularWithPrefixesBuilder clearElems() {
 			if (this.elems != null) this.elems.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderSingularWithPrefixes build() {
 			java.util.List<String> elems;
 			switch (this.elems == null ? 0 : this.elems.size()) {
@@ -54,13 +45,11 @@ class BuilderSingularWithPrefixes {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static BuilderSingularWithPrefixesBuilder builder() {
 		return new BuilderSingularWithPrefixesBuilder();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderValueData.java b/test/transform/resource/after-delombok/BuilderValueData.java
index d08c6149..e1c107da 100644
--- a/test/transform/resource/after-delombok/BuilderValueData.java
+++ b/test/transform/resource/after-delombok/BuilderValueData.java
@@ -2,41 +2,33 @@ import java.util.List;
 final class BuilderAndValue {
 	private final int zero = 0;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderAndValue() {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderAndValueBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderAndValueBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderAndValue build() {
 			return new BuilderAndValue();
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderAndValue.BuilderAndValueBuilder()";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static BuilderAndValueBuilder builder() {
 		return new BuilderAndValueBuilder();
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getZero() {
 		return this.zero;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof BuilderAndValue)) return false;
@@ -46,7 +38,6 @@ final class BuilderAndValue {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -55,7 +46,6 @@ final class BuilderAndValue {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "BuilderAndValue(zero=" + this.getZero() + ")";
 	}
@@ -64,41 +54,33 @@ final class BuilderAndValue {
 class BuilderAndData {
 	private final int zero = 0;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderAndData() {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderAndDataBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderAndDataBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderAndData build() {
 			return new BuilderAndData();
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderAndData.BuilderAndDataBuilder()";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static BuilderAndDataBuilder builder() {
 		return new BuilderAndDataBuilder();
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getZero() {
 		return this.zero;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof BuilderAndData)) return false;
@@ -108,13 +90,11 @@ class BuilderAndData {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof BuilderAndData;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -123,7 +103,6 @@ class BuilderAndData {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "BuilderAndData(zero=" + this.getZero() + ")";
 	}
diff --git a/test/transform/resource/after-delombok/BuilderWithAccessors.java b/test/transform/resource/after-delombok/BuilderWithAccessors.java
index 1f9a1f22..e6a6da79 100644
--- a/test/transform/resource/after-delombok/BuilderWithAccessors.java
+++ b/test/transform/resource/after-delombok/BuilderWithAccessors.java
@@ -3,9 +3,7 @@ class BuilderWithAccessors {
 	private final int pUpper;
 	private int _foo;
 	private int __bar;
-	@java.beans.ConstructorProperties({"plower", "upper", "foo", "_bar"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) {
 		this.plower = plower;
 		this.pUpper = upper;
@@ -13,62 +11,49 @@ class BuilderWithAccessors {
 		this.__bar = _bar;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderWithAccessorsBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int plower;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int upper;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int foo;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int _bar;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderWithAccessorsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithAccessorsBuilder plower(final int plower) {
 			this.plower = plower;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithAccessorsBuilder upper(final int upper) {
 			this.upper = upper;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithAccessorsBuilder foo(final int foo) {
 			this.foo = foo;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithAccessorsBuilder _bar(final int _bar) {
 			this._bar = _bar;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithAccessors build() {
 			return new BuilderWithAccessors(plower, upper, foo, _bar);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static BuilderWithAccessorsBuilder builder() {
 		return new BuilderWithAccessorsBuilder();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecated.java b/test/transform/resource/after-delombok/BuilderWithDeprecated.java
index 766f23a6..cd887529 100644
--- a/test/transform/resource/after-delombok/BuilderWithDeprecated.java
+++ b/test/transform/resource/after-delombok/BuilderWithDeprecated.java
@@ -10,9 +10,7 @@ public class BuilderWithDeprecated {
 	java.util.List<String> strings;
 	@Deprecated
 	ImmutableList<Integer> numbers;
-	@java.beans.ConstructorProperties({"dep1", "dep2", "strings", "numbers"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List<String> strings, final ImmutableList<Integer> numbers) {
 		this.dep1 = dep1;
 		this.dep2 = dep2;
@@ -20,41 +18,32 @@ public class BuilderWithDeprecated {
 		this.numbers = numbers;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderWithDeprecatedBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private String dep1;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int dep2;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<String> strings;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableList.Builder<Integer> numbers;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderWithDeprecatedBuilder() {
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithDeprecatedBuilder dep1(final String dep1) {
 			this.dep1 = dep1;
 			return this;
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithDeprecatedBuilder dep2(final int dep2) {
 			this.dep2 = dep2;
 			return this;
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithDeprecatedBuilder string(final String string) {
 			if (this.strings == null) this.strings = new java.util.ArrayList<String>();
 			this.strings.add(string);
@@ -62,7 +51,6 @@ public class BuilderWithDeprecated {
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithDeprecatedBuilder strings(final java.util.Collection<? extends String> strings) {
 			if (this.strings == null) this.strings = new java.util.ArrayList<String>();
 			this.strings.addAll(strings);
@@ -70,14 +58,12 @@ public class BuilderWithDeprecated {
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithDeprecatedBuilder clearStrings() {
 			if (this.strings != null) this.strings.clear();
 			return this;
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithDeprecatedBuilder number(final Integer number) {
 			if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder();
 			this.numbers.add(number);
@@ -85,7 +71,6 @@ public class BuilderWithDeprecated {
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithDeprecatedBuilder numbers(final java.lang.Iterable<? extends Integer> numbers) {
 			if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder();
 			this.numbers.addAll(numbers);
@@ -93,13 +78,11 @@ public class BuilderWithDeprecated {
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithDeprecatedBuilder clearNumbers() {
 			this.numbers = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithDeprecated build() {
 			java.util.List<String> strings;
 			switch (this.strings == null ? 0 : this.strings.size()) {
@@ -117,13 +100,11 @@ public class BuilderWithDeprecated {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderWithDeprecated.BuilderWithDeprecatedBuilder(dep1=" + this.dep1 + ", dep2=" + this.dep2 + ", strings=" + this.strings + ", numbers=" + this.numbers + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static BuilderWithDeprecatedBuilder builder() {
 		return new BuilderWithDeprecatedBuilder();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
index 03692529..15293470 100644
--- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
+++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
@@ -4,44 +4,36 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
 	}
 	public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private boolean arg2;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private String arg3;
 		private Z arg1;
 		public void arg2(boolean arg) {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderWithExistingBuilderClassBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) {
 			this.arg1 = arg1;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) {
 			this.arg3 = arg3;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithExistingBuilderClass build() {
 			return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static <Z extends Number> BuilderWithExistingBuilderClassBuilder<Z> builder() {
 		return new BuilderWithExistingBuilderClassBuilder<Z>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java b/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java
index 0f0efe00..7fb300e4 100644
--- a/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java
+++ b/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java
@@ -5,68 +5,54 @@ public class BuilderWithRecursiveGenerics {
 	public static final class Test<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
 		private final Foo foo;
 		private final Bar bar;
-		@java.beans.ConstructorProperties({"foo", "bar"})
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		Test(final Foo foo, final Bar bar) {
 			this.foo = foo;
 			this.bar = bar;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public static class TestBuilder<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			private Foo foo;
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			private Bar bar;
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			TestBuilder() {
 			}
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public TestBuilder<Foo, Bar, Quz> foo(final Foo foo) {
 				this.foo = foo;
 				return this;
 			}
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public TestBuilder<Foo, Bar, Quz> bar(final Bar bar) {
 				this.bar = bar;
 				return this;
 			}
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public Test<Foo, Bar, Quz> build() {
 				return new Test<Foo, Bar, Quz>(foo, bar);
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public java.lang.String toString() {
 				return "BuilderWithRecursiveGenerics.Test.TestBuilder(foo=" + this.foo + ", bar=" + this.bar + ")";
 			}
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public static <Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> TestBuilder<Foo, Bar, Quz> builder() {
 			return new TestBuilder<Foo, Bar, Quz>();
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public Foo getFoo() {
 			return this.foo;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public Bar getBar() {
 			return this.bar;
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public boolean equals(final java.lang.Object o) {
 			if (o == this) return true;
 			if (!(o instanceof BuilderWithRecursiveGenerics.Test)) return false;
@@ -81,7 +67,6 @@ public class BuilderWithRecursiveGenerics {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public int hashCode() {
 			final int PRIME = 59;
 			int result = 1;
@@ -93,7 +78,6 @@ public class BuilderWithRecursiveGenerics {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderWithRecursiveGenerics.Test(foo=" + this.getFoo() + ", bar=" + this.getBar() + ")";
 		}
diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilder.java b/test/transform/resource/after-delombok/BuilderWithToBuilder.java
index e1c7a92d..e2ce1966 100644
--- a/test/transform/resource/after-delombok/BuilderWithToBuilder.java
+++ b/test/transform/resource/after-delombok/BuilderWithToBuilder.java
@@ -7,9 +7,7 @@ class BuilderWithToBuilder<T> {
 	public static <K> K rrr(BuilderWithToBuilder<K> x) {
 		return x.foo;
 	}
-	@java.beans.ConstructorProperties({"one", "two", "foo", "bars"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderWithToBuilder(final String one, final String two, final T foo, final List<T> bars) {
 		this.mOne = one;
 		this.mTwo = two;
@@ -17,64 +15,51 @@ class BuilderWithToBuilder<T> {
 		this.bars = bars;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class BuilderWithToBuilderBuilder<T> {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private String one;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private String two;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private T foo;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<T> bars;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderWithToBuilderBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithToBuilderBuilder<T> one(final String one) {
 			this.one = one;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithToBuilderBuilder<T> two(final String two) {
 			this.two = two;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithToBuilderBuilder<T> foo(final T foo) {
 			this.foo = foo;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithToBuilderBuilder<T> bar(final T bar) {
 			if (this.bars == null) this.bars = new java.util.ArrayList<T>();
 			this.bars.add(bar);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithToBuilderBuilder<T> bars(final java.util.Collection<? extends T> bars) {
 			if (this.bars == null) this.bars = new java.util.ArrayList<T>();
 			this.bars.addAll(bars);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithToBuilderBuilder<T> clearBars() {
 			if (this.bars != null) this.bars.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithToBuilder<T> build() {
 			java.util.List<T> bars;
 			switch (this.bars == null ? 0 : this.bars.size()) {
@@ -91,18 +76,15 @@ class BuilderWithToBuilder<T> {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bars=" + this.bars + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static <T> BuilderWithToBuilderBuilder<T> builder() {
 		return new BuilderWithToBuilderBuilder<T>();
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public BuilderWithToBuilderBuilder<T> toBuilder() {
 		return new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(this.bars);
 	}
@@ -116,49 +98,39 @@ class ConstructorWithToBuilder<T> {
 	public ConstructorWithToBuilder(String mOne, T bar) {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class ConstructorWithToBuilderBuilder<T> {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private String mOne;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private T bar;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		ConstructorWithToBuilderBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public ConstructorWithToBuilderBuilder<T> mOne(final String mOne) {
 			this.mOne = mOne;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public ConstructorWithToBuilderBuilder<T> bar(final T bar) {
 			this.bar = bar;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public ConstructorWithToBuilder<T> build() {
 			return new ConstructorWithToBuilder<T>(mOne, bar);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne + ", bar=" + this.bar + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static <T> ConstructorWithToBuilderBuilder<T> builder() {
 		return new ConstructorWithToBuilderBuilder<T>();
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public ConstructorWithToBuilderBuilder<T> toBuilder() {
 		return new ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo);
 	}
@@ -174,49 +146,39 @@ class StaticWithToBuilder<T, K> {
 		return new StaticWithToBuilder<Z, String>();
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static class StaticWithToBuilderBuilder<Z> {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private String mOne;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private Z bar;
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		StaticWithToBuilderBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public StaticWithToBuilderBuilder<Z> mOne(final String mOne) {
 			this.mOne = mOne;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public StaticWithToBuilderBuilder<Z> bar(final Z bar) {
 			this.bar = bar;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public StaticWithToBuilder build() {
 			return StaticWithToBuilder.<Z>test(mOne, bar);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "StaticWithToBuilder.StaticWithToBuilderBuilder(mOne=" + this.mOne + ", bar=" + this.bar + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static <Z> StaticWithToBuilderBuilder<Z> builder() {
 		return new StaticWithToBuilderBuilder<Z>();
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public StaticWithToBuilderBuilder<T> toBuilder() {
 		return new StaticWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo);
 	}
diff --git a/test/transform/resource/after-delombok/BuilderWithTolerate.java b/test/transform/resource/after-delombok/BuilderWithTolerate.java
index 1992fd4b..6ec7c091 100644
--- a/test/transform/resource/after-delombok/BuilderWithTolerate.java
+++ b/test/transform/resource/after-delombok/BuilderWithTolerate.java
@@ -6,42 +6,34 @@ public class BuilderWithTolerate {
 	}
 	public static class BuilderWithTolerateBuilder {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private int value;
 		@Tolerate
 		public BuilderWithTolerateBuilder value(String s) {
 			return this.value(Integer.parseInt(s));
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		BuilderWithTolerateBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithTolerateBuilder value(final int value) {
 			this.value = value;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public BuilderWithTolerate build() {
 			return new BuilderWithTolerate(value);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value + ")";
 		}
 	}
-	@java.beans.ConstructorProperties({"value"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	BuilderWithTolerate(final int value) {
 		this.value = value;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static BuilderWithTolerateBuilder builder() {
 		return new BuilderWithTolerateBuilder();
 	}
diff --git a/test/transform/resource/after-delombok/ClassNamedAfterGetter.java b/test/transform/resource/after-delombok/ClassNamedAfterGetter.java
index 793ec097..769aaf7c 100644
--- a/test/transform/resource/after-delombok/ClassNamedAfterGetter.java
+++ b/test/transform/resource/after-delombok/ClassNamedAfterGetter.java
@@ -1,7 +1,6 @@
 class GetFoo {
 	private int foo;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getFoo() {
 		return this.foo;
 	}
diff --git a/test/transform/resource/after-delombok/CommentsInterspersed.java b/test/transform/resource/after-delombok/CommentsInterspersed.java
index a1da2c3d..833f2ce0 100644
--- a/test/transform/resource/after-delombok/CommentsInterspersed.java
+++ b/test/transform/resource/after-delombok/CommentsInterspersed.java
@@ -12,7 +12,6 @@ public class CommentsInterspersed {
 		javascript;
 	}-*/
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getTest() {
 		return this.test;
 	}
diff --git a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java
index 22a66c95..30aefaa0 100644
--- a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java
+++ b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java
@@ -1,7 +1,6 @@
 class ConflictingStaticConstructorNames {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof ConflictingStaticConstructorNames)) return false;
@@ -10,25 +9,21 @@ class ConflictingStaticConstructorNames {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof ConflictingStaticConstructorNames;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ConflictingStaticConstructorNames()";
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public ConflictingStaticConstructorNames() {
 	}
 }
diff --git a/test/transform/resource/after-delombok/Constructors.java b/test/transform/resource/after-delombok/Constructors.java
index b8eaa678..b2e51c40 100644
--- a/test/transform/resource/after-delombok/Constructors.java
+++ b/test/transform/resource/after-delombok/Constructors.java
@@ -1,9 +1,7 @@
 class RequiredArgsConstructor1 {
 	final int x;
 	String name;
-	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public RequiredArgsConstructor1(final int x) {
 		this.x = x;
 	}
@@ -11,9 +9,7 @@ class RequiredArgsConstructor1 {
 class RequiredArgsConstructorAccess {
 	final int x;
 	String name;
-	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected RequiredArgsConstructorAccess(final int x) {
 		this.x = x;
 	}
@@ -21,14 +17,11 @@ class RequiredArgsConstructorAccess {
 class RequiredArgsConstructorStaticName {
 	final int x;
 	String name;
-	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private RequiredArgsConstructorStaticName(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static RequiredArgsConstructorStaticName staticname(final int x) {
 		return new RequiredArgsConstructorStaticName(x);
 	}
@@ -36,10 +29,8 @@ class RequiredArgsConstructorStaticName {
 class RequiredArgsConstructorWithAnnotations {
 	final int x;
 	String name;
-	@java.beans.ConstructorProperties({"x"})
 	@Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public RequiredArgsConstructorWithAnnotations(final int x) {
 		this.x = x;
 	}
@@ -47,9 +38,7 @@ class RequiredArgsConstructorWithAnnotations {
 class AllArgsConstructor1 {
 	final int x;
 	String name;
-	@java.beans.ConstructorProperties({"x", "name"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public AllArgsConstructor1(final int x, final String name) {
 		this.x = x;
 		this.name = name;
@@ -59,21 +48,17 @@ class NoArgsConstructor1 {
 	int x;
 	String name;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public NoArgsConstructor1() {
 	}
 }
 class RequiredArgsConstructorStaticNameGenerics<T extends Number> {
 	final T x;
 	String name;
-	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private RequiredArgsConstructorStaticNameGenerics(final T x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static <T extends Number> RequiredArgsConstructorStaticNameGenerics<T> of(final T x) {
 		return new RequiredArgsConstructorStaticNameGenerics<T>(x);
 	}
@@ -81,23 +66,18 @@ class RequiredArgsConstructorStaticNameGenerics<T extends Number> {
 class RequiredArgsConstructorStaticNameGenerics2<T extends Number> {
 	final Class<T> x;
 	String name;
-	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static <T extends Number> RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) {
 		return new RequiredArgsConstructorStaticNameGenerics2<T>(x);
 	}
 }
 class AllArgsConstructorPackageAccess {
 	final String x;
-	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	AllArgsConstructorPackageAccess(final String x) {
 		this.x = x;
 	}
@@ -111,7 +91,6 @@ class NoArgsConstructor2 {
 	final String s;
 	byte z;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public NoArgsConstructor2() {
 		this.x = 0;
 		this.y = 0.0;
diff --git a/test/transform/resource/after-delombok/ConstructorsConfiguration.java b/test/transform/resource/after-delombok/ConstructorsConfiguration.java
index 40189911..47b0cc16 100644
--- a/test/transform/resource/after-delombok/ConstructorsConfiguration.java
+++ b/test/transform/resource/after-delombok/ConstructorsConfiguration.java
@@ -1,7 +1,6 @@
 class ConstructorsConfiguration {
 	int x;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public ConstructorsConfiguration(final int x) {
 		this.x = x;
 	}
diff --git a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
index 94ccde08..dd4ce12f 100644
--- a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
+++ b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
@@ -4,9 +4,7 @@ class ConstructorsWithAccessors {
 	int _huh;
 	int __huh2;
 
-	@java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) {
 		this.plower = plower;
 		this.pUpper = upper;
@@ -25,9 +23,7 @@ class ConstructorsWithAccessorsNonNull {
 	@lombok.NonNull
 	final Integer __huh2;
 
-	@java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public ConstructorsWithAccessorsNonNull(@lombok.NonNull final Integer plower, @lombok.NonNull final Integer upper, @lombok.NonNull final Integer huh, @lombok.NonNull final Integer _huh2) {
 		if (plower == null) {
 			throw new java.lang.NullPointerException("plower");
@@ -46,4 +42,4 @@ class ConstructorsWithAccessorsNonNull {
 		this._huh = huh;
 		this.__huh2 = _huh2;
 	}
-}
\ No newline at end of file
+}
diff --git a/test/transform/resource/after-delombok/DataConfiguration.java b/test/transform/resource/after-delombok/DataConfiguration.java
index 5057e9ed..b71e1c81 100644
--- a/test/transform/resource/after-delombok/DataConfiguration.java
+++ b/test/transform/resource/after-delombok/DataConfiguration.java
@@ -1,18 +1,15 @@
 class DataConfiguration {
 	final int x;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public DataConfiguration(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataConfiguration)) return false;
@@ -22,13 +19,11 @@ class DataConfiguration {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof DataConfiguration;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -37,7 +32,6 @@ class DataConfiguration {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "DataConfiguration(x=" + this.x + ")";
 	}
diff --git a/test/transform/resource/after-delombok/DataExtended.java b/test/transform/resource/after-delombok/DataExtended.java
index 04f0da0b..bcbf2293 100644
--- a/test/transform/resource/after-delombok/DataExtended.java
+++ b/test/transform/resource/after-delombok/DataExtended.java
@@ -1,22 +1,18 @@
 class DataExtended {
 	int x;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public DataExtended() {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setX(final int x) {
 		this.x = x;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataExtended)) return false;
@@ -26,13 +22,11 @@ class DataExtended {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof DataExtended;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -41,7 +35,6 @@ class DataExtended {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "DataExtended(x=" + this.x + ")";
 	}
diff --git a/test/transform/resource/after-delombok/DataIgnore.java b/test/transform/resource/after-delombok/DataIgnore.java
index dca235d3..309d8150 100644
--- a/test/transform/resource/after-delombok/DataIgnore.java
+++ b/test/transform/resource/after-delombok/DataIgnore.java
@@ -1,20 +1,16 @@
 class DataIgnore {
 	final int x;
 	String $name;
-	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public DataIgnore(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataIgnore)) return false;
@@ -24,13 +20,11 @@ class DataIgnore {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof DataIgnore;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -39,7 +33,6 @@ class DataIgnore {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "DataIgnore(x=" + this.getX() + ")";
 	}
diff --git a/test/transform/resource/after-delombok/DataOnEnum.java b/test/transform/resource/after-delombok/DataOnEnum.java
index bb973717..2486646b 100644
--- a/test/transform/resource/after-delombok/DataOnEnum.java
+++ b/test/transform/resource/after-delombok/DataOnEnum.java
@@ -2,19 +2,15 @@ public enum DataOnEnum {
 	A("hello");
 	private final String someField;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getSomeField() {
 		return this.someField;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "DataOnEnum(someField=" + this.getSomeField() + ")";
 	}
-	@java.beans.ConstructorProperties({"someField"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private DataOnEnum(final String someField) {
 		this.someField = someField;
 	}
diff --git a/test/transform/resource/after-delombok/DataOnLocalClass.java b/test/transform/resource/after-delombok/DataOnLocalClass.java
index 9fe16070..84817897 100644
--- a/test/transform/resource/after-delombok/DataOnLocalClass.java
+++ b/test/transform/resource/after-delombok/DataOnLocalClass.java
@@ -4,28 +4,23 @@ class DataOnLocalClass1 {
 			final int x;
 			String name;
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public Local(final int x) {
 				this.x = x;
 			}
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public int getX() {
 				return this.x;
 			}
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public String getName() {
 				return this.name;
 			}
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public void setName(final String name) {
 				this.name = name;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public boolean equals(final java.lang.Object o) {
 				if (o == this) return true;
 				if (!(o instanceof Local)) return false;
@@ -38,13 +33,11 @@ class DataOnLocalClass1 {
 				return true;
 			}
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			protected boolean canEqual(final java.lang.Object other) {
 				return other instanceof Local;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public int hashCode() {
 				final int PRIME = 59;
 				int result = 1;
@@ -55,7 +48,6 @@ class DataOnLocalClass1 {
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public java.lang.String toString() {
 				return "Local(x=" + this.getX() + ", name=" + this.getName() + ")";
 			}
@@ -70,7 +62,6 @@ class DataOnLocalClass2 {
 				@lombok.NonNull
 				String name;
 				@java.lang.SuppressWarnings("all")
-				@javax.annotation.Generated("lombok")
 				public InnerLocal(@lombok.NonNull final String name) {
 					if (name == null) {
 						throw new java.lang.NullPointerException("name");
@@ -79,12 +70,10 @@ class DataOnLocalClass2 {
 				}
 				@lombok.NonNull
 				@java.lang.SuppressWarnings("all")
-				@javax.annotation.Generated("lombok")
 				public String getName() {
 					return this.name;
 				}
 				@java.lang.SuppressWarnings("all")
-				@javax.annotation.Generated("lombok")
 				public void setName(@lombok.NonNull final String name) {
 					if (name == null) {
 						throw new java.lang.NullPointerException("name");
@@ -93,7 +82,6 @@ class DataOnLocalClass2 {
 				}
 				@java.lang.Override
 				@java.lang.SuppressWarnings("all")
-				@javax.annotation.Generated("lombok")
 				public boolean equals(final java.lang.Object o) {
 					if (o == this) return true;
 					if (!(o instanceof Local.InnerLocal)) return false;
@@ -105,13 +93,11 @@ class DataOnLocalClass2 {
 					return true;
 				}
 				@java.lang.SuppressWarnings("all")
-				@javax.annotation.Generated("lombok")
 				protected boolean canEqual(final java.lang.Object other) {
 					return other instanceof Local.InnerLocal;
 				}
 				@java.lang.Override
 				@java.lang.SuppressWarnings("all")
-				@javax.annotation.Generated("lombok")
 				public int hashCode() {
 					final int PRIME = 59;
 					int result = 1;
@@ -121,24 +107,20 @@ class DataOnLocalClass2 {
 				}
 				@java.lang.Override
 				@java.lang.SuppressWarnings("all")
-				@javax.annotation.Generated("lombok")
 				public java.lang.String toString() {
 					return "Local.InnerLocal(name=" + this.getName() + ")";
 				}
 			}
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public Local(final int x) {
 				this.x = x;
 			}
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public int getX() {
 				return this.x;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public boolean equals(final java.lang.Object o) {
 				if (o == this) return true;
 				if (!(o instanceof Local)) return false;
@@ -148,13 +130,11 @@ class DataOnLocalClass2 {
 				return true;
 			}
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			protected boolean canEqual(final java.lang.Object other) {
 				return other instanceof Local;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public int hashCode() {
 				final int PRIME = 59;
 				int result = 1;
@@ -163,7 +143,6 @@ class DataOnLocalClass2 {
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public java.lang.String toString() {
 				return "Local(x=" + this.getX() + ")";
 			}
diff --git a/test/transform/resource/after-delombok/DataPlain.java b/test/transform/resource/after-delombok/DataPlain.java
index b4178878..d54baef1 100644
--- a/test/transform/resource/after-delombok/DataPlain.java
+++ b/test/transform/resource/after-delombok/DataPlain.java
@@ -1,30 +1,24 @@
 class Data1 {
 	final int x;
 	String name;
-	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Data1(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setName(final String name) {
 		this.name = name;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data1)) return false;
@@ -37,13 +31,11 @@ class Data1 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof Data1;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -54,7 +46,6 @@ class Data1 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Data1(x=" + this.getX() + ", name=" + this.getName() + ")";
 	}
@@ -62,30 +53,24 @@ class Data1 {
 class Data2 {
 	final int x;
 	String name;
-	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Data2(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setName(final String name) {
 		this.name = name;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data2)) return false;
@@ -98,13 +83,11 @@ class Data2 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof Data2;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -115,7 +98,6 @@ class Data2 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Data2(x=" + this.getX() + ", name=" + this.getName() + ")";
 	}
@@ -123,30 +105,24 @@ class Data2 {
 final class Data3 {
 	final int x;
 	String name;
-	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Data3(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setName(final String name) {
 		this.name = name;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data3)) return false;
@@ -159,7 +135,6 @@ final class Data3 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -170,7 +145,6 @@ final class Data3 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Data3(x=" + this.getX() + ", name=" + this.getName() + ")";
 	}
@@ -180,24 +154,20 @@ final class Data4 extends java.util.Timer {
 	Data4() {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setX(final int x) {
 		this.x = x;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Data4(x=" + this.getX() + ")";
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data4)) return false;
@@ -208,13 +178,11 @@ final class Data4 extends java.util.Timer {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof Data4;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = super.hashCode();
@@ -224,12 +192,10 @@ final class Data4 extends java.util.Timer {
 }
 class Data5 {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Data5() {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data5)) return false;
@@ -238,32 +204,27 @@ class Data5 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof Data5;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Data5()";
 	}
 }
 final class Data6 {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Data6() {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data6)) return false;
@@ -271,14 +232,12 @@ final class Data6 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Data6()";
 	}
diff --git a/test/transform/resource/after-delombok/DataWithGetter.java b/test/transform/resource/after-delombok/DataWithGetter.java
index 85e698df..b4107bb3 100644
--- a/test/transform/resource/after-delombok/DataWithGetter.java
+++ b/test/transform/resource/after-delombok/DataWithGetter.java
@@ -2,25 +2,20 @@ class DataWithGetter {
 	private int x;
 	private int y;
 	private final String z;
-	@java.beans.ConstructorProperties({"z"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public DataWithGetter(final String z) {
 		this.z = z;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setX(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setY(final int y) {
 		this.y = y;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataWithGetter)) return false;
@@ -34,13 +29,11 @@ class DataWithGetter {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof DataWithGetter;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -52,22 +45,18 @@ class DataWithGetter {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "DataWithGetter(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")";
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getY() {
 		return this.y;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getZ() {
 		return this.z;
 	}
diff --git a/test/transform/resource/after-delombok/DataWithGetterNone.java b/test/transform/resource/after-delombok/DataWithGetterNone.java
index 8be06247..4467e407 100644
--- a/test/transform/resource/after-delombok/DataWithGetterNone.java
+++ b/test/transform/resource/after-delombok/DataWithGetterNone.java
@@ -2,25 +2,20 @@ class DataWithGetterNone {
 	private int x;
 	private int y;
 	private final String z;
-	@java.beans.ConstructorProperties({"z"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public DataWithGetterNone(final String z) {
 		this.z = z;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setX(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setY(final int y) {
 		this.y = y;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataWithGetterNone)) return false;
@@ -34,13 +29,11 @@ class DataWithGetterNone {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof DataWithGetterNone;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -52,7 +45,6 @@ class DataWithGetterNone {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "DataWithGetterNone(x=" + this.x + ", y=" + this.y + ", z=" + this.z + ")";
 	}
diff --git a/test/transform/resource/after-delombok/DelegateOnGetter.java b/test/transform/resource/after-delombok/DelegateOnGetter.java
index 8cb72788..f41259df 100644
--- a/test/transform/resource/after-delombok/DelegateOnGetter.java
+++ b/test/transform/resource/after-delombok/DelegateOnGetter.java
@@ -5,7 +5,6 @@ class DelegateOnGetter {
 		int getInt();
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Bar getBar() {
 		java.lang.Object value = this.bar.get();
 		if (value == null) {
@@ -27,12 +26,10 @@ class DelegateOnGetter {
 		return (Bar) (value == this.bar ? null : value);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setList(final java.util.ArrayList<java.lang.String> list) {
 		this.getBar().setList(list);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getInt() {
 		return this.getBar().getInt();
 	}
diff --git a/test/transform/resource/after-delombok/DelegateOnGetterNone.java b/test/transform/resource/after-delombok/DelegateOnGetterNone.java
index 49215748..1f6eb5be 100644
--- a/test/transform/resource/after-delombok/DelegateOnGetterNone.java
+++ b/test/transform/resource/after-delombok/DelegateOnGetterNone.java
@@ -5,12 +5,10 @@ class DelegateOnGetterNone {
 		int getInt();
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setList(final java.util.ArrayList<java.lang.String> list) {
 		this.bar.setList(list);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getInt() {
 		return this.bar.getInt();
 	}
diff --git a/test/transform/resource/after-delombok/DelegateOnMethods.java b/test/transform/resource/after-delombok/DelegateOnMethods.java
index 8028b48a..eb94c6d2 100644
--- a/test/transform/resource/after-delombok/DelegateOnMethods.java
+++ b/test/transform/resource/after-delombok/DelegateOnMethods.java
@@ -7,7 +7,6 @@ abstract class DelegateOnMethods {
 	
 	@java.lang.SuppressWarnings("all")
 	
-	@javax.annotation.Generated("lombok")
 	
 	public void bar(final java.util.ArrayList<java.lang.String> list) {
 		this.getBar().bar(list);
diff --git a/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java b/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java
index bc19b276..921669c7 100644
--- a/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java
+++ b/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java
@@ -25,7 +25,6 @@ class DelegatePlain {
 
 	@java.lang.SuppressWarnings("all")
 
-	@javax.annotation.Generated("lombok")
 
 	public void bar(final java.util.ArrayList<java.lang.String> list) {
 		this.bar.bar(list);
@@ -33,7 +32,6 @@ class DelegatePlain {
 
 	@java.lang.SuppressWarnings("all")
 
-	@javax.annotation.Generated("lombok")
 
 	public void foo() {
 		this.foo.foo();
diff --git a/test/transform/resource/after-delombok/DelegateWithDeprecated.java b/test/transform/resource/after-delombok/DelegateWithDeprecated.java
index 0bc89859..f487dc87 100644
--- a/test/transform/resource/after-delombok/DelegateWithDeprecated.java
+++ b/test/transform/resource/after-delombok/DelegateWithDeprecated.java
@@ -11,18 +11,15 @@ class DelegateWithDeprecated {
 	}
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void deprecatedAnnotation() {
 		this.bar.deprecatedAnnotation();
 	}
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void deprecatedComment() {
 		this.bar.deprecatedComment();
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void notDeprecated() {
 		this.bar.notDeprecated();
 	}
diff --git a/test/transform/resource/after-delombok/DelegateWithVarargs.java b/test/transform/resource/after-delombok/DelegateWithVarargs.java
index 1d240524..dadbb4ee 100644
--- a/test/transform/resource/after-delombok/DelegateWithVarargs.java
+++ b/test/transform/resource/after-delombok/DelegateWithVarargs.java
@@ -7,22 +7,18 @@ class DelegateWithVarargs {
 		void arrayVarargs(int[]... arrayVarargs);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void justOneParameter(final int... varargs) {
 		this.bar.justOneParameter(varargs);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void multipleParameters(final java.lang.String first, final int... varargs) {
 		this.bar.multipleParameters(first, varargs);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void array(final int[] array) {
 		this.bar.array(array);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void arrayVarargs(final int[]... arrayVarargs) {
 		this.bar.arrayVarargs(arrayVarargs);
 	}
diff --git a/test/transform/resource/after-delombok/EncodingUsAscii.java b/test/transform/resource/after-delombok/EncodingUsAscii.java
index 965d70b5..ec352056 100644
--- a/test/transform/resource/after-delombok/EncodingUsAscii.java
+++ b/test/transform/resource/after-delombok/EncodingUsAscii.java
@@ -3,7 +3,6 @@ class EncodingUsAscii {
 	String foo\u0e51\u0e51 = "\016\t\b ";
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "EncodingUsAscii(foo\u0e51\u0e51=" + this.foo\u0e51\u0e51 + ")";
 	}
diff --git a/test/transform/resource/after-delombok/EncodingUtf8.java b/test/transform/resource/after-delombok/EncodingUtf8.java
index 4cc5c89d..1c7751b5 100644
--- a/test/transform/resource/after-delombok/EncodingUtf8.java
+++ b/test/transform/resource/after-delombok/EncodingUtf8.java
@@ -2,7 +2,6 @@ class EncodingUtf8 {
 	String foo๑๑ = "\016\t\b ";
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "EncodingUtf8(foo๑๑=" + this.foo๑๑ + ")";
 	}
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCode.java b/test/transform/resource/after-delombok/EqualsAndHashCode.java
index dbb4f151..eed77b39 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCode.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCode.java
@@ -6,7 +6,6 @@ class EqualsAndHashCode {
 	String b;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCode)) return false;
@@ -24,13 +23,11 @@ class EqualsAndHashCode {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof EqualsAndHashCode;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -52,7 +49,6 @@ final class EqualsAndHashCode2 {
 	boolean b;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCode2)) return false;
@@ -66,7 +62,6 @@ final class EqualsAndHashCode2 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -83,7 +78,6 @@ final class EqualsAndHashCode2 {
 final class EqualsAndHashCode3 extends EqualsAndHashCode {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCode3)) return false;
@@ -92,13 +86,11 @@ final class EqualsAndHashCode3 extends EqualsAndHashCode {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof EqualsAndHashCode3;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
@@ -107,7 +99,6 @@ final class EqualsAndHashCode3 extends EqualsAndHashCode {
 class EqualsAndHashCode4 extends EqualsAndHashCode {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCode4)) return false;
@@ -117,13 +108,11 @@ class EqualsAndHashCode4 extends EqualsAndHashCode {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof EqualsAndHashCode4;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = super.hashCode();
 		return result;
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java
index 449a1b2e..82a5a42d 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java
@@ -1,7 +1,6 @@
 class EqualsAndHashCodeConfigKeys1Parent {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeConfigKeys1Parent)) return false;
@@ -10,13 +9,11 @@ class EqualsAndHashCodeConfigKeys1Parent {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof EqualsAndHashCodeConfigKeys1Parent;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
@@ -26,7 +23,6 @@ class EqualsAndHashCodeConfigKeys1 extends EqualsAndHashCodeConfigKeys1Parent {
 	int x;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeConfigKeys1)) return false;
@@ -36,13 +32,11 @@ class EqualsAndHashCodeConfigKeys1 extends EqualsAndHashCodeConfigKeys1Parent {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof EqualsAndHashCodeConfigKeys1;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java
index 9ba32222..c46c7f1c 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java
@@ -1,7 +1,6 @@
 class EqualsAndHashCodeConfigKeys2Object extends Object {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeConfigKeys2Object)) return false;
@@ -10,13 +9,11 @@ class EqualsAndHashCodeConfigKeys2Object extends Object {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof EqualsAndHashCodeConfigKeys2Object;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
@@ -25,7 +22,6 @@ class EqualsAndHashCodeConfigKeys2Object extends Object {
 class EqualsAndHashCodeConfigKeys2Parent {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeConfigKeys2Parent)) return false;
@@ -34,13 +30,11 @@ class EqualsAndHashCodeConfigKeys2Parent {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof EqualsAndHashCodeConfigKeys2Parent;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
@@ -50,7 +44,6 @@ class EqualsAndHashCodeConfigKeys2 extends EqualsAndHashCodeConfigKeys2Parent {
 	int x;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeConfigKeys2)) return false;
@@ -61,13 +54,11 @@ class EqualsAndHashCodeConfigKeys2 extends EqualsAndHashCodeConfigKeys2Parent {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof EqualsAndHashCodeConfigKeys2;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = super.hashCode();
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java b/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java
index ac687d84..0b479c2d 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java
@@ -5,7 +5,6 @@ interface EqualsAndHashCodeNestedShadow {
 		public static class Foo extends Bar implements EqualsAndHashCodeNestedShadow.Foo {
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public boolean equals(final java.lang.Object o) {
 				if (o == this) return true;
 				if (!(o instanceof EqualsAndHashCodeNestedShadow.Bar.Foo)) return false;
@@ -14,13 +13,11 @@ interface EqualsAndHashCodeNestedShadow {
 				return true;
 			}
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			protected boolean canEqual(final java.lang.Object other) {
 				return other instanceof EqualsAndHashCodeNestedShadow.Bar.Foo;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public int hashCode() {
 				int result = 1;
 				return result;
@@ -31,7 +28,6 @@ interface EqualsAndHashCodeNestedShadow {
 		public static class Foo<T> extends Bar implements EqualsAndHashCodeNestedShadow.Foo {
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public boolean equals(final java.lang.Object o) {
 				if (o == this) return true;
 				if (!(o instanceof EqualsAndHashCodeNestedShadow.Baz.Foo)) return false;
@@ -40,13 +36,11 @@ interface EqualsAndHashCodeNestedShadow {
 				return true;
 			}
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			protected boolean canEqual(final java.lang.Object other) {
 				return other instanceof EqualsAndHashCodeNestedShadow.Baz.Foo;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public int hashCode() {
 				int result = 1;
 				return result;
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java
index 8b9888e9..895da4db 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java
@@ -3,7 +3,6 @@ final class EqualsAndHashCodeOf {
 	int y;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeOf)) return false;
@@ -13,7 +12,6 @@ final class EqualsAndHashCodeOf {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -26,7 +24,6 @@ final class EqualsAndHashCodeExclude {
 	int y;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeExclude)) return false;
@@ -36,7 +33,6 @@ final class EqualsAndHashCodeExclude {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java
index ea7d504b..dcad0263 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java
@@ -17,7 +17,6 @@ final class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithE
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeWithExistingMethods3)) return false;
@@ -29,7 +28,6 @@ final class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithE
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = super.hashCode();
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java
index 3bf4b661..91c62b0f 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java
@@ -9,7 +9,6 @@ class EqualsAndHashCodeWithOnParam {
 	String b;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(@Nullable final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeWithOnParam)) return false;
@@ -27,13 +26,11 @@ class EqualsAndHashCodeWithOnParam {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(@Nullable final java.lang.Object other) {
 		return other instanceof EqualsAndHashCodeWithOnParam;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
diff --git a/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java b/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java
index f92f0890..959bb1e0 100644
--- a/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java
+++ b/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java
@@ -1,8 +1,6 @@
 class FieldDefaultsViaConfigAndRequiredArgsConstructor {
 	final int x;
-	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) {
 		this.x = x;
 	}
diff --git a/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java b/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java
index 02c91700..e78ee55c 100644
--- a/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java
+++ b/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java
@@ -3,7 +3,6 @@ class GenerateSuppressFBWarnings {
 	int y;
 	@java.lang.SuppressWarnings("all")
 	@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code")
-	@javax.annotation.Generated("lombok")
 	public int getY() {
 		return this.y;
 	}
diff --git a/test/transform/resource/after-delombok/GetterAccessLevel.java b/test/transform/resource/after-delombok/GetterAccessLevel.java
index 31f8a59f..2574340a 100644
--- a/test/transform/resource/after-delombok/GetterAccessLevel.java
+++ b/test/transform/resource/after-delombok/GetterAccessLevel.java
@@ -11,47 +11,38 @@ class GetterAccessLevel {
 	String publicString;
 	String value;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private boolean isPrivate() {
 		return this.isPrivate;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	boolean isPackage() {
 		return this.isPackage;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean isProtected() {
 		return this.isProtected;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean isPublic() {
 		return this.isPublic;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private String getPrivateString() {
 		return this.privateString;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	String getPackageString() {
 		return this.packageString;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected String getProtectedString() {
 		return this.protectedString;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getPublicString() {
 		return this.publicString;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getValue() {
 		return this.value;
 	}
diff --git a/test/transform/resource/after-delombok/GetterAlreadyExists.java b/test/transform/resource/after-delombok/GetterAlreadyExists.java
index ba2bb5e1..d7f32ff1 100644
--- a/test/transform/resource/after-delombok/GetterAlreadyExists.java
+++ b/test/transform/resource/after-delombok/GetterAlreadyExists.java
@@ -4,7 +4,6 @@ class Getter1 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean isFoo() {
 		return this.foo;
 	}
@@ -27,7 +26,6 @@ class Getter4 {
 		return null;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -38,7 +36,6 @@ class Getter5 {
 		return null;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -55,7 +52,6 @@ class Getter7 {
 		return false;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -66,7 +62,6 @@ class Getter8 {
 		return false;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -83,7 +78,6 @@ class Getter10 {
 		return false;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean isFoo() {
 		return this.foo;
 	}
@@ -106,7 +100,6 @@ class Getter13 {
 		return false;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -117,7 +110,6 @@ class Getter14 {
 		return false;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -134,7 +126,6 @@ class Getter16 {
 		return "";
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -145,7 +136,6 @@ class Getter17 {
 		return "";
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
diff --git a/test/transform/resource/after-delombok/GetterBoolean.java b/test/transform/resource/after-delombok/GetterBoolean.java
index d6347abd..6ac91512 100644
--- a/test/transform/resource/after-delombok/GetterBoolean.java
+++ b/test/transform/resource/after-delombok/GetterBoolean.java
@@ -3,17 +3,14 @@ class Getter {
 	boolean isBar;
 	boolean hasBaz;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean isFoo() {
 		return this.foo;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean isBar() {
 		return this.isBar;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean isHasBaz() {
 		return this.hasBaz;
 	}
@@ -24,7 +21,6 @@ class MoreGetter {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean isFoo() {
 		return this.foo;
 	}
diff --git a/test/transform/resource/after-delombok/GetterDeprecated.java b/test/transform/resource/after-delombok/GetterDeprecated.java
index 8bef2b6a..af123509 100644
--- a/test/transform/resource/after-delombok/GetterDeprecated.java
+++ b/test/transform/resource/after-delombok/GetterDeprecated.java
@@ -7,7 +7,6 @@ class GetterDeprecated {
 	int javadoc;
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getAnnotation() {
 		return this.annotation;
 	}
@@ -16,7 +15,6 @@ class GetterDeprecated {
 	 */
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getJavadoc() {
 		return this.javadoc;
 	}
diff --git a/test/transform/resource/after-delombok/GetterEnum.java b/test/transform/resource/after-delombok/GetterEnum.java
index 439430ee..272a2ee6 100644
--- a/test/transform/resource/after-delombok/GetterEnum.java
+++ b/test/transform/resource/after-delombok/GetterEnum.java
@@ -2,20 +2,16 @@ enum GetterEnum {
 	ONE(1, "One");
 	private final int id;
 	private final String name;
-	@java.beans.ConstructorProperties({"id", "name"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private GetterEnum(final int id, final String name) {
 		this.id = id;
 		this.name = name;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getId() {
 		return this.id;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
diff --git a/test/transform/resource/after-delombok/GetterLazy.java b/test/transform/resource/after-delombok/GetterLazy.java
index 2ea3cbf2..25a71848 100644
--- a/test/transform/resource/after-delombok/GetterLazy.java
+++ b/test/transform/resource/after-delombok/GetterLazy.java
@@ -3,7 +3,6 @@ class GetterLazy {
 	}
 	private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> fieldName = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public ValueType getFieldName() {
 		java.lang.Object value = this.fieldName.get();
 		if (value == null) {
diff --git a/test/transform/resource/after-delombok/GetterLazyBoolean.java b/test/transform/resource/after-delombok/GetterLazyBoolean.java
index 41349447..3ca127e3 100644
--- a/test/transform/resource/after-delombok/GetterLazyBoolean.java
+++ b/test/transform/resource/after-delombok/GetterLazyBoolean.java
@@ -6,7 +6,6 @@ class GetterLazyBoolean {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof GetterLazyBoolean)) return false;
@@ -16,13 +15,11 @@ class GetterLazyBoolean {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof GetterLazyBoolean;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -31,12 +28,10 @@ class GetterLazyBoolean {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "GetterLazyBoolean(booleanValue=" + this.isBooleanValue() + ")";
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean isBooleanValue() {
 		java.lang.Object value = this.booleanValue.get();
 		if (value == null) {
@@ -52,7 +47,6 @@ class GetterLazyBoolean {
 		return (java.lang.Boolean) value;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean isOtherBooleanValue() {
 		java.lang.Object value = this.otherBooleanValue.get();
 		if (value == null) {
diff --git a/test/transform/resource/after-delombok/GetterLazyEahcToString.java b/test/transform/resource/after-delombok/GetterLazyEahcToString.java
index 495087f9..e0a0f6b2 100644
--- a/test/transform/resource/after-delombok/GetterLazyEahcToString.java
+++ b/test/transform/resource/after-delombok/GetterLazyEahcToString.java
@@ -5,7 +5,6 @@ class GetterLazyEahcToString {
 	
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof GetterLazyEahcToString)) return false;
@@ -22,7 +21,6 @@ class GetterLazyEahcToString {
 	
 	@java.lang.SuppressWarnings("all")
 	
-	@javax.annotation.Generated("lombok")
 	
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof GetterLazyEahcToString;
@@ -30,7 +28,6 @@ class GetterLazyEahcToString {
 	
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -43,14 +40,12 @@ class GetterLazyEahcToString {
 	
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "GetterLazyEahcToString(value=" + this.getValue() + ", value2=" + this.value2 + ")";
 	}
 	
 	@java.lang.SuppressWarnings("all")
 	
-	@javax.annotation.Generated("lombok")
 	
 	public String getValue() {
 		java.lang.Object value = this.value.get();
@@ -68,7 +63,6 @@ class GetterLazyEahcToString {
 	}
 	
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getValue2() {
 		return this.value2;
 	}
diff --git a/test/transform/resource/after-delombok/GetterLazyInvalid.java b/test/transform/resource/after-delombok/GetterLazyInvalid.java
index 9e7d5bee..81d87c3c 100644
--- a/test/transform/resource/after-delombok/GetterLazyInvalid.java
+++ b/test/transform/resource/after-delombok/GetterLazyInvalid.java
@@ -13,7 +13,6 @@ class GetterLazyInvalidNone {
 class GetterLazyInvalidClass {
 	private final String fieldName = "";
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getFieldName() {
 		return this.fieldName;
 	}
diff --git a/test/transform/resource/after-delombok/GetterLazyNative.java b/test/transform/resource/after-delombok/GetterLazyNative.java
index 0d88558d..b9d471ff 100644
--- a/test/transform/resource/after-delombok/GetterLazyNative.java
+++ b/test/transform/resource/after-delombok/GetterLazyNative.java
@@ -9,7 +9,6 @@ class GetterLazyNative {
 	private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> charField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
 	private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> intArrayField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean isBooleanField() {
 		java.lang.Object value = this.booleanField.get();
 		if (value == null) {
@@ -25,7 +24,6 @@ class GetterLazyNative {
 		return (java.lang.Boolean) value;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public byte getByteField() {
 		java.lang.Object value = this.byteField.get();
 		if (value == null) {
@@ -41,7 +39,6 @@ class GetterLazyNative {
 		return (java.lang.Byte) value;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public short getShortField() {
 		java.lang.Object value = this.shortField.get();
 		if (value == null) {
@@ -57,7 +54,6 @@ class GetterLazyNative {
 		return (java.lang.Short) value;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getIntField() {
 		java.lang.Object value = this.intField.get();
 		if (value == null) {
@@ -73,7 +69,6 @@ class GetterLazyNative {
 		return (java.lang.Integer) value;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public long getLongField() {
 		java.lang.Object value = this.longField.get();
 		if (value == null) {
@@ -89,7 +84,6 @@ class GetterLazyNative {
 		return (java.lang.Long) value;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public float getFloatField() {
 		java.lang.Object value = this.floatField.get();
 		if (value == null) {
@@ -105,7 +99,6 @@ class GetterLazyNative {
 		return (java.lang.Float) value;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public double getDoubleField() {
 		java.lang.Object value = this.doubleField.get();
 		if (value == null) {
@@ -121,7 +114,6 @@ class GetterLazyNative {
 		return (java.lang.Double) value;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public char getCharField() {
 		java.lang.Object value = this.charField.get();
 		if (value == null) {
@@ -137,7 +129,6 @@ class GetterLazyNative {
 		return (java.lang.Character) value;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int[] getIntArrayField() {
 		java.lang.Object value = this.intArrayField.get();
 		if (value == null) {
diff --git a/test/transform/resource/after-delombok/GetterLazyTransient.java b/test/transform/resource/after-delombok/GetterLazyTransient.java
index dbebad90..49093ed1 100644
--- a/test/transform/resource/after-delombok/GetterLazyTransient.java
+++ b/test/transform/resource/after-delombok/GetterLazyTransient.java
@@ -3,7 +3,6 @@ class GetterLazyTransient {
 	private final transient int transientField = 2;
 	private final transient int nonLazyTransientField = 3;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getNonTransientField() {
 		java.lang.Object value = this.nonTransientField.get();
 		if (value == null) {
@@ -19,7 +18,6 @@ class GetterLazyTransient {
 		return (java.lang.Integer) value;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getNonLazyTransientField() {
 		return this.nonLazyTransientField;
 	}
diff --git a/test/transform/resource/after-delombok/GetterNone.java b/test/transform/resource/after-delombok/GetterNone.java
index 2ff386a2..5666f6fe 100644
--- a/test/transform/resource/after-delombok/GetterNone.java
+++ b/test/transform/resource/after-delombok/GetterNone.java
@@ -2,7 +2,6 @@ class GetterNone {
 	int i;
 	int foo;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getI() {
 		return this.i;
 	}
diff --git a/test/transform/resource/after-delombok/GetterOnClass.java b/test/transform/resource/after-delombok/GetterOnClass.java
index 3a7c76a0..f0025370 100644
--- a/test/transform/resource/after-delombok/GetterOnClass.java
+++ b/test/transform/resource/after-delombok/GetterOnClass.java
@@ -2,7 +2,6 @@ class GetterOnClass1 {
 	boolean isNone;
 	boolean isPublic;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean isPublic() {
 		return this.isPublic;
 	}
@@ -12,12 +11,10 @@ class GetterOnClass2 {
 	boolean isProtected;
 	boolean isPackage;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean isProtected() {
 		return this.isProtected;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	boolean isPackage() {
 		return this.isPackage;
 	}
@@ -26,7 +23,6 @@ class GetterOnClass3 {
 	boolean isNone;
 	boolean isPackage;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	boolean isPackage() {
 		return this.isPackage;
 	}
@@ -35,7 +31,6 @@ class GetterOnClass4 {
 	boolean isNone;
 	boolean isPrivate;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private boolean isPrivate() {
 		return this.isPrivate;
 	}
@@ -44,7 +39,6 @@ class GetterOnClass5 {
 	boolean isNone;
 	boolean isPublic;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean isPublic() {
 		return this.isPublic;
 	}
@@ -54,13 +48,11 @@ class GetterOnClass6 {
 	@lombok.NonNull
 	String nonNull;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getCouldBeNull() {
 		return this.couldBeNull;
 	}
 	@lombok.NonNull
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getNonNull() {
 		return this.nonNull;
 	}
diff --git a/test/transform/resource/after-delombok/GetterOnMethod.java b/test/transform/resource/after-delombok/GetterOnMethod.java
index 37ae83a4..4a5b3622 100644
--- a/test/transform/resource/after-delombok/GetterOnMethod.java
+++ b/test/transform/resource/after-delombok/GetterOnMethod.java
@@ -6,21 +6,18 @@ class GetterOnMethod {
 	}
 	@Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getI() {
 		return this.i;
 	}
 	@java.lang.Deprecated
 	@Test
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getJ() {
 		return this.j;
 	}
 	@java.lang.Deprecated
 	@Test
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getK() {
 		return this.k;
 	}
diff --git a/test/transform/resource/after-delombok/GetterOnMethodErrors.java b/test/transform/resource/after-delombok/GetterOnMethodErrors.java
index b7fe82c2..a69966ec 100644
--- a/test/transform/resource/after-delombok/GetterOnMethodErrors.java
+++ b/test/transform/resource/after-delombok/GetterOnMethodErrors.java
@@ -3,7 +3,6 @@ class PlaceFillerToMakeSurePositionIsRelevant {
 class GetterOnMethodErrors {
 	private int test;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getTest() {
 		return this.test;
 	}
diff --git a/test/transform/resource/after-delombok/GetterOnMethodErrors2.java b/test/transform/resource/after-delombok/GetterOnMethodErrors2.java
index 3114d23d..639022d0 100644
--- a/test/transform/resource/after-delombok/GetterOnMethodErrors2.java
+++ b/test/transform/resource/after-delombok/GetterOnMethodErrors2.java
@@ -10,46 +10,38 @@ class GetterOnMethodErrors2 {
 	public @interface Test {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getBad1() {
 		return this.bad1;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getBad2() {
 		return this.bad2;
 	}
 	@Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getBad3() {
 		return this.bad3;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getBad4() {
 		return this.bad4;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getGood1() {
 		return this.good1;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getGood2() {
 		return this.good2;
 	}
 	@Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getGood3() {
 		return this.good3;
 	}
 	@Deprecated
 	@Test
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getGood4() {
 		return this.good4;
 	}
diff --git a/test/transform/resource/after-delombok/GetterOnStatic.java b/test/transform/resource/after-delombok/GetterOnStatic.java
index 34c2dba1..99e63e05 100644
--- a/test/transform/resource/after-delombok/GetterOnStatic.java
+++ b/test/transform/resource/after-delombok/GetterOnStatic.java
@@ -2,12 +2,10 @@ class Getter {
 	static boolean foo;
 	static int bar;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static boolean isFoo() {
 		return Getter.foo;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static int getBar() {
 		return Getter.bar;
 	}
diff --git a/test/transform/resource/after-delombok/GetterPlain.java b/test/transform/resource/after-delombok/GetterPlain.java
index 9af44b04..ceae2aac 100644
--- a/test/transform/resource/after-delombok/GetterPlain.java
+++ b/test/transform/resource/after-delombok/GetterPlain.java
@@ -2,12 +2,10 @@ class GetterPlain {
 	int i;
 	int foo;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getI() {
 		return this.i;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getFoo() {
 		return this.foo;
 	}
diff --git a/test/transform/resource/after-delombok/GetterSetterJavadoc.java b/test/transform/resource/after-delombok/GetterSetterJavadoc.java
index f156de92..019b3c37 100644
--- a/test/transform/resource/after-delombok/GetterSetterJavadoc.java
+++ b/test/transform/resource/after-delombok/GetterSetterJavadoc.java
@@ -4,7 +4,6 @@ class GetterSetterJavadoc1 {
 	 */
 	private int fieldName;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public GetterSetterJavadoc1() {
 	}
 	/**
@@ -13,7 +12,6 @@ class GetterSetterJavadoc1 {
 	 * @return Sky is blue1
 	 */
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getFieldName() {
 		return this.fieldName;
 	}
@@ -23,13 +21,11 @@ class GetterSetterJavadoc1 {
 	 * @param fieldName Hello, World1
 	 */
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setFieldName(final int fieldName) {
 		this.fieldName = fieldName;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof GetterSetterJavadoc1)) return false;
@@ -39,13 +35,11 @@ class GetterSetterJavadoc1 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof GetterSetterJavadoc1;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -54,7 +48,6 @@ class GetterSetterJavadoc1 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "GetterSetterJavadoc1(fieldName=" + this.getFieldName() + ")";
 	}
@@ -70,7 +63,6 @@ class GetterSetterJavadoc2 {
 	 * @return Sky is blue2
 	 */
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getFieldName() {
 		return this.fieldName;
 	}
@@ -80,7 +72,6 @@ class GetterSetterJavadoc2 {
 	 * @param fieldName Hello, World2
 	 */
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setFieldName(final int fieldName) {
 		this.fieldName = fieldName;
 	}
@@ -95,7 +86,6 @@ class GetterSetterJavadoc3 {
 	 * @return Sky is blue3
 	 */
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getFieldName() {
 		return this.fieldName;
 	}
@@ -104,7 +94,6 @@ class GetterSetterJavadoc3 {
 	 * @param fieldName Hello, World3
 	 */
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setFieldName(final int fieldName) {
 		this.fieldName = fieldName;
 	}
@@ -120,7 +109,6 @@ class GetterSetterJavadoc4 {
 	 * @return Sky is blue4
 	 */
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int fieldName() {
 		return this.fieldName;
 	}
@@ -131,7 +119,6 @@ class GetterSetterJavadoc4 {
 	 * @return this
 	 */
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public GetterSetterJavadoc4 fieldName(final int fieldName) {
 		this.fieldName = fieldName;
 		return this;
@@ -147,7 +134,6 @@ class GetterSetterJavadoc5 {
 	 * @return Sky is blue5
 	 */
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int fieldName() {
 		return this.fieldName;
 	}
@@ -157,7 +143,6 @@ class GetterSetterJavadoc5 {
 	 * @return Sky is blue5
 	 */
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public GetterSetterJavadoc5 fieldName(final int fieldName) {
 		this.fieldName = fieldName;
 		return this;
diff --git a/test/transform/resource/after-delombok/GetterWithDollar.java b/test/transform/resource/after-delombok/GetterWithDollar.java
index 60625e6d..56435665 100644
--- a/test/transform/resource/after-delombok/GetterWithDollar.java
+++ b/test/transform/resource/after-delombok/GetterWithDollar.java
@@ -1,7 +1,6 @@
 class GetterWithDollar1 {
 	int $i;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int get$i() {
 		return this.$i;
 	}
@@ -10,12 +9,10 @@ class GetterWithDollar2 {
 	int $i;
 	int i;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int get$i() {
 		return this.$i;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getI() {
 		return this.i;
 	}
diff --git a/test/transform/resource/after-delombok/InjectField.java b/test/transform/resource/after-delombok/InjectField.java
index 9da58db4..98f9762b 100644
--- a/test/transform/resource/after-delombok/InjectField.java
+++ b/test/transform/resource/after-delombok/InjectField.java
@@ -5,14 +5,11 @@ enum InjectField1 {
 
 	@java.lang.SuppressWarnings("all")
 
-	@javax.annotation.Generated("lombok")
 
 	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField1.class.getName());
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private final java.lang.Object $lock = new java.lang.Object[0];
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final java.lang.Object $LOCK = new java.lang.Object[0];
 
 	private static final String LOG_MESSAGE = "static initializer";
@@ -40,10 +37,8 @@ enum InjectField1 {
 
 class InjectField2 {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField2.class.getName());
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private final java.lang.Object $lock = new java.lang.Object[0];
 
 	private static final String LOG_MESSAGE = "static initializer";
@@ -61,7 +56,6 @@ class InjectField2 {
 
 class InjectField3 {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField3.class.getName());
 	static {
 		log.log(Level.FINE, "static initializer");
diff --git a/test/transform/resource/after-delombok/LoggerCommons.java b/test/transform/resource/after-delombok/LoggerCommons.java
index 3cb26794..954e730b 100644
--- a/test/transform/resource/after-delombok/LoggerCommons.java
+++ b/test/transform/resource/after-delombok/LoggerCommons.java
@@ -1,15 +1,12 @@
 class LoggerCommons {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class);
 }
 class LoggerCommonsWithImport {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.class);
 }
 class LoggerCommonsWithDifferentName {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog("DifferentName");
 }
diff --git a/test/transform/resource/after-delombok/LoggerConfig.java b/test/transform/resource/after-delombok/LoggerConfig.java
index 1fa6cb2f..d0944126 100644
--- a/test/transform/resource/after-delombok/LoggerConfig.java
+++ b/test/transform/resource/after-delombok/LoggerConfig.java
@@ -1,5 +1,4 @@
 class LoggerWithConfig {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private final org.slf4j.Logger myLogger = org.slf4j.LoggerFactory.getLogger(LoggerWithConfig.class);
 }
diff --git a/test/transform/resource/after-delombok/LoggerJBossLog.java b/test/transform/resource/after-delombok/LoggerJBossLog.java
index 864b39fe..41c18805 100644
--- a/test/transform/resource/after-delombok/LoggerJBossLog.java
+++ b/test/transform/resource/after-delombok/LoggerJBossLog.java
@@ -1,23 +1,19 @@
 class LoggerJBossLog {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLog.class);
 }
 class LoggerJBossLogWithImport {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithImport.class);
 }
 class LoggerJBossLogOuter {
 	static class Inner {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class);
 	}
 }
 
 class LoggerJBossLogWithDifferentLoggerName {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger("DifferentLogger");
 }
diff --git a/test/transform/resource/after-delombok/LoggerJul.java b/test/transform/resource/after-delombok/LoggerJul.java
index 80659477..63f96733 100644
--- a/test/transform/resource/after-delombok/LoggerJul.java
+++ b/test/transform/resource/after-delombok/LoggerJul.java
@@ -1,15 +1,12 @@
 class LoggerJul {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName());
 }
 class LoggerJulWithImport {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithImport.class.getName());
 }
 class LoggerJulWithDifferentName {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("DifferentName");
 }
diff --git a/test/transform/resource/after-delombok/LoggerLog4j.java b/test/transform/resource/after-delombok/LoggerLog4j.java
index 35c2e42c..7d9d4409 100644
--- a/test/transform/resource/after-delombok/LoggerLog4j.java
+++ b/test/transform/resource/after-delombok/LoggerLog4j.java
@@ -1,15 +1,12 @@
 class LoggerLog4j {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class);
 }
 class LoggerLog4jWithImport {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithImport.class);
 }
 class LoggerLog4jWithDifferentName {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("DifferentName");
 }
diff --git a/test/transform/resource/after-delombok/LoggerLog4j2.java b/test/transform/resource/after-delombok/LoggerLog4j2.java
index 70a09645..3d8b7b5b 100644
--- a/test/transform/resource/after-delombok/LoggerLog4j2.java
+++ b/test/transform/resource/after-delombok/LoggerLog4j2.java
@@ -1,15 +1,12 @@
 class LoggerLog4j2 {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2.class);
 }
 class LoggerLog4j2WithImport {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithImport.class);
 }
 class LoggerLog4j2WithDifferentName {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger("DifferentName");
 }
diff --git a/test/transform/resource/after-delombok/LoggerSlf4j.java b/test/transform/resource/after-delombok/LoggerSlf4j.java
index a00bca40..68d685f0 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4j.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4j.java
@@ -1,23 +1,19 @@
 class LoggerSlf4j {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class);
 }
 class LoggerSlf4jWithImport {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class);
 }
 class LoggerSlf4jOuter {
 	static class Inner {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
 	}
 }
 
 class LoggerSlf4jWithDifferentLoggerName {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger("DifferentLogger");
 }
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
index 1a13f7a2..6730e805 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
@@ -5,19 +5,16 @@ interface LoggerSlf4jTypesInterface {
 enum LoggerSlf4jTypesEnum {
 	;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class);
 }
 enum LoggerSlf4jTypesEnumWithElement {
 	FOO;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class);
 }
 interface LoggerSlf4jTypesInterfaceOuter {
 	class Inner {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
 	}
 }
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java
index 8a1d543f..b82ed6ec 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java
@@ -1,13 +1,11 @@
 package before;
 class LoggerSlf4jWithPackage {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class);
 }
 class LoggerSlf4jWithPackageOuter {
 	static class Inner {
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
 	}
 }
diff --git a/test/transform/resource/after-delombok/LoggerXSlf4j.java b/test/transform/resource/after-delombok/LoggerXSlf4j.java
index 6940d69f..781733cf 100644
--- a/test/transform/resource/after-delombok/LoggerXSlf4j.java
+++ b/test/transform/resource/after-delombok/LoggerXSlf4j.java
@@ -1,15 +1,12 @@
 class LoggerXSlf4j {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4j.class);
 }
 class LoggerXSlf4jWithImport {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithImport.class);
 }
 class LoggerXSlf4jWithDifferentName {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger("DifferentName");
 }
diff --git a/test/transform/resource/after-delombok/MixGetterVal.java b/test/transform/resource/after-delombok/MixGetterVal.java
index fc178113..a2b44ea0 100644
--- a/test/transform/resource/after-delombok/MixGetterVal.java
+++ b/test/transform/resource/after-delombok/MixGetterVal.java
@@ -9,7 +9,6 @@ class MixGetterVal {
 		m(a);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
diff --git a/test/transform/resource/after-delombok/MultiFieldGetter.java b/test/transform/resource/after-delombok/MultiFieldGetter.java
index 6488d9dc..3586a7e6 100644
--- a/test/transform/resource/after-delombok/MultiFieldGetter.java
+++ b/test/transform/resource/after-delombok/MultiFieldGetter.java
@@ -2,12 +2,10 @@ class MultiFieldGetter {
 	int x;
 	int y;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected int getY() {
 		return this.y;
 	}
@@ -16,12 +14,10 @@ class MultiFieldGetter2 {
 	int x;
 	int y;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	int getY() {
 		return this.y;
 	}
diff --git a/test/transform/resource/after-delombok/NoArgsConstructorForce.java b/test/transform/resource/after-delombok/NoArgsConstructorForce.java
index 5b6c6357..3336ca19 100644
--- a/test/transform/resource/after-delombok/NoArgsConstructorForce.java
+++ b/test/transform/resource/after-delombok/NoArgsConstructorForce.java
@@ -5,7 +5,6 @@ public class NoArgsConstructorForce {
 	private final java.util.List<?>[] fullQualifiedList;
 	
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public NoArgsConstructorForce() {
 		this.i = null;
 		this.o = null;
diff --git a/test/transform/resource/after-delombok/NonNullPlain.java b/test/transform/resource/after-delombok/NonNullPlain.java
index 52a80c1a..f6b8037e 100644
--- a/test/transform/resource/after-delombok/NonNullPlain.java
+++ b/test/transform/resource/after-delombok/NonNullPlain.java
@@ -10,9 +10,7 @@ class NonNullPlain {
 	@Retention(RetentionPolicy.CLASS)
 	public @interface NotNull {
 	}
-	@java.beans.ConstructorProperties({"i", "s"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) {
 		if (s == null) {
 			throw new java.lang.NullPointerException("s");
@@ -22,28 +20,23 @@ class NonNullPlain {
 	}
 	@lombok.NonNull
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getI() {
 		return this.i;
 	}
 	@lombok.NonNull
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getS() {
 		return this.s;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Object getO() {
 		return this.o;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setI(@lombok.NonNull final int i) {
 		this.i = i;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setS(@lombok.NonNull final String s) {
 		if (s == null) {
 			throw new java.lang.NullPointerException("s");
@@ -51,7 +44,6 @@ class NonNullPlain {
 		this.s = s;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setO(final Object o) {
 		this.o = o;
 	}
diff --git a/test/transform/resource/after-delombok/NonNullWithAlternateException.java b/test/transform/resource/after-delombok/NonNullWithAlternateException.java
index a5c0a2bc..76c6406a 100644
--- a/test/transform/resource/after-delombok/NonNullWithAlternateException.java
+++ b/test/transform/resource/after-delombok/NonNullWithAlternateException.java
@@ -8,7 +8,6 @@ public class NonNullWithAlternateException {
 		System.out.println(arg);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setTest(@lombok.NonNull final String test) {
 		if (test == null) {
 			throw new java.lang.IllegalArgumentException("test is null");
diff --git a/test/transform/resource/after-delombok/OnXJava7Style.java b/test/transform/resource/after-delombok/OnXJava7Style.java
index f3a58d79..7ebf65a3 100644
--- a/test/transform/resource/after-delombok/OnXJava7Style.java
+++ b/test/transform/resource/after-delombok/OnXJava7Style.java
@@ -13,30 +13,25 @@ public class OnXJava7Style {
 	String e;
 	@Foo
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getA() {
 		return this.a;
 	}
 	@Foo
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setB(final String b) {
 		this.b = b;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setC(@Foo("a") final String c) {
 		this.c = c;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setD(@Bar(stuff = "b") final String d) {
 		this.d = d;
 	}
 	@Foo("c")
 	@Bar(stuff = "d")
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getE() {
 		return this.e;
 	}
diff --git a/test/transform/resource/after-delombok/OnXJava8Style.java b/test/transform/resource/after-delombok/OnXJava8Style.java
index b0ea96d6..d2f76e10 100644
--- a/test/transform/resource/after-delombok/OnXJava8Style.java
+++ b/test/transform/resource/after-delombok/OnXJava8Style.java
@@ -13,30 +13,25 @@ public class OnXJava8Style {
 	String e;
 	@Foo
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getA() {
 		return this.a;
 	}
 	@Foo
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setB(final String b) {
 		this.b = b;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setC(@Foo("a") final String c) {
 		this.c = c;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setD(@Bar(stuff = "b") final String d) {
 		this.d = d;
 	}
 	@Foo("c")
 	@Bar(stuff = "d")
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getE() {
 		return this.e;
 	}
diff --git a/test/transform/resource/after-delombok/SetterAccessLevel.java b/test/transform/resource/after-delombok/SetterAccessLevel.java
index b9f9466b..51a58e8e 100644
--- a/test/transform/resource/after-delombok/SetterAccessLevel.java
+++ b/test/transform/resource/after-delombok/SetterAccessLevel.java
@@ -6,27 +6,22 @@ class SetterAccessLevel {
 	boolean isPublic;
 	boolean value;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private void setPrivate(final boolean isPrivate) {
 		this.isPrivate = isPrivate;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	void setPackage(final boolean isPackage) {
 		this.isPackage = isPackage;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected void setProtected(final boolean isProtected) {
 		this.isProtected = isProtected;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setPublic(final boolean isPublic) {
 		this.isPublic = isPublic;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setValue(final boolean value) {
 		this.value = value;
 	}
diff --git a/test/transform/resource/after-delombok/SetterAlreadyExists.java b/test/transform/resource/after-delombok/SetterAlreadyExists.java
index 1ff9fdcc..a62f20da 100644
--- a/test/transform/resource/after-delombok/SetterAlreadyExists.java
+++ b/test/transform/resource/after-delombok/SetterAlreadyExists.java
@@ -23,7 +23,6 @@ class Setter5 {
 	void setFoo() {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setFoo(final String foo) {
 		this.foo = foo;
 	}
@@ -33,7 +32,6 @@ class Setter6 {
 	void setFoo(String foo, int x) {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setFoo(final String foo) {
 		this.foo = foo;
 	}
diff --git a/test/transform/resource/after-delombok/SetterDeprecated.java b/test/transform/resource/after-delombok/SetterDeprecated.java
index 115096be..cc52413b 100644
--- a/test/transform/resource/after-delombok/SetterDeprecated.java
+++ b/test/transform/resource/after-delombok/SetterDeprecated.java
@@ -7,7 +7,6 @@ class SetterDeprecated {
 	int javadoc;
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setAnnotation(final int annotation) {
 		this.annotation = annotation;
 	}
@@ -16,7 +15,6 @@ class SetterDeprecated {
 	 */
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setJavadoc(final int javadoc) {
 		this.javadoc = javadoc;
 	}
diff --git a/test/transform/resource/after-delombok/SetterOnClass.java b/test/transform/resource/after-delombok/SetterOnClass.java
index 9c376d43..f2347bcb 100644
--- a/test/transform/resource/after-delombok/SetterOnClass.java
+++ b/test/transform/resource/after-delombok/SetterOnClass.java
@@ -2,7 +2,6 @@ class SetterOnClass1 {
 	boolean isNone;
 	boolean isPublic;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setPublic(final boolean isPublic) {
 		this.isPublic = isPublic;
 	}
@@ -12,12 +11,10 @@ class SetterOnClass2 {
 	boolean isProtected;
 	boolean isPackage;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected void setProtected(final boolean isProtected) {
 		this.isProtected = isProtected;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	void setPackage(final boolean isPackage) {
 		this.isPackage = isPackage;
 	}
@@ -26,7 +23,6 @@ class SetterOnClass3 {
 	boolean isNone;
 	boolean isPackage;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	void setPackage(final boolean isPackage) {
 		this.isPackage = isPackage;
 	}
@@ -35,7 +31,6 @@ class SetterOnClass4 {
 	boolean isNone;
 	boolean isPrivate;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private void setPrivate(final boolean isPrivate) {
 		this.isPrivate = isPrivate;
 	}
@@ -44,7 +39,6 @@ class SetterOnClass5 {
 	boolean isNone;
 	boolean isPublic;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setPublic(final boolean isPublic) {
 		this.isPublic = isPublic;
 	}
@@ -54,12 +48,10 @@ class SetterOnClass6 {
 	@lombok.NonNull
 	String nonNull;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setCouldBeNull(final String couldBeNull) {
 		this.couldBeNull = couldBeNull;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setNonNull(@lombok.NonNull final String nonNull) {
 		if (nonNull == null) {
 			throw new java.lang.NullPointerException("nonNull");
diff --git a/test/transform/resource/after-delombok/SetterOnMethodOnParam.java b/test/transform/resource/after-delombok/SetterOnMethodOnParam.java
index c166f936..555bf698 100644
--- a/test/transform/resource/after-delombok/SetterOnMethodOnParam.java
+++ b/test/transform/resource/after-delombok/SetterOnMethodOnParam.java
@@ -6,21 +6,18 @@ class SetterOnMethodOnParam {
 	}
 	@Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setI(final int i) {
 		this.i = i;
 	}
 	@java.lang.Deprecated
 	@Test
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setJ(@Test final int j) {
 		this.j = j;
 	}
 	@java.lang.Deprecated
 	@Test
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setK(@Test final int k) {
 		this.k = k;
 	}
diff --git a/test/transform/resource/after-delombok/SetterOnStatic.java b/test/transform/resource/after-delombok/SetterOnStatic.java
index a1947b36..7ef68362 100644
--- a/test/transform/resource/after-delombok/SetterOnStatic.java
+++ b/test/transform/resource/after-delombok/SetterOnStatic.java
@@ -2,12 +2,10 @@ class Setter {
 	static boolean foo;
 	static int bar;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static void setFoo(final boolean foo) {
 		Setter.foo = foo;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public static void setBar(final int bar) {
 		Setter.bar = bar;
 	}
diff --git a/test/transform/resource/after-delombok/SetterPlain.java b/test/transform/resource/after-delombok/SetterPlain.java
index 19acc392..0ec9ca1b 100644
--- a/test/transform/resource/after-delombok/SetterPlain.java
+++ b/test/transform/resource/after-delombok/SetterPlain.java
@@ -2,12 +2,10 @@ class SetterPlain {
 	int i;
 	int foo;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setI(final int i) {
 		this.i = i;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setFoo(final int foo) {
 		this.foo = foo;
 	}
diff --git a/test/transform/resource/after-delombok/SetterWithDollar.java b/test/transform/resource/after-delombok/SetterWithDollar.java
index fdcbfe75..8d116e99 100644
--- a/test/transform/resource/after-delombok/SetterWithDollar.java
+++ b/test/transform/resource/after-delombok/SetterWithDollar.java
@@ -3,7 +3,6 @@ class SetterWithDollar1 {
 	
 	@java.lang.SuppressWarnings("all")
 	
-	@javax.annotation.Generated("lombok")
 	
 	public void set$i(final int $i) {
 		this.$i = $i;
@@ -15,13 +14,11 @@ class SetterWithDollar2 {
 	
 	@java.lang.SuppressWarnings("all")
 	
-	@javax.annotation.Generated("lombok")
 	
 	public void set$i(final int $i) {
 		this.$i = $i;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public void setI(final int i) {
 		this.i = i;
 	}
diff --git a/test/transform/resource/after-delombok/SimpleTypeResolution.java b/test/transform/resource/after-delombok/SimpleTypeResolution.java
index 1e45bb79..c6e08d70 100644
--- a/test/transform/resource/after-delombok/SimpleTypeResolution.java
+++ b/test/transform/resource/after-delombok/SimpleTypeResolution.java
@@ -5,7 +5,6 @@ class SimpleTypeResolutionFail {
 class SimpleTypeResolutionSuccess {
 	private int x;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
diff --git a/test/transform/resource/after-delombok/SynchronizedPlain.java b/test/transform/resource/after-delombok/SynchronizedPlain.java
index 229d261a..f178aa4e 100644
--- a/test/transform/resource/after-delombok/SynchronizedPlain.java
+++ b/test/transform/resource/after-delombok/SynchronizedPlain.java
@@ -1,6 +1,5 @@
 class SynchronizedPlain1 {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private final java.lang.Object $lock = new java.lang.Object[0];
 	void test() {
 		synchronized (this.$lock) {
@@ -15,7 +14,6 @@ class SynchronizedPlain1 {
 }
 class SynchronizedPlain2 {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private static final java.lang.Object $LOCK = new java.lang.Object[0];
 	static void test() {
 		synchronized (SynchronizedPlain2.$LOCK) {
diff --git a/test/transform/resource/after-delombok/ToStringConfiguration.java b/test/transform/resource/after-delombok/ToStringConfiguration.java
index 1baabebd..6fa9111e 100644
--- a/test/transform/resource/after-delombok/ToStringConfiguration.java
+++ b/test/transform/resource/after-delombok/ToStringConfiguration.java
@@ -2,12 +2,10 @@ class ToStringConfiguration {
 	int x;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ToStringConfiguration(" + this.x + ")";
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
@@ -16,7 +14,6 @@ class ToStringConfiguration2 {
 	int x;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ToStringConfiguration2(x=" + this.x + ")";
 	}
@@ -25,12 +22,10 @@ class ToStringConfiguration3 {
 	int x;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ToStringConfiguration3(" + this.getX() + ")";
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
diff --git a/test/transform/resource/after-delombok/ToStringInner.java b/test/transform/resource/after-delombok/ToStringInner.java
index ef14bcde..fe77fcfd 100644
--- a/test/transform/resource/after-delombok/ToStringInner.java
+++ b/test/transform/resource/after-delombok/ToStringInner.java
@@ -5,7 +5,6 @@ class ToStringOuter {
 		int y;
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "ToStringOuter.ToStringInner(y=" + this.y + ")";
 		}
@@ -14,7 +13,6 @@ class ToStringOuter {
 		int y;
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "ToStringOuter.ToStringStaticInner(y=" + this.y + ")";
 		}
@@ -24,7 +22,6 @@ class ToStringOuter {
 			String name;
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			public java.lang.String toString() {
 				return "ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name + ")";
 			}
@@ -33,7 +30,6 @@ class ToStringOuter {
 	
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ToStringOuter(x=" + this.x + ", name=" + this.name + ")";
 	}
diff --git a/test/transform/resource/after-delombok/ToStringPlain.java b/test/transform/resource/after-delombok/ToStringPlain.java
index bf0ef419..af9daf4f 100644
--- a/test/transform/resource/after-delombok/ToStringPlain.java
+++ b/test/transform/resource/after-delombok/ToStringPlain.java
@@ -3,7 +3,6 @@ class ToString1 {
 	String name;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ToString1(x=" + this.x + ", name=" + this.name + ")";
 	}
@@ -13,7 +12,6 @@ class ToString2 {
 	String name;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ToString2(x=" + this.x + ", name=" + this.name + ")";
 	}
diff --git a/test/transform/resource/after-delombok/Tolerate.java b/test/transform/resource/after-delombok/Tolerate.java
index e56979dc..c3e3d7fd 100644
--- a/test/transform/resource/after-delombok/Tolerate.java
+++ b/test/transform/resource/after-delombok/Tolerate.java
@@ -11,7 +11,6 @@ class Tolerate {
 	
 	@java.lang.SuppressWarnings("all")
 	
-	@javax.annotation.Generated("lombok")
 	
 	public void setPattern(final Pattern pattern) {
 		this.pattern = pattern;
@@ -19,7 +18,6 @@ class Tolerate {
 	
 	@java.lang.SuppressWarnings("all")
 	
-	@javax.annotation.Generated("lombok")
 	
 	public Pattern getPattern() {
 		return this.pattern;
@@ -39,7 +37,6 @@ class Tolerate2 {
 	
 	@java.lang.SuppressWarnings("all")
 	
-	@javax.annotation.Generated("lombok")
 	
 	public Pattern getPattern() {
 		return this.pattern;
@@ -47,15 +44,12 @@ class Tolerate2 {
 	
 	@java.lang.SuppressWarnings("all")
 	
-	@javax.annotation.Generated("lombok")
 	
 	public Tolerate2 withPattern(final Pattern pattern) {
 		return this.pattern == pattern ? this : new Tolerate2(pattern);
 	}
 	
-	@java.beans.ConstructorProperties({"pattern"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Tolerate2(final Pattern pattern) {
 		this.pattern = pattern;
 	}
diff --git a/test/transform/resource/after-delombok/TrickyTypeResolution.java b/test/transform/resource/after-delombok/TrickyTypeResolution.java
index 6badfbf4..9a5aae16 100644
--- a/test/transform/resource/after-delombok/TrickyTypeResolution.java
+++ b/test/transform/resource/after-delombok/TrickyTypeResolution.java
@@ -14,7 +14,6 @@ class TrickyDoNothing2 {
 class TrickySuccess {
 	int x;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
diff --git a/test/transform/resource/after-delombok/UtilityClass.java b/test/transform/resource/after-delombok/UtilityClass.java
index 32e47557..8d3f4c08 100644
--- a/test/transform/resource/after-delombok/UtilityClass.java
+++ b/test/transform/resource/after-delombok/UtilityClass.java
@@ -7,7 +7,6 @@ final class UtilityClass {
 		private String innerInnerMember;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private UtilityClass() {
 		throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
 	}
@@ -17,7 +16,6 @@ class UtilityInner {
 		static final class InnerInnerInner {
 			static int member;
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			private InnerInnerInner() {
 				throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
 			}
@@ -28,7 +26,6 @@ class UtilityInner {
 		static final class InsideEnum {
 			static int member;
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			private InsideEnum() {
 				throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
 			}
@@ -38,7 +35,6 @@ class UtilityInner {
 		final class InsideInterface {
 			static int member;
 			@java.lang.SuppressWarnings("all")
-			@javax.annotation.Generated("lombok")
 			private InsideInterface() {
 				throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
 			}
diff --git a/test/transform/resource/after-delombok/ValueCallSuper.java b/test/transform/resource/after-delombok/ValueCallSuper.java
index 6214e64f..63a536cd 100644
--- a/test/transform/resource/after-delombok/ValueCallSuper.java
+++ b/test/transform/resource/after-delombok/ValueCallSuper.java
@@ -2,12 +2,10 @@ class ValueParent {
 }
 final class ValueCallSuper extends ValueParent {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public ValueCallSuper() {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof ValueCallSuper)) return false;
@@ -17,20 +15,17 @@ final class ValueCallSuper extends ValueParent {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof ValueCallSuper;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = super.hashCode();
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ValueCallSuper()";
 	}
diff --git a/test/transform/resource/after-delombok/ValueExperimental.java b/test/transform/resource/after-delombok/ValueExperimental.java
index 95803228..5846a2d8 100644
--- a/test/transform/resource/after-delombok/ValueExperimental.java
+++ b/test/transform/resource/after-delombok/ValueExperimental.java
@@ -1,11 +1,9 @@
 final class ValueExperimental1 {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public ValueExperimental1() {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof ValueExperimental1)) return false;
@@ -13,26 +11,22 @@ final class ValueExperimental1 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ValueExperimental1()";
 	}
 }
 final class ValueExperimental2 {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public ValueExperimental2() {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof ValueExperimental2)) return false;
@@ -40,14 +34,12 @@ final class ValueExperimental2 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ValueExperimental2()";
 	}
diff --git a/test/transform/resource/after-delombok/ValueExperimentalStarImport.java b/test/transform/resource/after-delombok/ValueExperimentalStarImport.java
index b3bd9db5..cb755b47 100644
--- a/test/transform/resource/after-delombok/ValueExperimentalStarImport.java
+++ b/test/transform/resource/after-delombok/ValueExperimentalStarImport.java
@@ -1,13 +1,11 @@
 import lombok.experimental.*;
 final class ValueExperimentalStarImport {
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public ValueExperimentalStarImport() {
 		
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof ValueExperimentalStarImport)) return false;
@@ -15,14 +13,12 @@ final class ValueExperimentalStarImport {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ValueExperimentalStarImport()";
 	}
diff --git a/test/transform/resource/after-delombok/ValuePlain.java b/test/transform/resource/after-delombok/ValuePlain.java
index 056cdacf..cf2c1142 100644
--- a/test/transform/resource/after-delombok/ValuePlain.java
+++ b/test/transform/resource/after-delombok/ValuePlain.java
@@ -1,26 +1,21 @@
 final class Value1 {
 	private final int x;
 	private final String name;
-	@java.beans.ConstructorProperties({"x", "name"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Value1(final int x, final String name) {
 		this.x = x;
 		this.name = name;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Value1)) return false;
@@ -33,7 +28,6 @@ final class Value1 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -44,7 +38,6 @@ final class Value1 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Value1(x=" + this.getX() + ", name=" + this.getName() + ")";
 	}
@@ -52,26 +45,21 @@ final class Value1 {
 class Value2 {
 	public final int x;
 	private final String name;
-	@java.beans.ConstructorProperties({"x", "name"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Value2(final int x, final String name) {
 		this.x = x;
 		this.name = name;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Value2)) return false;
@@ -84,13 +72,11 @@ class Value2 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof Value2;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -101,7 +87,6 @@ class Value2 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Value2(x=" + this.getX() + ", name=" + this.getName() + ")";
 	}
@@ -109,26 +94,21 @@ class Value2 {
 final class Value3 {
 	private int x;
 	private final int y;
-	@java.beans.ConstructorProperties({"x", "y"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Value3(final int x, final int y) {
 		this.x = x;
 		this.y = y;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int getY() {
 		return this.y;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Value3)) return false;
@@ -139,7 +119,6 @@ final class Value3 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -149,7 +128,6 @@ final class Value3 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Value3(x=" + this.getX() + ", y=" + this.getY() + ")";
 	}
diff --git a/test/transform/resource/after-delombok/ValueStaticField.java b/test/transform/resource/after-delombok/ValueStaticField.java
index 7725d1ac..2b489a1a 100644
--- a/test/transform/resource/after-delombok/ValueStaticField.java
+++ b/test/transform/resource/after-delombok/ValueStaticField.java
@@ -2,12 +2,10 @@ final class ValueStaticField {
 	static int x;
 	static String PASSWORD = "Ken sent me";
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public ValueStaticField() {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof ValueStaticField)) return false;
@@ -15,14 +13,12 @@ final class ValueStaticField {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ValueStaticField()";
 	}
diff --git a/test/transform/resource/after-delombok/WitherAccessLevel.java b/test/transform/resource/after-delombok/WitherAccessLevel.java
index 8cf98cec..c687d645 100644
--- a/test/transform/resource/after-delombok/WitherAccessLevel.java
+++ b/test/transform/resource/after-delombok/WitherAccessLevel.java
@@ -8,27 +8,22 @@ class WitherAccessLevel {
 	WitherAccessLevel(boolean isNone, boolean isPrivate, boolean isPackage, boolean isProtected, boolean isPublic, boolean value) {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	private WitherAccessLevel withPrivate(final boolean isPrivate) {
 		return this.isPrivate == isPrivate ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	WitherAccessLevel withPackage(final boolean isPackage) {
 		return this.isPackage == isPackage ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected WitherAccessLevel withProtected(final boolean isProtected) {
 		return this.isProtected == isProtected ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherAccessLevel withPublic(final boolean isPublic) {
 		return this.isPublic == isPublic ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherAccessLevel withValue(final boolean value) {
 		return this.value == value ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value);
 	}
diff --git a/test/transform/resource/after-delombok/WitherAlreadyExists.java b/test/transform/resource/after-delombok/WitherAlreadyExists.java
index 8f51af48..d609bc7b 100644
--- a/test/transform/resource/after-delombok/WitherAlreadyExists.java
+++ b/test/transform/resource/after-delombok/WitherAlreadyExists.java
@@ -33,7 +33,6 @@ class Wither5 {
 	Wither5(String foo) {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Wither5 withFoo(final String foo) {
 		return this.foo == foo ? this : new Wither5(foo);
 	}
@@ -45,7 +44,6 @@ class Wither6 {
 	Wither6(String foo) {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public Wither6 withFoo(final String foo) {
 		return this.foo == foo ? this : new Wither6(foo);
 	}
diff --git a/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java b/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java
index 0d0d6525..ff4fe3e2 100644
--- a/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java
+++ b/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java
@@ -4,9 +4,7 @@ class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> {
 	final int x = 10;
 	int y = 20;
 	final int z;
-	@java.beans.ConstructorProperties({"test", "test2", "y", "z"})
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) {
 		this.test = test;
 		this.test2 = test2;
@@ -14,12 +12,10 @@ class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> {
 		this.z = z;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherAndAllArgsConstructor<T, J, L> withTest(final J test) {
 		return this.test == test ? this : new WitherAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) {
 		return this.test2 == test2 ? this : new WitherAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z);
 	}
diff --git a/test/transform/resource/after-delombok/WitherDeprecated.java b/test/transform/resource/after-delombok/WitherDeprecated.java
index 409e773f..b342a861 100644
--- a/test/transform/resource/after-delombok/WitherDeprecated.java
+++ b/test/transform/resource/after-delombok/WitherDeprecated.java
@@ -9,7 +9,6 @@ class WitherDeprecated {
 	}
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherDeprecated withAnnotation(final int annotation) {
 		return this.annotation == annotation ? this : new WitherDeprecated(annotation, this.javadoc);
 	}
@@ -18,7 +17,6 @@ class WitherDeprecated {
 	 */
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherDeprecated withJavadoc(final int javadoc) {
 		return this.javadoc == javadoc ? this : new WitherDeprecated(this.annotation, javadoc);
 	}
diff --git a/test/transform/resource/after-delombok/WitherOnClass.java b/test/transform/resource/after-delombok/WitherOnClass.java
index ae352d33..45d0c4b5 100644
--- a/test/transform/resource/after-delombok/WitherOnClass.java
+++ b/test/transform/resource/after-delombok/WitherOnClass.java
@@ -4,7 +4,6 @@ class WitherOnClass1 {
 	WitherOnClass1(boolean isNone, boolean isPublic) {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherOnClass1 withPublic(final boolean isPublic) {
 		return this.isPublic == isPublic ? this : new WitherOnClass1(this.isNone, isPublic);
 	}
@@ -16,12 +15,10 @@ class WitherOnClass2 {
 	WitherOnClass2(boolean isNone, boolean isProtected, boolean isPackage) {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	protected WitherOnClass2 withProtected(final boolean isProtected) {
 		return this.isProtected == isProtected ? this : new WitherOnClass2(this.isNone, isProtected, this.isPackage);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	WitherOnClass2 withPackage(final boolean isPackage) {
 		return this.isPackage == isPackage ? this : new WitherOnClass2(this.isNone, this.isProtected, isPackage);
 	}
@@ -33,12 +30,10 @@ class WitherOnClass3 {
 	WitherOnClass3(String couldBeNull, String nonNull) {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherOnClass3 withCouldBeNull(final String couldBeNull) {
 		return this.couldBeNull == couldBeNull ? this : new WitherOnClass3(couldBeNull, this.nonNull);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherOnClass3 withNonNull(@lombok.NonNull final String nonNull) {
 		if (nonNull == null) {
 			throw new java.lang.NullPointerException("nonNull");
@@ -53,7 +48,6 @@ class WitherOnClass4 {
 		this.fY = y;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherOnClass4 withY(final int fY) {
 		return this.fY == fY ? this : new WitherOnClass4(fY);
 	}
diff --git a/test/transform/resource/after-delombok/WitherPlain.java b/test/transform/resource/after-delombok/WitherPlain.java
index 548ff299..a2e947bd 100644
--- a/test/transform/resource/after-delombok/WitherPlain.java
+++ b/test/transform/resource/after-delombok/WitherPlain.java
@@ -6,12 +6,10 @@ class WitherPlain {
 		this.foo = foo;
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherPlain withI(final int i) {
 		return this.i == i ? this : new WitherPlain(i, this.foo);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherPlain withFoo(final int foo) {
 		return this.foo == foo ? this : new WitherPlain(this.i, foo);
 	}
diff --git a/test/transform/resource/after-delombok/WitherWithAbstract.java b/test/transform/resource/after-delombok/WitherWithAbstract.java
index 7cbb1309..f9178e99 100644
--- a/test/transform/resource/after-delombok/WitherWithAbstract.java
+++ b/test/transform/resource/after-delombok/WitherWithAbstract.java
@@ -1,6 +1,5 @@
 abstract class WitherWithAbstract {
 	String foo;
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public abstract WitherWithAbstract withFoo(final String foo);
 }
diff --git a/test/transform/resource/after-delombok/WitherWithGenerics.java b/test/transform/resource/after-delombok/WitherWithGenerics.java
index fd466559..98bbd04d 100644
--- a/test/transform/resource/after-delombok/WitherWithGenerics.java
+++ b/test/transform/resource/after-delombok/WitherWithGenerics.java
@@ -6,17 +6,14 @@ class WitherWithGenerics<T, J extends T, L extends java.lang.Number> {
 	public WitherWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) {
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherWithGenerics<T, J, L> withTest(final J test) {
 		return this.test == test ? this : new WitherWithGenerics<T, J, L>(test, this.test2, this.test3);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) {
 		return this.test2 == test2 ? this : new WitherWithGenerics<T, J, L>(this.test, test2, this.test3);
 	}
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) {
 		return this.test3 == test3 ? this : new WitherWithGenerics<T, J, L>(this.test, this.test2, test3);
 	}
diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java
index 450c35fa..8ac92e6e 100644
--- a/test/transform/resource/after-ecj/Accessors.java
+++ b/test/transform/resource/after-ecj/Accessors.java
@@ -3,10 +3,10 @@ class AccessorsFluent {
   AccessorsFluent() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String fieldName() {
+  public @java.lang.SuppressWarnings("all") String fieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluent fieldName(final String fieldName) {
+  public @java.lang.SuppressWarnings("all") AccessorsFluent fieldName(final String fieldName) {
     this.fieldName = fieldName;
     return this;
   }
@@ -17,14 +17,14 @@ class AccessorsFluent {
   AccessorsFluentOnClass() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluentOnClass fieldName(final String fieldName) {
+  public @java.lang.SuppressWarnings("all") AccessorsFluentOnClass fieldName(final String fieldName) {
     this.fieldName = fieldName;
     return this;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String fieldName() {
+  public @java.lang.SuppressWarnings("all") String fieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getOtherFieldWithOverride() {
+  public @java.lang.SuppressWarnings("all") String getOtherFieldWithOverride() {
     return this.otherFieldWithOverride;
   }
 }
@@ -33,7 +33,7 @@ class AccessorsChain {
   AccessorsChain() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsChain setRunning(final boolean isRunning) {
+  public @java.lang.SuppressWarnings("all") AccessorsChain setRunning(final boolean isRunning) {
     this.isRunning = isRunning;
     return this;
   }
@@ -44,7 +44,7 @@ class AccessorsChain {
   AccessorsPrefix() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setActualField(final String fActualField) {
+  public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) {
     this.fActualField = fActualField;
   }
 }
@@ -54,10 +54,10 @@ class AccessorsChain {
   AccessorsPrefix2() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final String fieldName) {
+  public @java.lang.SuppressWarnings("all") void setFieldName(final String fieldName) {
     this.fieldName = fieldName;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setActualField(final String fActualField) {
+  public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) {
     this.fActualField = fActualField;
   }
 }
@@ -69,10 +69,10 @@ class AccessorsChain {
   private String getName() {
     return fName;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("AccessorsPrefix3(fName=" + this.getName()) + ")");
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof AccessorsPrefix3)))
@@ -86,10 +86,10 @@ class AccessorsChain {
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof AccessorsPrefix3);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     final java.lang.Object $fName = this.getName();
@@ -102,7 +102,7 @@ class AccessorsFluentGenerics<T extends Number> {
   AccessorsFluentGenerics() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluentGenerics<T> name(final String name) {
+  public @java.lang.SuppressWarnings("all") AccessorsFluentGenerics<T> name(final String name) {
     this.name = name;
     return this;
   }
@@ -112,7 +112,7 @@ class AccessorsFluentNoChaining {
   AccessorsFluentNoChaining() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void name(final String name) {
+  public @java.lang.SuppressWarnings("all") void name(final String name) {
     this.name = name;
   }
 }
@@ -123,7 +123,7 @@ class AccessorsFluentStatic<T extends Number> {
   AccessorsFluentStatic() {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void name(final String name) {
+  public static @java.lang.SuppressWarnings("all") void name(final String name) {
     AccessorsFluentStatic.name = name;
   }
 }
diff --git a/test/transform/resource/after-ecj/AccessorsConfiguration.java b/test/transform/resource/after-ecj/AccessorsConfiguration.java
index fdf2ff85..6678e020 100644
--- a/test/transform/resource/after-ecj/AccessorsConfiguration.java
+++ b/test/transform/resource/after-ecj/AccessorsConfiguration.java
@@ -3,10 +3,10 @@ class AccessorsConfiguration {
   AccessorsConfiguration() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String fieldName() {
+  public @java.lang.SuppressWarnings("all") String fieldName() {
     return this.m_FieldName;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void fieldName(final String m_FieldName) {
+  public @java.lang.SuppressWarnings("all") void fieldName(final String m_FieldName) {
     this.m_FieldName = m_FieldName;
   }
 }
@@ -15,7 +15,7 @@ class AccessorsConfiguration {
   AccessorsConfiguration2() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setM_FieldName(final String m_FieldName) {
+  public @java.lang.SuppressWarnings("all") void setM_FieldName(final String m_FieldName) {
     this.m_FieldName = m_FieldName;
   }
 }
@@ -24,7 +24,7 @@ class AccessorsConfiguration {
   AccessorsConfiguration3() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsConfiguration3 setFieldName(final String fFieldName) {
+  public @java.lang.SuppressWarnings("all") AccessorsConfiguration3 setFieldName(final String fFieldName) {
     this.fFieldName = fFieldName;
     return this;
   }
diff --git a/test/transform/resource/after-ecj/BuilderChainAndFluent.java b/test/transform/resource/after-ecj/BuilderChainAndFluent.java
index 6a59dba9..f789f535 100644
--- a/test/transform/resource/after-ecj/BuilderChainAndFluent.java
+++ b/test/transform/resource/after-ecj/BuilderChainAndFluent.java
@@ -1,25 +1,25 @@
 @lombok.experimental.Builder(fluent = false,chain = false) class BuilderChainAndFluent {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderChainAndFluentBuilder {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int yes;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluentBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderChainAndFluentBuilder {
+    private @java.lang.SuppressWarnings("all") int yes;
+    @java.lang.SuppressWarnings("all") BuilderChainAndFluentBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setYes(final int yes) {
+    public @java.lang.SuppressWarnings("all") void setYes(final int yes) {
       this.yes = yes;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluent build() {
+    public @java.lang.SuppressWarnings("all") BuilderChainAndFluent build() {
       return new BuilderChainAndFluent(yes);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes) + ")");
     }
   }
   private final int yes;
-  @java.beans.ConstructorProperties({"yes"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluent(final int yes) {
+  @java.lang.SuppressWarnings("all") BuilderChainAndFluent(final int yes) {
     super();
     this.yes = yes;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluentBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") BuilderChainAndFluentBuilder builder() {
     return new BuilderChainAndFluentBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java
index c63ad8e6..8f520ae5 100644
--- a/test/transform/resource/after-ecj/BuilderComplex.java
+++ b/test/transform/resource/after-ecj/BuilderComplex.java
@@ -1,34 +1,34 @@
 import java.util.List;
 import lombok.experimental.Builder;
 class BuilderComplex {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class VoidBuilder<T extends Number> {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") T number;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int arg2;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String arg3;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderComplex selfRef;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder() {
+  public static @java.lang.SuppressWarnings("all") class VoidBuilder<T extends Number> {
+    private @java.lang.SuppressWarnings("all") T number;
+    private @java.lang.SuppressWarnings("all") int arg2;
+    private @java.lang.SuppressWarnings("all") String arg3;
+    private @java.lang.SuppressWarnings("all") BuilderComplex selfRef;
+    @java.lang.SuppressWarnings("all") VoidBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> number(final T number) {
+    public @java.lang.SuppressWarnings("all") VoidBuilder<T> number(final T number) {
       this.number = number;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> arg2(final int arg2) {
+    public @java.lang.SuppressWarnings("all") VoidBuilder<T> arg2(final int arg2) {
       this.arg2 = arg2;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> arg3(final String arg3) {
+    public @java.lang.SuppressWarnings("all") VoidBuilder<T> arg3(final String arg3) {
       this.arg3 = arg3;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> selfRef(final BuilderComplex selfRef) {
+    public @java.lang.SuppressWarnings("all") VoidBuilder<T> selfRef(final BuilderComplex selfRef) {
       this.selfRef = selfRef;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void execute() {
+    public @java.lang.SuppressWarnings("all") void execute() {
       BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("BuilderComplex.VoidBuilder(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")");
     }
   }
@@ -37,7 +37,7 @@ class BuilderComplex {
   }
   private static @Builder(buildMethodName = "execute") <T extends Number>void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) {
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>VoidBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") <T extends Number>VoidBuilder<T> builder() {
     return new VoidBuilder<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderDefaults.java b/test/transform/resource/after-ecj/BuilderDefaults.java
index 697a2e35..1a0f1168 100644
--- a/test/transform/resource/after-ecj/BuilderDefaults.java
+++ b/test/transform/resource/after-ecj/BuilderDefaults.java
@@ -1,64 +1,64 @@
 import lombok.Builder;
 import lombok.Value;
 public final @Value @Builder class BuilderDefaults {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderDefaultsBuilder {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int x;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean x$set;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String name;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") long z;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean z$set;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderDefaultsBuilder {
+    private @java.lang.SuppressWarnings("all") int x;
+    private @java.lang.SuppressWarnings("all") boolean x$set;
+    private @java.lang.SuppressWarnings("all") String name;
+    private @java.lang.SuppressWarnings("all") long z;
+    private @java.lang.SuppressWarnings("all") boolean z$set;
+    @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsBuilder x(final int x) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder x(final int x) {
       this.x = x;
       x$set = true;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsBuilder name(final String name) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder name(final String name) {
       this.name = name;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsBuilder z(final long z) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder z(final long z) {
       this.z = z;
       z$set = true;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaults build() {
+    public @java.lang.SuppressWarnings("all") BuilderDefaults build() {
       return new BuilderDefaults((x$set ? x : BuilderDefaults.$default$x()), name, (z$set ? z : BuilderDefaults.$default$z()));
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("BuilderDefaults.BuilderDefaultsBuilder(x=" + this.x) + ", name=") + this.name) + ", z=") + this.z) + ")");
     }
   }
   private final @Builder.Default int x;
   private final String name;
   private final @Builder.Default long z;
-  private static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int $default$x() {
+  private static @java.lang.SuppressWarnings("all") int $default$x() {
     return 10;
   }
-  private static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") long $default$z() {
+  private static @java.lang.SuppressWarnings("all") long $default$z() {
     return System.currentTimeMillis();
   }
-  @java.beans.ConstructorProperties({"x", "name", "z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaults(final int x, final String name, final long z) {
+  @java.lang.SuppressWarnings("all") BuilderDefaults(final int x, final String name, final long z) {
     super();
     this.x = x;
     this.name = name;
     this.z = z;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder builder() {
     return new BuilderDefaultsBuilder();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
+  public @java.lang.SuppressWarnings("all") String getName() {
     return this.name;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") long getZ() {
+  public @java.lang.SuppressWarnings("all") long getZ() {
     return this.z;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof BuilderDefaults)))
@@ -74,7 +74,7 @@ public final @Value @Builder class BuilderDefaults {
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -84,7 +84,7 @@ public final @Value @Builder class BuilderDefaults {
     result = ((result * PRIME) + (int) ($z ^ ($z >>> 32)));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((((("BuilderDefaults(x=" + this.getX()) + ", name=") + this.getName()) + ", z=") + this.getZ()) + ")");
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java b/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java
index 29ac5307..236632d0 100644
--- a/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java
+++ b/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java
@@ -1,39 +1,39 @@
 import lombok.Builder;
 import lombok.Singular;
 public @Builder class BuilderDefaultsWarnings {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderDefaultsWarningsBuilder {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") long x;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int z;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> items;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsWarningsBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderDefaultsWarningsBuilder {
+    private @java.lang.SuppressWarnings("all") long x;
+    private @java.lang.SuppressWarnings("all") int z;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> items;
+    @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsWarningsBuilder x(final long x) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder x(final long x) {
       this.x = x;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsWarningsBuilder z(final int z) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder z(final int z) {
       this.z = z;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsWarningsBuilder item(String item) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder item(String item) {
       if ((this.items == null))
           this.items = new java.util.ArrayList<String>();
       this.items.add(item);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsWarningsBuilder items(java.util.Collection<? extends String> items) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder items(java.util.Collection<? extends String> items) {
       if ((this.items == null))
           this.items = new java.util.ArrayList<String>();
       this.items.addAll(items);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsWarningsBuilder clearItems() {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder clearItems() {
       if ((this.items != null))
           this.items.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsWarnings build() {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings build() {
       java.util.List<String> items;
       switch (((this.items == null) ? 0 : this.items.size())) {
       case 0 :
@@ -47,7 +47,7 @@ public @Builder class BuilderDefaultsWarnings {
       }
       return new BuilderDefaultsWarnings(x, z, items);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(x=" + this.x) + ", z=") + this.z) + ", items=") + this.items) + ")");
     }
   }
@@ -55,25 +55,25 @@ public @Builder class BuilderDefaultsWarnings {
   final int y = 5;
   @Builder.Default int z;
   @Builder.Default @Singular java.util.List<String> items;
-  @java.beans.ConstructorProperties({"x", "z", "items"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsWarnings(final long x, final int z, final java.util.List<String> items) {
+  @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings(final long x, final int z, final java.util.List<String> items) {
     super();
     this.x = x;
     this.z = z;
     this.items = items;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderDefaultsWarningsBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder builder() {
     return new BuilderDefaultsWarningsBuilder();
   }
 }
 class NoBuilderButHasDefaults {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class NoBuilderButHasDefaultsBuilder {
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoBuilderButHasDefaultsBuilder() {
+  public static @java.lang.SuppressWarnings("all") class NoBuilderButHasDefaultsBuilder {
+    @java.lang.SuppressWarnings("all") NoBuilderButHasDefaultsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoBuilderButHasDefaults build() {
+    public @java.lang.SuppressWarnings("all") NoBuilderButHasDefaults build() {
       return new NoBuilderButHasDefaults();
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return "NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder()";
     }
   }
@@ -81,7 +81,7 @@ class NoBuilderButHasDefaults {
   public @Builder NoBuilderButHasDefaults() {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoBuilderButHasDefaultsBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") NoBuilderButHasDefaultsBuilder builder() {
     return new NoBuilderButHasDefaultsBuilder();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderInstanceMethod.java b/test/transform/resource/after-ecj/BuilderInstanceMethod.java
index ff7d0aab..5f57aef7 100644
--- a/test/transform/resource/after-ecj/BuilderInstanceMethod.java
+++ b/test/transform/resource/after-ecj/BuilderInstanceMethod.java
@@ -1,33 +1,33 @@
 import java.util.List;
 class BuilderInstanceMethod<T> {
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class StringBuilder {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int show;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int yes;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") List<T> also;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int $andMe;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder() {
+  public @java.lang.SuppressWarnings("all") class StringBuilder {
+    private @java.lang.SuppressWarnings("all") int show;
+    private @java.lang.SuppressWarnings("all") int yes;
+    private @java.lang.SuppressWarnings("all") List<T> also;
+    private @java.lang.SuppressWarnings("all") int $andMe;
+    @java.lang.SuppressWarnings("all") StringBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder show(final int show) {
+    public @java.lang.SuppressWarnings("all") StringBuilder show(final int show) {
       this.show = show;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder yes(final int yes) {
+    public @java.lang.SuppressWarnings("all") StringBuilder yes(final int yes) {
       this.yes = yes;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder also(final List<T> also) {
+    public @java.lang.SuppressWarnings("all") StringBuilder also(final List<T> also) {
       this.also = also;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder $andMe(final int $andMe) {
+    public @java.lang.SuppressWarnings("all") StringBuilder $andMe(final int $andMe) {
       this.$andMe = $andMe;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String build() {
+    public @java.lang.SuppressWarnings("all") String build() {
       return BuilderInstanceMethod.this.create(show, yes, also, $andMe);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("BuilderInstanceMethod.StringBuilder(show=" + this.show) + ", yes=") + this.yes) + ", also=") + this.also) + ", $andMe=") + this.$andMe) + ")");
     }
   }
@@ -37,7 +37,7 @@ class BuilderInstanceMethod<T> {
   public @lombok.Builder String create(int show, final int yes, List<T> also, int $andMe) {
     return (((("" + show) + yes) + also) + $andMe);
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder builder() {
+  public @java.lang.SuppressWarnings("all") StringBuilder builder() {
     return new StringBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSimple.java b/test/transform/resource/after-ecj/BuilderSimple.java
index ecac411b..bc0ff186 100644
--- a/test/transform/resource/after-ecj/BuilderSimple.java
+++ b/test/transform/resource/after-ecj/BuilderSimple.java
@@ -1,23 +1,23 @@
 import java.util.List;
 @lombok.Builder class BuilderSimple<T> {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSimpleBuilder<T> {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int yes;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") List<T> also;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderSimpleBuilder<T> {
+    private @java.lang.SuppressWarnings("all") int yes;
+    private @java.lang.SuppressWarnings("all") List<T> also;
+    @java.lang.SuppressWarnings("all") BuilderSimpleBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder<T> yes(final int yes) {
+    public @java.lang.SuppressWarnings("all") BuilderSimpleBuilder<T> yes(final int yes) {
       this.yes = yes;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder<T> also(final List<T> also) {
+    public @java.lang.SuppressWarnings("all") BuilderSimpleBuilder<T> also(final List<T> also) {
       this.also = also;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimple<T> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSimple<T> build() {
       return new BuilderSimple<T>(yes, also);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((("BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes) + ", also=") + this.also) + ")");
     }
   }
@@ -25,12 +25,12 @@ import java.util.List;
   private final int yes;
   private List<T> also;
   private int $butNotMe;
-  @java.beans.ConstructorProperties({"yes", "also"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimple(final int yes, final List<T> also) {
+  @java.lang.SuppressWarnings("all") BuilderSimple(final int yes, final List<T> also) {
     super();
     this.yes = yes;
     this.also = also;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSimpleBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") <T>BuilderSimpleBuilder<T> builder() {
     return new BuilderSimpleBuilder<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
index 59e5edd3..12c2b293 100644
--- a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
+++ b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
@@ -5,96 +5,96 @@ import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.ImmutableTable;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularGuavaListsSets<T> {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularGuavaListsSetsBuilder<T> {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<T> cards;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<Number> frogs;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSortedSet.Builder<String> passes;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaListsSetsBuilder<T> {
+    private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder<T> cards;
+    private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder<Number> frogs;
+    private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet;
+    private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedSet.Builder<String> passes;
+    private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users;
+    @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> card(T card) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> card(T card) {
       if ((this.cards == null))
           this.cards = com.google.common.collect.ImmutableList.builder();
       this.cards.add(card);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> cards(java.lang.Iterable<? extends T> cards) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> cards(java.lang.Iterable<? extends T> cards) {
       if ((this.cards == null))
           this.cards = com.google.common.collect.ImmutableList.builder();
       this.cards.addAll(cards);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearCards() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearCards() {
       this.cards = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> frog(Number frog) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> frog(Number frog) {
       if ((this.frogs == null))
           this.frogs = com.google.common.collect.ImmutableList.builder();
       this.frogs.add(frog);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> frogs(java.lang.Iterable<? extends Number> frogs) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> frogs(java.lang.Iterable<? extends Number> frogs) {
       if ((this.frogs == null))
           this.frogs = com.google.common.collect.ImmutableList.builder();
       this.frogs.addAll(frogs);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() {
       this.frogs = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Object rawSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Object rawSet) {
       if ((this.rawSet == null))
           this.rawSet = com.google.common.collect.ImmutableSet.builder();
       this.rawSet.add(rawSet);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Iterable<?> rawSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Iterable<?> rawSet) {
       if ((this.rawSet == null))
           this.rawSet = com.google.common.collect.ImmutableSet.builder();
       this.rawSet.addAll(rawSet);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() {
       this.rawSet = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> pass(String pass) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> pass(String pass) {
       if ((this.passes == null))
           this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
       this.passes.add(pass);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> passes(java.lang.Iterable<? extends String> passes) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> passes(java.lang.Iterable<? extends String> passes) {
       if ((this.passes == null))
           this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
       this.passes.addAll(passes);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearPasses() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearPasses() {
       this.passes = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> user(Number rowKey, Number columnKey, String value) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> user(Number rowKey, Number columnKey, String value) {
       if ((this.users == null))
           this.users = com.google.common.collect.ImmutableTable.builder();
       this.users.put(rowKey, columnKey, value);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> users(com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> users(com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
       if ((this.users == null))
           this.users = com.google.common.collect.ImmutableTable.builder();
       this.users.putAll(users);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearUsers() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearUsers() {
       this.users = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSets<T> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets<T> build() {
       com.google.common.collect.ImmutableList<T> cards = ((this.cards == null) ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build());
       com.google.common.collect.ImmutableCollection<Number> frogs = ((this.frogs == null) ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build());
       com.google.common.collect.ImmutableSet<java.lang.Object> rawSet = ((this.rawSet == null) ? com.google.common.collect.ImmutableSet.<java.lang.Object>of() : this.rawSet.build());
@@ -102,7 +102,7 @@ import lombok.Singular;
       com.google.common.collect.ImmutableTable<Number, Number, String> users = ((this.users == null) ? com.google.common.collect.ImmutableTable.<Number, Number, String>of() : this.users.build());
       return new BuilderSingularGuavaListsSets<T>(cards, frogs, rawSet, passes, users);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((((("BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ", users=") + this.users) + ")");
     }
   }
@@ -111,7 +111,7 @@ import lombok.Singular;
   private @SuppressWarnings("all") @Singular("rawSet") ImmutableSet rawSet;
   private @Singular ImmutableSortedSet<String> passes;
   private @Singular ImmutableTable<? extends Number, ? extends Number, String> users;
-  @java.beans.ConstructorProperties({"cards", "frogs", "rawSet", "passes", "users"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) {
+  @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) {
     super();
     this.cards = cards;
     this.frogs = frogs;
@@ -119,7 +119,7 @@ import lombok.Singular;
     this.passes = passes;
     this.users = users;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSingularGuavaListsSetsBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularGuavaListsSetsBuilder<T> builder() {
     return new BuilderSingularGuavaListsSetsBuilder<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java
index 18193647..44533ac1 100644
--- a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java
+++ b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java
@@ -3,81 +3,81 @@ import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableSortedMap;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularGuavaMaps<K, V> {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularGuavaMapsBuilder<K, V> {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaMapsBuilder<K, V> {
+    private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes;
+    private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices;
+    private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap;
+    @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> battleaxe(K key, V value) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> battleaxe(K key, V value) {
       if ((this.battleaxes == null))
           this.battleaxes = com.google.common.collect.ImmutableMap.builder();
       this.battleaxes.put(key, value);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> battleaxes(java.util.Map<? extends K, ? extends V> battleaxes) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> battleaxes(java.util.Map<? extends K, ? extends V> battleaxes) {
       if ((this.battleaxes == null))
           this.battleaxes = com.google.common.collect.ImmutableMap.builder();
       this.battleaxes.putAll(battleaxes);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() {
       this.battleaxes = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> vertex(Integer key, V value) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> vertex(Integer key, V value) {
       if ((this.vertices == null))
           this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
       this.vertices.put(key, value);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> vertices(java.util.Map<? extends Integer, ? extends V> vertices) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> vertices(java.util.Map<? extends Integer, ? extends V> vertices) {
       if ((this.vertices == null))
           this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
       this.vertices.putAll(vertices);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> clearVertices() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> clearVertices() {
       this.vertices = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.lang.Object key, java.lang.Object value) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.lang.Object key, java.lang.Object value) {
       if ((this.rawMap == null))
           this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
       this.rawMap.put(key, value);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
       if ((this.rawMap == null))
           this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
       this.rawMap.putAll(rawMap);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() {
       this.rawMap = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMaps<K, V> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps<K, V> build() {
       com.google.common.collect.ImmutableMap<K, V> battleaxes = ((this.battleaxes == null) ? com.google.common.collect.ImmutableMap.<K, V>of() : this.battleaxes.build());
       com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = ((this.vertices == null) ? com.google.common.collect.ImmutableSortedMap.<Integer, V>of() : this.vertices.build());
       com.google.common.collect.ImmutableBiMap<java.lang.Object, java.lang.Object> rawMap = ((this.rawMap == null) ? com.google.common.collect.ImmutableBiMap.<java.lang.Object, java.lang.Object>of() : this.rawMap.build());
       return new BuilderSingularGuavaMaps<K, V>(battleaxes, vertices, rawMap);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes) + ", vertices=") + this.vertices) + ", rawMap=") + this.rawMap) + ")");
     }
   }
   private @Singular ImmutableMap<K, V> battleaxes;
   private @Singular ImmutableSortedMap<Integer, ? extends V> vertices;
   private @SuppressWarnings("all") @Singular("rawMap") ImmutableBiMap rawMap;
-  @java.beans.ConstructorProperties({"battleaxes", "vertices", "rawMap"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
+  @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
     super();
     this.battleaxes = battleaxes;
     this.vertices = vertices;
     this.rawMap = rawMap;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <K, V>BuilderSingularGuavaMapsBuilder<K, V> builder() {
+  public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularGuavaMapsBuilder<K, V> builder() {
     return new BuilderSingularGuavaMapsBuilder<K, V>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularLists.java b/test/transform/resource/after-ecj/BuilderSingularLists.java
index 3ea89f67..3e093e1a 100644
--- a/test/transform/resource/after-ecj/BuilderSingularLists.java
+++ b/test/transform/resource/after-ecj/BuilderSingularLists.java
@@ -3,65 +3,65 @@ import java.util.Collection;
 
 import lombok.Singular;
 @lombok.Builder class BuilderSingularLists<T> {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularListsBuilder<T> {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<T> children;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<Number> scarves;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawList;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularListsBuilder<T> {
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<T> children;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<Number> scarves;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<java.lang.Object> rawList;
+    @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> child(T child) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> child(T child) {
       if ((this.children == null))
           this.children = new java.util.ArrayList<T>();
       this.children.add(child);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> children(java.util.Collection<? extends T> children) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> children(java.util.Collection<? extends T> children) {
       if ((this.children == null))
           this.children = new java.util.ArrayList<T>();
       this.children.addAll(children);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> clearChildren() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> clearChildren() {
       if ((this.children != null))
           this.children.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> scarf(Number scarf) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> scarf(Number scarf) {
       if ((this.scarves == null))
           this.scarves = new java.util.ArrayList<Number>();
       this.scarves.add(scarf);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> scarves(java.util.Collection<? extends Number> scarves) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> scarves(java.util.Collection<? extends Number> scarves) {
       if ((this.scarves == null))
           this.scarves = new java.util.ArrayList<Number>();
       this.scarves.addAll(scarves);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> clearScarves() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> clearScarves() {
       if ((this.scarves != null))
           this.scarves.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> rawList(java.lang.Object rawList) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> rawList(java.lang.Object rawList) {
       if ((this.rawList == null))
           this.rawList = new java.util.ArrayList<java.lang.Object>();
       this.rawList.add(rawList);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> rawList(java.util.Collection<?> rawList) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> rawList(java.util.Collection<?> rawList) {
       if ((this.rawList == null))
           this.rawList = new java.util.ArrayList<java.lang.Object>();
       this.rawList.addAll(rawList);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> clearRawList() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> clearRawList() {
       if ((this.rawList != null))
           this.rawList.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularLists<T> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularLists<T> build() {
       java.util.List<T> children;
       switch (((this.children == null) ? 0 : this.children.size())) {
       case 0 :
@@ -97,20 +97,20 @@ import lombok.Singular;
       }
       return new BuilderSingularLists<T>(children, scarves, rawList);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children) + ", scarves=") + this.scarves) + ", rawList=") + this.rawList) + ")");
     }
   }
   private @Singular List<T> children;
   private @Singular Collection<? extends Number> scarves;
   private @SuppressWarnings("all") @Singular("rawList") List rawList;
-  @java.beans.ConstructorProperties({"children", "scarves", "rawList"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
+  @java.lang.SuppressWarnings("all") BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
     super();
     this.children = children;
     this.scarves = scarves;
     this.rawList = rawList;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSingularListsBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularListsBuilder<T> builder() {
     return new BuilderSingularListsBuilder<T>();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderSingularMaps.java b/test/transform/resource/after-ecj/BuilderSingularMaps.java
index 1a4a5b42..efcf5ef5 100644
--- a/test/transform/resource/after-ecj/BuilderSingularMaps.java
+++ b/test/transform/resource/after-ecj/BuilderSingularMaps.java
@@ -2,19 +2,19 @@ import java.util.Map;
 import java.util.SortedMap;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularMaps<K, V> {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularMapsBuilder<K, V> {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<K> women$key;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<V> women$value;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<K> men$key;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<Number> men$value;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawMap$key;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawMap$value;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> stringMap$key;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<V> stringMap$value;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularMapsBuilder<K, V> {
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<K> women$key;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<V> women$value;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<K> men$key;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<Number> men$value;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<java.lang.Object> rawMap$key;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<java.lang.Object> rawMap$value;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> stringMap$key;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<V> stringMap$value;
+    @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) {
       if ((this.women$key == null))
           {
             this.women$key = new java.util.ArrayList<K>();
@@ -24,7 +24,7 @@ import lombok.Singular;
       this.women$value.add(womanValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) {
       if ((this.women$key == null))
           {
             this.women$key = new java.util.ArrayList<K>();
@@ -37,7 +37,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> clearWomen() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> clearWomen() {
       if ((this.women$key != null))
           {
             this.women$key.clear();
@@ -45,7 +45,7 @@ import lombok.Singular;
           }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) {
       if ((this.men$key == null))
           {
             this.men$key = new java.util.ArrayList<K>();
@@ -55,7 +55,7 @@ import lombok.Singular;
       this.men$value.add(manValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) {
       if ((this.men$key == null))
           {
             this.men$key = new java.util.ArrayList<K>();
@@ -68,7 +68,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> clearMen() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> clearMen() {
       if ((this.men$key != null))
           {
             this.men$key.clear();
@@ -76,7 +76,7 @@ import lombok.Singular;
           }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> rawMap(java.lang.Object rawMapKey, java.lang.Object rawMapValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> rawMap(java.lang.Object rawMapKey, java.lang.Object rawMapValue) {
       if ((this.rawMap$key == null))
           {
             this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
@@ -86,7 +86,7 @@ import lombok.Singular;
       this.rawMap$value.add(rawMapValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
       if ((this.rawMap$key == null))
           {
             this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
@@ -99,7 +99,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> clearRawMap() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> clearRawMap() {
       if ((this.rawMap$key != null))
           {
             this.rawMap$key.clear();
@@ -107,7 +107,7 @@ import lombok.Singular;
           }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
       if ((this.stringMap$key == null))
           {
             this.stringMap$key = new java.util.ArrayList<String>();
@@ -117,7 +117,7 @@ import lombok.Singular;
       this.stringMap$value.add(stringMapValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
       if ((this.stringMap$key == null))
           {
             this.stringMap$key = new java.util.ArrayList<String>();
@@ -130,7 +130,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> clearStringMap() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> clearStringMap() {
       if ((this.stringMap$key != null))
           {
             this.stringMap$key.clear();
@@ -138,7 +138,7 @@ import lombok.Singular;
           }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMaps<K, V> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMaps<K, V> build() {
       java.util.Map<K, V> women;
       switch (((this.women$key == null) ? 0 : this.women$key.size())) {
       case 0 :
@@ -188,7 +188,7 @@ import lombok.Singular;
       }
       return new BuilderSingularMaps<K, V>(women, men, rawMap, stringMap);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((((((((((("BuilderSingularMaps.BuilderSingularMapsBuilder(women$key=" + this.women$key) + ", women$value=") + this.women$value) + ", men$key=") + this.men$key) + ", men$value=") + this.men$value) + ", rawMap$key=") + this.rawMap$key) + ", rawMap$value=") + this.rawMap$value) + ", stringMap$key=") + this.stringMap$key) + ", stringMap$value=") + this.stringMap$value) + ")");
     }
   }
@@ -196,14 +196,14 @@ import lombok.Singular;
   private @Singular SortedMap<K, ? extends Number> men;
   private @SuppressWarnings("all") @Singular("rawMap") Map rawMap;
   private @Singular("stringMap") Map<String, V> stringMap;
-  @java.beans.ConstructorProperties({"women", "men", "rawMap", "stringMap"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) {
+  @java.lang.SuppressWarnings("all") BuilderSingularMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) {
     super();
     this.women = women;
     this.men = men;
     this.rawMap = rawMap;
     this.stringMap = stringMap;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <K, V>BuilderSingularMapsBuilder<K, V> builder() {
+  public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularMapsBuilder<K, V> builder() {
     return new BuilderSingularMapsBuilder<K, V>();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderSingularNoAuto.java b/test/transform/resource/after-ecj/BuilderSingularNoAuto.java
index a5204afa..fa38efc3 100644
--- a/test/transform/resource/after-ecj/BuilderSingularNoAuto.java
+++ b/test/transform/resource/after-ecj/BuilderSingularNoAuto.java
@@ -1,65 +1,65 @@
 import java.util.List;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularNoAuto {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularNoAutoBuilder {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> things;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> widgets;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> items;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularNoAutoBuilder {
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> things;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> widgets;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> items;
+    @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder things(String things) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder things(String things) {
       if ((this.things == null))
           this.things = new java.util.ArrayList<String>();
       this.things.add(things);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder things(java.util.Collection<? extends String> things) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder things(java.util.Collection<? extends String> things) {
       if ((this.things == null))
           this.things = new java.util.ArrayList<String>();
       this.things.addAll(things);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder clearThings() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder clearThings() {
       if ((this.things != null))
           this.things.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder widget(String widget) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder widget(String widget) {
       if ((this.widgets == null))
           this.widgets = new java.util.ArrayList<String>();
       this.widgets.add(widget);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder widgets(java.util.Collection<? extends String> widgets) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder widgets(java.util.Collection<? extends String> widgets) {
       if ((this.widgets == null))
           this.widgets = new java.util.ArrayList<String>();
       this.widgets.addAll(widgets);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder clearWidgets() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder clearWidgets() {
       if ((this.widgets != null))
           this.widgets.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder items(String items) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder items(String items) {
       if ((this.items == null))
           this.items = new java.util.ArrayList<String>();
       this.items.add(items);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder items(java.util.Collection<? extends String> items) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder items(java.util.Collection<? extends String> items) {
       if ((this.items == null))
           this.items = new java.util.ArrayList<String>();
       this.items.addAll(items);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder clearItems() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder clearItems() {
       if ((this.items != null))
           this.items.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAuto build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto build() {
       java.util.List<String> things;
       switch (((this.things == null) ? 0 : this.things.size())) {
       case 0 :
@@ -95,20 +95,20 @@ import lombok.Singular;
       }
       return new BuilderSingularNoAuto(things, widgets, items);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things) + ", widgets=") + this.widgets) + ", items=") + this.items) + ")");
     }
   }
   private @Singular List<String> things;
   private @Singular("widget") List<String> widgets;
   private @Singular List<String> items;
-  @java.beans.ConstructorProperties({"things", "widgets", "items"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAuto(final List<String> things, final List<String> widgets, final List<String> items) {
+  @java.lang.SuppressWarnings("all") BuilderSingularNoAuto(final List<String> things, final List<String> widgets, final List<String> items) {
     super();
     this.things = things;
     this.widgets = widgets;
     this.items = items;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder builder() {
     return new BuilderSingularNoAutoBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java
index 4a540dd0..4823e46e 100644
--- a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java
+++ b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java
@@ -3,81 +3,81 @@ import java.util.NavigableMap;
 import java.util.Collection;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularRedirectToGuava {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularRedirectToGuavaBuilder {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSet.Builder<String> dangerMice;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularRedirectToGuavaBuilder {
+    private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSet.Builder<String> dangerMice;
+    private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things;
+    private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys;
+    @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder dangerMouse(String dangerMouse) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder dangerMouse(String dangerMouse) {
       if ((this.dangerMice == null))
           this.dangerMice = com.google.common.collect.ImmutableSet.builder();
       this.dangerMice.add(dangerMouse);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder dangerMice(java.lang.Iterable<? extends String> dangerMice) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder dangerMice(java.lang.Iterable<? extends String> dangerMice) {
       if ((this.dangerMice == null))
           this.dangerMice = com.google.common.collect.ImmutableSet.builder();
       this.dangerMice.addAll(dangerMice);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder clearDangerMice() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder clearDangerMice() {
       this.dangerMice = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder thing(Integer key, Number value) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder thing(Integer key, Number value) {
       if ((this.things == null))
           this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
       this.things.put(key, value);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder things(java.util.Map<? extends Integer, ? extends Number> things) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder things(java.util.Map<? extends Integer, ? extends Number> things) {
       if ((this.things == null))
           this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
       this.things.putAll(things);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder clearThings() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder clearThings() {
       this.things = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder doohickey(Class<?> doohickey) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder doohickey(Class<?> doohickey) {
       if ((this.doohickeys == null))
           this.doohickeys = com.google.common.collect.ImmutableList.builder();
       this.doohickeys.add(doohickey);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder doohickeys(java.lang.Iterable<? extends Class<?>> doohickeys) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder doohickeys(java.lang.Iterable<? extends Class<?>> doohickeys) {
       if ((this.doohickeys == null))
           this.doohickeys = com.google.common.collect.ImmutableList.builder();
       this.doohickeys.addAll(doohickeys);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder clearDoohickeys() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder clearDoohickeys() {
       this.doohickeys = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuava build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava build() {
       java.util.Set<String> dangerMice = ((this.dangerMice == null) ? com.google.common.collect.ImmutableSet.<String>of() : this.dangerMice.build());
       java.util.NavigableMap<Integer, Number> things = ((this.things == null) ? com.google.common.collect.ImmutableSortedMap.<Integer, Number>of() : this.things.build());
       java.util.Collection<Class<?>> doohickeys = ((this.doohickeys == null) ? com.google.common.collect.ImmutableList.<Class<?>>of() : this.doohickeys.build());
       return new BuilderSingularRedirectToGuava(dangerMice, things, doohickeys);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice) + ", things=") + this.things) + ", doohickeys=") + this.doohickeys) + ")");
     }
   }
   private @Singular Set<String> dangerMice;
   private @Singular NavigableMap<Integer, Number> things;
   private @Singular Collection<Class<?>> doohickeys;
-  @java.beans.ConstructorProperties({"dangerMice", "things", "doohickeys"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
+  @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
     super();
     this.dangerMice = dangerMice;
     this.things = things;
     this.doohickeys = doohickeys;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder builder() {
     return new BuilderSingularRedirectToGuavaBuilder();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderSingularSets.java b/test/transform/resource/after-ecj/BuilderSingularSets.java
index b20b135a..bf403831 100644
--- a/test/transform/resource/after-ecj/BuilderSingularSets.java
+++ b/test/transform/resource/after-ecj/BuilderSingularSets.java
@@ -2,83 +2,83 @@ import java.util.Set;
 import java.util.SortedSet;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularSets<T> {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularSetsBuilder<T> {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<T> dangerMice;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<Number> octopodes;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawSet;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> stringSet;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularSetsBuilder<T> {
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<T> dangerMice;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<Number> octopodes;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<java.lang.Object> rawSet;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> stringSet;
+    @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> dangerMouse(T dangerMouse) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> dangerMouse(T dangerMouse) {
       if ((this.dangerMice == null))
           this.dangerMice = new java.util.ArrayList<T>();
       this.dangerMice.add(dangerMouse);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> dangerMice(java.util.Collection<? extends T> dangerMice) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> dangerMice(java.util.Collection<? extends T> dangerMice) {
       if ((this.dangerMice == null))
           this.dangerMice = new java.util.ArrayList<T>();
       this.dangerMice.addAll(dangerMice);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> clearDangerMice() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> clearDangerMice() {
       if ((this.dangerMice != null))
           this.dangerMice.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> octopus(Number octopus) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> octopus(Number octopus) {
       if ((this.octopodes == null))
           this.octopodes = new java.util.ArrayList<Number>();
       this.octopodes.add(octopus);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> octopodes(java.util.Collection<? extends Number> octopodes) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> octopodes(java.util.Collection<? extends Number> octopodes) {
       if ((this.octopodes == null))
           this.octopodes = new java.util.ArrayList<Number>();
       this.octopodes.addAll(octopodes);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> clearOctopodes() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> clearOctopodes() {
       if ((this.octopodes != null))
           this.octopodes.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> rawSet(java.lang.Object rawSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> rawSet(java.lang.Object rawSet) {
       if ((this.rawSet == null))
           this.rawSet = new java.util.ArrayList<java.lang.Object>();
       this.rawSet.add(rawSet);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> rawSet(java.util.Collection<?> rawSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> rawSet(java.util.Collection<?> rawSet) {
       if ((this.rawSet == null))
           this.rawSet = new java.util.ArrayList<java.lang.Object>();
       this.rawSet.addAll(rawSet);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> clearRawSet() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> clearRawSet() {
       if ((this.rawSet != null))
           this.rawSet.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> stringSet(String stringSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> stringSet(String stringSet) {
       if ((this.stringSet == null))
           this.stringSet = new java.util.ArrayList<String>();
       this.stringSet.add(stringSet);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> stringSet(java.util.Collection<? extends String> stringSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> stringSet(java.util.Collection<? extends String> stringSet) {
       if ((this.stringSet == null))
           this.stringSet = new java.util.ArrayList<String>();
       this.stringSet.addAll(stringSet);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> clearStringSet() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> clearStringSet() {
       if ((this.stringSet != null))
           this.stringSet.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSets<T> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSets<T> build() {
       java.util.Set<T> dangerMice;
       switch (((this.dangerMice == null) ? 0 : this.dangerMice.size())) {
       case 0 :
@@ -124,7 +124,7 @@ import lombok.Singular;
       }
       return new BuilderSingularSets<T>(dangerMice, octopodes, rawSet, stringSet);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")");
     }
   }
@@ -132,14 +132,14 @@ import lombok.Singular;
   private @Singular SortedSet<? extends Number> octopodes;
   private @SuppressWarnings("all") @Singular("rawSet") Set rawSet;
   private @Singular("stringSet") Set<String> stringSet;
-  @java.beans.ConstructorProperties({"dangerMice", "octopodes", "rawSet", "stringSet"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) {
+  @java.lang.SuppressWarnings("all") BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) {
     super();
     this.dangerMice = dangerMice;
     this.octopodes = octopodes;
     this.rawSet = rawSet;
     this.stringSet = stringSet;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSingularSetsBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularSetsBuilder<T> builder() {
     return new BuilderSingularSetsBuilder<T>();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java b/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java
index 797b62b9..12c299c6 100644
--- a/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java
+++ b/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java
@@ -1,28 +1,28 @@
 import lombok.Singular;
 @lombok.Builder @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixes {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularWithPrefixesBuilder {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> elems;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularWithPrefixesBuilder {
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> elems;
+    @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder elem(String elem) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesBuilder elem(String elem) {
       if ((this.elems == null))
           this.elems = new java.util.ArrayList<String>();
       this.elems.add(elem);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder elems(java.util.Collection<? extends String> elems) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesBuilder elems(java.util.Collection<? extends String> elems) {
       if ((this.elems == null))
           this.elems = new java.util.ArrayList<String>();
       this.elems.addAll(elems);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder clearElems() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesBuilder clearElems() {
       if ((this.elems != null))
           this.elems.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixes build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes build() {
       java.util.List<String> elems;
       switch (((this.elems == null) ? 0 : this.elems.size())) {
       case 0 :
@@ -36,16 +36,16 @@ import lombok.Singular;
       }
       return new BuilderSingularWithPrefixes(elems);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems) + ")");
     }
   }
   private @Singular java.util.List<String> _elems;
-  @java.beans.ConstructorProperties({"elems"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixes(final java.util.List<String> elems) {
+  @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes(final java.util.List<String> elems) {
     super();
     this._elems = elems;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesBuilder builder() {
     return new BuilderSingularWithPrefixesBuilder();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderValueData.java b/test/transform/resource/after-ecj/BuilderValueData.java
index 4fcc04bf..06456e86 100644
--- a/test/transform/resource/after-ecj/BuilderValueData.java
+++ b/test/transform/resource/after-ecj/BuilderValueData.java
@@ -1,27 +1,27 @@
 import java.util.List;
 final @lombok.Builder @lombok.Value class BuilderAndValue {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderAndValueBuilder {
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndValueBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderAndValueBuilder {
+    @java.lang.SuppressWarnings("all") BuilderAndValueBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndValue build() {
+    public @java.lang.SuppressWarnings("all") BuilderAndValue build() {
       return new BuilderAndValue();
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return "BuilderAndValue.BuilderAndValueBuilder()";
     }
   }
   private final int zero = 0;
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndValue() {
+  @java.lang.SuppressWarnings("all") BuilderAndValue() {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndValueBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") BuilderAndValueBuilder builder() {
     return new BuilderAndValueBuilder();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getZero() {
+  public @java.lang.SuppressWarnings("all") int getZero() {
     return this.zero;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof BuilderAndValue)))
@@ -31,39 +31,39 @@ final @lombok.Builder @lombok.Value class BuilderAndValue {
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getZero());
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("BuilderAndValue(zero=" + this.getZero()) + ")");
   }
 }
 @lombok.Builder @lombok.Data class BuilderAndData {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderAndDataBuilder {
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndDataBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderAndDataBuilder {
+    @java.lang.SuppressWarnings("all") BuilderAndDataBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndData build() {
+    public @java.lang.SuppressWarnings("all") BuilderAndData build() {
       return new BuilderAndData();
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return "BuilderAndData.BuilderAndDataBuilder()";
     }
   }
   private final int zero = 0;
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndData() {
+  @java.lang.SuppressWarnings("all") BuilderAndData() {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndDataBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") BuilderAndDataBuilder builder() {
     return new BuilderAndDataBuilder();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getZero() {
+  public @java.lang.SuppressWarnings("all") int getZero() {
     return this.zero;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof BuilderAndData)))
@@ -75,16 +75,16 @@ final @lombok.Builder @lombok.Value class BuilderAndValue {
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof BuilderAndData);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getZero());
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("BuilderAndData(zero=" + this.getZero()) + ")");
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderWithAccessors.java b/test/transform/resource/after-ecj/BuilderWithAccessors.java
index d57769c4..a7bee291 100644
--- a/test/transform/resource/after-ecj/BuilderWithAccessors.java
+++ b/test/transform/resource/after-ecj/BuilderWithAccessors.java
@@ -1,32 +1,32 @@
 @lombok.Builder @lombok.experimental.Accessors(prefix = {"p", "_"}) class BuilderWithAccessors {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderWithAccessorsBuilder {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int plower;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int upper;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int foo;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int _bar;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderWithAccessorsBuilder {
+    private @java.lang.SuppressWarnings("all") int plower;
+    private @java.lang.SuppressWarnings("all") int upper;
+    private @java.lang.SuppressWarnings("all") int foo;
+    private @java.lang.SuppressWarnings("all") int _bar;
+    @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder plower(final int plower) {
+    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder plower(final int plower) {
       this.plower = plower;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder upper(final int upper) {
+    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder upper(final int upper) {
       this.upper = upper;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder foo(final int foo) {
+    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder foo(final int foo) {
       this.foo = foo;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder _bar(final int _bar) {
+    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder _bar(final int _bar) {
       this._bar = _bar;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessors build() {
+    public @java.lang.SuppressWarnings("all") BuilderWithAccessors build() {
       return new BuilderWithAccessors(plower, upper, foo, _bar);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower) + ", upper=") + this.upper) + ", foo=") + this.foo) + ", _bar=") + this._bar) + ")");
     }
   }
@@ -34,14 +34,14 @@
   private final int pUpper;
   private int _foo;
   private int __bar;
-  @java.beans.ConstructorProperties({"plower", "upper", "foo", "_bar"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) {
+  @java.lang.SuppressWarnings("all") BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) {
     super();
     this.plower = plower;
     this.pUpper = upper;
     this._foo = foo;
     this.__bar = _bar;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder builder() {
     return new BuilderWithAccessorsBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderWithDeprecated.java b/test/transform/resource/after-ecj/BuilderWithDeprecated.java
index 5282ad9e..09a0b786 100644
--- a/test/transform/resource/after-ecj/BuilderWithDeprecated.java
+++ b/test/transform/resource/after-ecj/BuilderWithDeprecated.java
@@ -2,56 +2,56 @@ import com.google.common.collect.ImmutableList;
 import lombok.Builder;
 import lombok.Singular;
 public @Builder class BuilderWithDeprecated {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderWithDeprecatedBuilder {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String dep1;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int dep2;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> strings;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<Integer> numbers;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithDeprecatedBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderWithDeprecatedBuilder {
+    private @java.lang.SuppressWarnings("all") String dep1;
+    private @java.lang.SuppressWarnings("all") int dep2;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> strings;
+    private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder<Integer> numbers;
+    @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder() {
       super();
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithDeprecatedBuilder dep1(final String dep1) {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder dep1(final String dep1) {
       this.dep1 = dep1;
       return this;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithDeprecatedBuilder dep2(final int dep2) {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder dep2(final int dep2) {
       this.dep2 = dep2;
       return this;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithDeprecatedBuilder string(String string) {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder string(String string) {
       if ((this.strings == null))
           this.strings = new java.util.ArrayList<String>();
       this.strings.add(string);
       return this;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithDeprecatedBuilder strings(java.util.Collection<? extends String> strings) {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder strings(java.util.Collection<? extends String> strings) {
       if ((this.strings == null))
           this.strings = new java.util.ArrayList<String>();
       this.strings.addAll(strings);
       return this;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithDeprecatedBuilder clearStrings() {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder clearStrings() {
       if ((this.strings != null))
           this.strings.clear();
       return this;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithDeprecatedBuilder number(Integer number) {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder number(Integer number) {
       if ((this.numbers == null))
           this.numbers = com.google.common.collect.ImmutableList.builder();
       this.numbers.add(number);
       return this;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithDeprecatedBuilder numbers(java.lang.Iterable<? extends Integer> numbers) {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder numbers(java.lang.Iterable<? extends Integer> numbers) {
       if ((this.numbers == null))
           this.numbers = com.google.common.collect.ImmutableList.builder();
       this.numbers.addAll(numbers);
       return this;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithDeprecatedBuilder clearNumbers() {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder clearNumbers() {
       this.numbers = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithDeprecated build() {
+    public @java.lang.SuppressWarnings("all") BuilderWithDeprecated build() {
       java.util.List<String> strings;
       switch (((this.strings == null) ? 0 : this.strings.size())) {
       case 0 :
@@ -66,7 +66,7 @@ public @Builder class BuilderWithDeprecated {
       com.google.common.collect.ImmutableList<Integer> numbers = ((this.numbers == null) ? com.google.common.collect.ImmutableList.<Integer>of() : this.numbers.build());
       return new BuilderWithDeprecated(dep1, dep2, strings, numbers);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("BuilderWithDeprecated.BuilderWithDeprecatedBuilder(dep1=" + this.dep1) + ", dep2=") + this.dep2) + ", strings=") + this.strings) + ", numbers=") + this.numbers) + ")");
     }
   }
@@ -74,14 +74,14 @@ public @Builder class BuilderWithDeprecated {
   @Deprecated int dep2;
   @Singular @Deprecated java.util.List<String> strings;
   @Singular @Deprecated ImmutableList<Integer> numbers;
-  @java.beans.ConstructorProperties({"dep1", "dep2", "strings", "numbers"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List<String> strings, final ImmutableList<Integer> numbers) {
+  @java.lang.SuppressWarnings("all") BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List<String> strings, final ImmutableList<Integer> numbers) {
     super();
     this.dep1 = dep1;
     this.dep2 = dep2;
     this.strings = strings;
     this.numbers = numbers;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithDeprecatedBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder builder() {
     return new BuilderWithDeprecatedBuilder();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
index 1c23e0ee..0e6ba335 100644
--- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
+++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
@@ -1,26 +1,26 @@
 import lombok.Builder;
 class BuilderWithExistingBuilderClass<T, K extends Number> {
   public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean arg2;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String arg3;
+    private @java.lang.SuppressWarnings("all") boolean arg2;
+    private @java.lang.SuppressWarnings("all") String arg3;
     private Z arg1;
     public void arg2(boolean arg) {
     }
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) {
+    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) {
       this.arg1 = arg1;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) {
+    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) {
       this.arg3 = arg3;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClass<String, Z> build() {
+    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass<String, Z> build() {
       return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ")");
     }
   }
@@ -30,7 +30,7 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
   public static @Builder <Z extends Number>BuilderWithExistingBuilderClass<String, Z> staticMethod(Z arg1, boolean arg2, String arg3) {
     return null;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <Z extends Number>BuilderWithExistingBuilderClassBuilder<Z> builder() {
+  public static @java.lang.SuppressWarnings("all") <Z extends Number>BuilderWithExistingBuilderClassBuilder<Z> builder() {
     return new BuilderWithExistingBuilderClassBuilder<Z>();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java b/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java
index 92a3b641..8246ca2c 100644
--- a/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java
+++ b/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java
@@ -5,44 +5,44 @@ public class BuilderWithRecursiveGenerics {
   interface Inter<T, U extends Inter<T, U>> {
   }
   public static final @Builder @Value class Test<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
-    public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class TestBuilder<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
-      private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Foo foo;
-      private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Bar bar;
-      @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") TestBuilder() {
+    public static @java.lang.SuppressWarnings("all") class TestBuilder<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
+      private @java.lang.SuppressWarnings("all") Foo foo;
+      private @java.lang.SuppressWarnings("all") Bar bar;
+      @java.lang.SuppressWarnings("all") TestBuilder() {
         super();
       }
-      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") TestBuilder<Foo, Bar, Quz> foo(final Foo foo) {
+      public @java.lang.SuppressWarnings("all") TestBuilder<Foo, Bar, Quz> foo(final Foo foo) {
         this.foo = foo;
         return this;
       }
-      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") TestBuilder<Foo, Bar, Quz> bar(final Bar bar) {
+      public @java.lang.SuppressWarnings("all") TestBuilder<Foo, Bar, Quz> bar(final Bar bar) {
         this.bar = bar;
         return this;
       }
-      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Test<Foo, Bar, Quz> build() {
+      public @java.lang.SuppressWarnings("all") Test<Foo, Bar, Quz> build() {
         return new Test<Foo, Bar, Quz>(foo, bar);
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
         return (((("BuilderWithRecursiveGenerics.Test.TestBuilder(foo=" + this.foo) + ", bar=") + this.bar) + ")");
       }
     }
     private final Foo foo;
     private final Bar bar;
-    @java.beans.ConstructorProperties({"foo", "bar"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Test(final Foo foo, final Bar bar) {
+    @java.lang.SuppressWarnings("all") Test(final Foo foo, final Bar bar) {
       super();
       this.foo = foo;
       this.bar = bar;
     }
-    public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>>TestBuilder<Foo, Bar, Quz> builder() {
+    public static @java.lang.SuppressWarnings("all") <Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>>TestBuilder<Foo, Bar, Quz> builder() {
       return new TestBuilder<Foo, Bar, Quz>();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Foo getFoo() {
+    public @java.lang.SuppressWarnings("all") Foo getFoo() {
       return this.foo;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Bar getBar() {
+    public @java.lang.SuppressWarnings("all") Bar getBar() {
       return this.bar;
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
       if ((o == this))
           return true;
       if ((! (o instanceof BuilderWithRecursiveGenerics.Test)))
@@ -58,7 +58,7 @@ public class BuilderWithRecursiveGenerics {
           return false;
       return true;
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
       final int PRIME = 59;
       int result = 1;
       final java.lang.Object $foo = this.getFoo();
@@ -67,7 +67,7 @@ public class BuilderWithRecursiveGenerics {
       result = ((result * PRIME) + (($bar == null) ? 43 : $bar.hashCode()));
       return result;
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((("BuilderWithRecursiveGenerics.Test(foo=" + this.getFoo()) + ", bar=") + this.getBar()) + ")");
     }
   }
diff --git a/test/transform/resource/after-ecj/BuilderWithToBuilder.java b/test/transform/resource/after-ecj/BuilderWithToBuilder.java
index 2c08e510..d304293c 100644
--- a/test/transform/resource/after-ecj/BuilderWithToBuilder.java
+++ b/test/transform/resource/after-ecj/BuilderWithToBuilder.java
@@ -1,44 +1,44 @@
 import java.util.List;
 import lombok.Builder;
 @Builder(toBuilder = true) @lombok.experimental.Accessors(prefix = "m") class BuilderWithToBuilder<T> {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderWithToBuilderBuilder<T> {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String one;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String two;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") T foo;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<T> bars;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder() {
+  public static @java.lang.SuppressWarnings("all") class BuilderWithToBuilderBuilder<T> {
+    private @java.lang.SuppressWarnings("all") String one;
+    private @java.lang.SuppressWarnings("all") String two;
+    private @java.lang.SuppressWarnings("all") T foo;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<T> bars;
+    @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> one(final String one) {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> one(final String one) {
       this.one = one;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> two(final String two) {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> two(final String two) {
       this.two = two;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> foo(final T foo) {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> foo(final T foo) {
       this.foo = foo;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> bar(T bar) {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> bar(T bar) {
       if ((this.bars == null))
           this.bars = new java.util.ArrayList<T>();
       this.bars.add(bar);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> bars(java.util.Collection<? extends T> bars) {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> bars(java.util.Collection<? extends T> bars) {
       if ((this.bars == null))
           this.bars = new java.util.ArrayList<T>();
       this.bars.addAll(bars);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> clearBars() {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> clearBars() {
       if ((this.bars != null))
           this.bars.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilder<T> build() {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilder<T> build() {
       java.util.List<T> bars;
       switch (((this.bars == null) ? 0 : this.bars.size())) {
       case 0 :
@@ -52,7 +52,7 @@ import lombok.Builder;
       }
       return new BuilderWithToBuilder<T>(one, two, foo, bars);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one) + ", two=") + this.two) + ", foo=") + this.foo) + ", bars=") + this.bars) + ")");
     }
   }
@@ -63,39 +63,39 @@ import lombok.Builder;
   public static <K>K rrr(BuilderWithToBuilder<K> x) {
     return x.foo;
   }
-  @java.beans.ConstructorProperties({"one", "two", "foo", "bars"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilder(final String one, final String two, final T foo, final List<T> bars) {
+  @java.lang.SuppressWarnings("all") BuilderWithToBuilder(final String one, final String two, final T foo, final List<T> bars) {
     super();
     this.mOne = one;
     this.mTwo = two;
     this.foo = foo;
     this.bars = bars;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderWithToBuilderBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") <T>BuilderWithToBuilderBuilder<T> builder() {
     return new BuilderWithToBuilderBuilder<T>();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> toBuilder() {
+  public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> toBuilder() {
     return new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(this.bars);
   }
 }
 @lombok.experimental.Accessors(prefix = "m") class ConstructorWithToBuilder<T> {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class ConstructorWithToBuilderBuilder<T> {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String mOne;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") T bar;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder() {
+  public static @java.lang.SuppressWarnings("all") class ConstructorWithToBuilderBuilder<T> {
+    private @java.lang.SuppressWarnings("all") String mOne;
+    private @java.lang.SuppressWarnings("all") T bar;
+    @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder<T> mOne(final String mOne) {
+    public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder<T> mOne(final String mOne) {
       this.mOne = mOne;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder<T> bar(final T bar) {
+    public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder<T> bar(final T bar) {
       this.bar = bar;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilder<T> build() {
+    public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder<T> build() {
       return new ConstructorWithToBuilder<T>(mOne, bar);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((("ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne) + ", bar=") + this.bar) + ")");
     }
   }
@@ -106,32 +106,32 @@ import lombok.Builder;
   public @Builder(toBuilder = true) ConstructorWithToBuilder(String mOne, @Builder.ObtainVia(field = "foo") T bar) {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>ConstructorWithToBuilderBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") <T>ConstructorWithToBuilderBuilder<T> builder() {
     return new ConstructorWithToBuilderBuilder<T>();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder<T> toBuilder() {
+  public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder<T> toBuilder() {
     return new ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo);
   }
 }
 @lombok.experimental.Accessors(prefix = "m") class StaticWithToBuilder<T, K> {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class StaticWithToBuilderBuilder<Z> {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String mOne;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Z bar;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder() {
+  public static @java.lang.SuppressWarnings("all") class StaticWithToBuilderBuilder<Z> {
+    private @java.lang.SuppressWarnings("all") String mOne;
+    private @java.lang.SuppressWarnings("all") Z bar;
+    @java.lang.SuppressWarnings("all") StaticWithToBuilderBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder<Z> mOne(final String mOne) {
+    public @java.lang.SuppressWarnings("all") StaticWithToBuilderBuilder<Z> mOne(final String mOne) {
       this.mOne = mOne;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder<Z> bar(final Z bar) {
+    public @java.lang.SuppressWarnings("all") StaticWithToBuilderBuilder<Z> bar(final Z bar) {
       this.bar = bar;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilder<Z, String> build() {
+    public @java.lang.SuppressWarnings("all") StaticWithToBuilder<Z, String> build() {
       return StaticWithToBuilder.<Z>test(mOne, bar);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((("StaticWithToBuilder.StaticWithToBuilderBuilder(mOne=" + this.mOne) + ", bar=") + this.bar) + ")");
     }
   }
@@ -146,10 +146,10 @@ import lombok.Builder;
   public static @Builder(toBuilder = true) <Z>StaticWithToBuilder<Z, String> test(String mOne, @Builder.ObtainVia(field = "foo") Z bar) {
     return new StaticWithToBuilder<Z, String>();
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <Z>StaticWithToBuilderBuilder<Z> builder() {
+  public static @java.lang.SuppressWarnings("all") <Z>StaticWithToBuilderBuilder<Z> builder() {
     return new StaticWithToBuilderBuilder<Z>();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder<T> toBuilder() {
+  public @java.lang.SuppressWarnings("all") StaticWithToBuilderBuilder<T> toBuilder() {
     return new StaticWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo);
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderWithTolerate.java b/test/transform/resource/after-ecj/BuilderWithTolerate.java
index dd6e28eb..b64fd49a 100644
--- a/test/transform/resource/after-ecj/BuilderWithTolerate.java
+++ b/test/transform/resource/after-ecj/BuilderWithTolerate.java
@@ -2,21 +2,21 @@ import lombok.Builder;
 import lombok.experimental.Tolerate;
 public @Builder class BuilderWithTolerate {
   public static class BuilderWithTolerateBuilder {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int value;
+    private @java.lang.SuppressWarnings("all") int value;
     public @Tolerate BuilderWithTolerateBuilder value(String s) {
       return this.value(Integer.parseInt(s));
     }
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerateBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderWithTolerateBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerateBuilder value(final int value) {
+    public @java.lang.SuppressWarnings("all") BuilderWithTolerateBuilder value(final int value) {
       this.value = value;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerate build() {
+    public @java.lang.SuppressWarnings("all") BuilderWithTolerate build() {
       return new BuilderWithTolerate(value);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value) + ")");
     }
   }
@@ -24,11 +24,11 @@ public @Builder class BuilderWithTolerate {
   public static void main(String[] args) {
     BuilderWithTolerate.builder().value("42").build();
   }
-  @java.beans.ConstructorProperties({"value"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerate(final int value) {
+  @java.lang.SuppressWarnings("all") BuilderWithTolerate(final int value) {
     super();
     this.value = value;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerateBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") BuilderWithTolerateBuilder builder() {
     return new BuilderWithTolerateBuilder();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
index 79b422cc..fdb6f122 100644
--- a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
+++ b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
@@ -3,7 +3,7 @@ class GetFoo {
   GetFoo() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFoo() {
+  public @java.lang.SuppressWarnings("all") int getFoo() {
     return this.foo;
   }
 }
diff --git a/test/transform/resource/after-ecj/CommentsInterspersed.java b/test/transform/resource/after-ecj/CommentsInterspersed.java
index 95489d54..d708ad72 100644
--- a/test/transform/resource/after-ecj/CommentsInterspersed.java
+++ b/test/transform/resource/after-ecj/CommentsInterspersed.java
@@ -6,7 +6,7 @@ public class CommentsInterspersed {
     super();
   }
   public native void gwtTest();
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getTest() {
+  public @java.lang.SuppressWarnings("all") String getTest() {
     return this.test;
   }
 }
diff --git a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java
index f9437f0e..0d234d36 100644
--- a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java
+++ b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java
@@ -1,5 +1,5 @@
 @lombok.Data(staticConstructor = "of") @lombok.NoArgsConstructor class ConflictingStaticConstructorNames {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof ConflictingStaticConstructorNames)))
@@ -9,17 +9,17 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof ConflictingStaticConstructorNames);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return "ConflictingStaticConstructorNames()";
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConflictingStaticConstructorNames() {
+  public @java.lang.SuppressWarnings("all") ConflictingStaticConstructorNames() {
     super();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/Constructors.java b/test/transform/resource/after-ecj/Constructors.java
index 42c07fd0..8f8ee129 100644
--- a/test/transform/resource/after-ecj/Constructors.java
+++ b/test/transform/resource/after-ecj/Constructors.java
@@ -1,7 +1,7 @@
 @lombok.RequiredArgsConstructor class RequiredArgsConstructor1 {
   final int x;
   String name;
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructor1(final int x) {
+  public @java.lang.SuppressWarnings("all") RequiredArgsConstructor1(final int x) {
     super();
     this.x = x;
   }
@@ -9,7 +9,7 @@
 @lombok.RequiredArgsConstructor(access = lombok.AccessLevel.PROTECTED) class RequiredArgsConstructorAccess {
   final int x;
   String name;
-  protected @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorAccess(final int x) {
+  protected @java.lang.SuppressWarnings("all") RequiredArgsConstructorAccess(final int x) {
     super();
     this.x = x;
   }
@@ -17,18 +17,18 @@
 @lombok.RequiredArgsConstructor(staticName = "staticname") class RequiredArgsConstructorStaticName {
   final int x;
   String name;
-  private @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticName(final int x) {
+  private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticName(final int x) {
     super();
     this.x = x;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticName staticname(final int x) {
+  public static @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticName staticname(final int x) {
     return new RequiredArgsConstructorStaticName(x);
   }
 }
 @lombok.RequiredArgsConstructor() class RequiredArgsConstructorWithAnnotations {
   final int x;
   String name;
-  public @Deprecated @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorWithAnnotations(final int x) {
+  public @Deprecated @java.lang.SuppressWarnings("all") RequiredArgsConstructorWithAnnotations(final int x) {
     super();
     this.x = x;
   }
@@ -36,7 +36,7 @@
 @lombok.AllArgsConstructor class AllArgsConstructor1 {
   final int x;
   String name;
-  public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AllArgsConstructor1(final int x, final String name) {
+  public @java.lang.SuppressWarnings("all") AllArgsConstructor1(final int x, final String name) {
     super();
     this.x = x;
     this.name = name;
@@ -45,35 +45,35 @@
 @lombok.NoArgsConstructor class NoArgsConstructor1 {
   int x;
   String name;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoArgsConstructor1() {
+  public @java.lang.SuppressWarnings("all") NoArgsConstructor1() {
     super();
   }
 }
 @lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics<T extends Number> {
   final T x;
   String name;
-  private @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticNameGenerics(final T x) {
+  private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics(final T x) {
     super();
     this.x = x;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>RequiredArgsConstructorStaticNameGenerics<T> of(final T x) {
+  public static @java.lang.SuppressWarnings("all") <T extends Number>RequiredArgsConstructorStaticNameGenerics<T> of(final T x) {
     return new RequiredArgsConstructorStaticNameGenerics<T>(x);
   }
 }
 @lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics2<T extends Number> {
   final Class<T> x;
   String name;
-  private @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) {
+  private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) {
     super();
     this.x = x;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) {
+  public static @java.lang.SuppressWarnings("all") <T extends Number>RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) {
     return new RequiredArgsConstructorStaticNameGenerics2<T>(x);
   }
 }
 @lombok.AllArgsConstructor(access = lombok.AccessLevel.PACKAGE) class AllArgsConstructorPackageAccess {
   final String x;
-  @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AllArgsConstructorPackageAccess(final String x) {
+  @java.lang.SuppressWarnings("all") AllArgsConstructorPackageAccess(final String x) {
     super();
     this.x = x;
   }
@@ -86,7 +86,7 @@
   final float f;
   final String s;
   byte z;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoArgsConstructor2() {
+  public @java.lang.SuppressWarnings("all") NoArgsConstructor2() {
     super();
     this.x = 0;
     this.y = 0D;
diff --git a/test/transform/resource/after-ecj/ConstructorsConfiguration.java b/test/transform/resource/after-ecj/ConstructorsConfiguration.java
index 3ca13844..2e88a59f 100644
--- a/test/transform/resource/after-ecj/ConstructorsConfiguration.java
+++ b/test/transform/resource/after-ecj/ConstructorsConfiguration.java
@@ -1,6 +1,6 @@
 @lombok.AllArgsConstructor class ConstructorsConfiguration {
   int x;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsConfiguration(final int x) {
+  public @java.lang.SuppressWarnings("all") ConstructorsConfiguration(final int x) {
     super();
     this.x = x;
   }
diff --git a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
index 0876a5e4..301e6132 100644
--- a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
+++ b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
@@ -3,7 +3,7 @@
   int pUpper;
   int _huh;
   int __huh2;
-  public @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) {
+  public @java.lang.SuppressWarnings("all") ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) {
     super();
     this.plower = plower;
     this.pUpper = upper;
@@ -16,7 +16,7 @@
   @lombok.NonNull Integer pUpper;
   @lombok.NonNull Integer _huh;
   final @lombok.NonNull Integer __huh2;
-  public @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsWithAccessorsNonNull(final @lombok.NonNull Integer plower, final @lombok.NonNull Integer upper, final @lombok.NonNull Integer huh, final @lombok.NonNull Integer _huh2) {
+  public @java.lang.SuppressWarnings("all") ConstructorsWithAccessorsNonNull(final @lombok.NonNull Integer plower, final @lombok.NonNull Integer upper, final @lombok.NonNull Integer huh, final @lombok.NonNull Integer _huh2) {
     super();
     if ((plower == null))
         {
diff --git a/test/transform/resource/after-ecj/DataConfiguration.java b/test/transform/resource/after-ecj/DataConfiguration.java
index 942613ca..1e7adfbf 100644
--- a/test/transform/resource/after-ecj/DataConfiguration.java
+++ b/test/transform/resource/after-ecj/DataConfiguration.java
@@ -1,9 +1,9 @@
 @lombok.Data class DataConfiguration {
   final int x;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof DataConfiguration)))
@@ -15,19 +15,19 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof DataConfiguration);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("DataConfiguration(x=" + this.x) + ")");
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataConfiguration(final int x) {
+  public @java.lang.SuppressWarnings("all") DataConfiguration(final int x) {
     super();
     this.x = x;
   }
diff --git a/test/transform/resource/after-ecj/DataExtended.java b/test/transform/resource/after-ecj/DataExtended.java
index 46446a0f..3250421f 100644
--- a/test/transform/resource/after-ecj/DataExtended.java
+++ b/test/transform/resource/after-ecj/DataExtended.java
@@ -1,12 +1,12 @@
 @lombok.Data @lombok.ToString(doNotUseGetters = true) class DataExtended {
   int x;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) {
+  public @java.lang.SuppressWarnings("all") void setX(final int x) {
     this.x = x;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof DataExtended)))
@@ -18,19 +18,19 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof DataExtended);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
     return result;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataExtended() {
+  public @java.lang.SuppressWarnings("all") DataExtended() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("DataExtended(x=" + this.x) + ")");
   }
 }
diff --git a/test/transform/resource/after-ecj/DataIgnore.java b/test/transform/resource/after-ecj/DataIgnore.java
index dbf9713f..d3ac8aa3 100644
--- a/test/transform/resource/after-ecj/DataIgnore.java
+++ b/test/transform/resource/after-ecj/DataIgnore.java
@@ -1,10 +1,10 @@
 @lombok.Data class DataIgnore {
   final int x;
   String $name;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof DataIgnore)))
@@ -16,19 +16,19 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof DataIgnore);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("DataIgnore(x=" + this.getX()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataIgnore(final int x) {
+  public @java.lang.SuppressWarnings("all") DataIgnore(final int x) {
     super();
     this.x = x;
   }
diff --git a/test/transform/resource/after-ecj/DataOnEnum.java b/test/transform/resource/after-ecj/DataOnEnum.java
index 5ded0767..0f07088e 100644
--- a/test/transform/resource/after-ecj/DataOnEnum.java
+++ b/test/transform/resource/after-ecj/DataOnEnum.java
@@ -3,13 +3,13 @@ public @lombok.Getter @lombok.ToString @lombok.RequiredArgsConstructor enum Data
   private final String someField;
   <clinit>() {
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getSomeField() {
+  public @java.lang.SuppressWarnings("all") String getSomeField() {
     return this.someField;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("DataOnEnum(someField=" + this.getSomeField()) + ")");
   }
-  private @java.beans.ConstructorProperties({"someField"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataOnEnum(final String someField) {
+  private @java.lang.SuppressWarnings("all") DataOnEnum(final String someField) {
     super();
     this.someField = someField;
   }
diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java
index a86837e3..341df49b 100644
--- a/test/transform/resource/after-ecj/DataOnLocalClass.java
+++ b/test/transform/resource/after-ecj/DataOnLocalClass.java
@@ -7,16 +7,16 @@ class DataOnLocalClass1 {
     @Data class Local {
       final int x;
       String name;
-      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+      public @java.lang.SuppressWarnings("all") int getX() {
         return this.x;
       }
-      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
+      public @java.lang.SuppressWarnings("all") String getName() {
         return this.name;
       }
-      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) {
+      public @java.lang.SuppressWarnings("all") void setName(final String name) {
         this.name = name;
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
         if ((o == this))
             return true;
         if ((! (o instanceof Local)))
@@ -32,10 +32,10 @@ class DataOnLocalClass1 {
             return false;
         return true;
       }
-      protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+      protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
         return (other instanceof Local);
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
         final int PRIME = 59;
         int result = 1;
         result = ((result * PRIME) + this.getX());
@@ -43,10 +43,10 @@ class DataOnLocalClass1 {
         result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode()));
         return result;
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
         return (((("Local(x=" + this.getX()) + ", name=") + this.getName()) + ")");
       }
-      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Local(final int x) {
+      public @java.lang.SuppressWarnings("all") Local(final int x) {
         super();
         this.x = x;
       }
@@ -58,17 +58,17 @@ class DataOnLocalClass2 {
     @Data class Local {
       @Data class InnerLocal {
         @lombok.NonNull String name;
-        public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
+        public @lombok.NonNull @java.lang.SuppressWarnings("all") String getName() {
           return this.name;
         }
-        public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final @lombok.NonNull String name) {
+        public @java.lang.SuppressWarnings("all") void setName(final @lombok.NonNull String name) {
           if ((name == null))
               {
                 throw new java.lang.NullPointerException("name");
               }
           this.name = name;
         }
-        public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+        public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
           if ((o == this))
               return true;
           if ((! (o instanceof Local.InnerLocal)))
@@ -82,20 +82,20 @@ class DataOnLocalClass2 {
               return false;
           return true;
         }
-        protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+        protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
           return (other instanceof Local.InnerLocal);
         }
-        public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+        public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
           final int PRIME = 59;
           int result = 1;
           final java.lang.Object $name = this.getName();
           result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode()));
           return result;
         }
-        public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+        public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
           return (("Local.InnerLocal(name=" + this.getName()) + ")");
         }
-        public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InnerLocal(final @lombok.NonNull String name) {
+        public @java.lang.SuppressWarnings("all") InnerLocal(final @lombok.NonNull String name) {
           super();
           if ((name == null))
               {
@@ -105,10 +105,10 @@ class DataOnLocalClass2 {
         }
       }
       final int x;
-      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+      public @java.lang.SuppressWarnings("all") int getX() {
         return this.x;
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
         if ((o == this))
             return true;
         if ((! (o instanceof Local)))
@@ -120,19 +120,19 @@ class DataOnLocalClass2 {
             return false;
         return true;
       }
-      protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+      protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
         return (other instanceof Local);
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
         final int PRIME = 59;
         int result = 1;
         result = ((result * PRIME) + this.getX());
         return result;
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
         return (("Local(x=" + this.getX()) + ")");
       }
-      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Local(final int x) {
+      public @java.lang.SuppressWarnings("all") Local(final int x) {
         super();
         this.x = x;
       }
diff --git a/test/transform/resource/after-ecj/DataPlain.java b/test/transform/resource/after-ecj/DataPlain.java
index 125d1dfa..eaeef509 100644
--- a/test/transform/resource/after-ecj/DataPlain.java
+++ b/test/transform/resource/after-ecj/DataPlain.java
@@ -2,16 +2,16 @@ import lombok.Data;
 @lombok.Data class Data1 {
   final int x;
   String name;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
+  public @java.lang.SuppressWarnings("all") String getName() {
     return this.name;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) {
+  public @java.lang.SuppressWarnings("all") void setName(final String name) {
     this.name = name;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Data1)))
@@ -27,10 +27,10 @@ import lombok.Data;
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof Data1);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -38,10 +38,10 @@ import lombok.Data;
     result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("Data1(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data1(final int x) {
+  public @java.lang.SuppressWarnings("all") Data1(final int x) {
     super();
     this.x = x;
   }
@@ -49,16 +49,16 @@ import lombok.Data;
 @Data class Data2 {
   final int x;
   String name;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
+  public @java.lang.SuppressWarnings("all") String getName() {
     return this.name;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) {
+  public @java.lang.SuppressWarnings("all") void setName(final String name) {
     this.name = name;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Data2)))
@@ -74,10 +74,10 @@ import lombok.Data;
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof Data2);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -85,10 +85,10 @@ import lombok.Data;
     result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("Data2(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data2(final int x) {
+  public @java.lang.SuppressWarnings("all") Data2(final int x) {
     super();
     this.x = x;
   }
@@ -96,16 +96,16 @@ import lombok.Data;
 final @Data class Data3 {
   final int x;
   String name;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
+  public @java.lang.SuppressWarnings("all") String getName() {
     return this.name;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) {
+  public @java.lang.SuppressWarnings("all") void setName(final String name) {
     this.name = name;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Data3)))
@@ -119,7 +119,7 @@ final @Data class Data3 {
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -127,10 +127,10 @@ final @Data class Data3 {
     result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("Data3(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data3(final int x) {
+  public @java.lang.SuppressWarnings("all") Data3(final int x) {
     super();
     this.x = x;
   }
@@ -140,16 +140,16 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
   Data4() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) {
+  public @java.lang.SuppressWarnings("all") void setX(final int x) {
     this.x = x;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("Data4(x=" + this.getX()) + ")");
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Data4)))
@@ -163,10 +163,10 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof Data4);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = super.hashCode();
     result = ((result * PRIME) + this.getX());
@@ -174,7 +174,7 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
   }
 }
 @Data class Data5 {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Data5)))
@@ -184,36 +184,36 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof Data5);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return "Data5()";
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data5() {
+  public @java.lang.SuppressWarnings("all") Data5() {
     super();
   }
 }
 final @Data class Data6 {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Data6)))
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return "Data6()";
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data6() {
+  public @java.lang.SuppressWarnings("all") Data6() {
     super();
   }
 }
diff --git a/test/transform/resource/after-ecj/DataWithGetter.java b/test/transform/resource/after-ecj/DataWithGetter.java
index 5a358c89..fa291eca 100644
--- a/test/transform/resource/after-ecj/DataWithGetter.java
+++ b/test/transform/resource/after-ecj/DataWithGetter.java
@@ -2,13 +2,13 @@
   private int x;
   private int y;
   private final String z;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) {
+  public @java.lang.SuppressWarnings("all") void setX(final int x) {
     this.x = x;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setY(final int y) {
+  public @java.lang.SuppressWarnings("all") void setY(final int y) {
     this.y = y;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof DataWithGetter)))
@@ -26,10 +26,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof DataWithGetter);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -38,20 +38,20 @@
     result = ((result * PRIME) + (($z == null) ? 43 : $z.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((((("DataWithGetter(x=" + this.getX()) + ", y=") + this.getY()) + ", z=") + this.getZ()) + ")");
   }
-  public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataWithGetter(final String z) {
+  public @java.lang.SuppressWarnings("all") DataWithGetter(final String z) {
     super();
     this.z = z;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() {
+  public @java.lang.SuppressWarnings("all") int getY() {
     return this.y;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getZ() {
+  public @java.lang.SuppressWarnings("all") String getZ() {
     return this.z;
   }
 }
diff --git a/test/transform/resource/after-ecj/DataWithGetterNone.java b/test/transform/resource/after-ecj/DataWithGetterNone.java
index b03ce146..4545dc46 100644
--- a/test/transform/resource/after-ecj/DataWithGetterNone.java
+++ b/test/transform/resource/after-ecj/DataWithGetterNone.java
@@ -2,13 +2,13 @@
   private int x;
   private int y;
   private final String z;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) {
+  public @java.lang.SuppressWarnings("all") void setX(final int x) {
     this.x = x;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setY(final int y) {
+  public @java.lang.SuppressWarnings("all") void setY(final int y) {
     this.y = y;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof DataWithGetterNone)))
@@ -26,10 +26,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof DataWithGetterNone);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
@@ -38,10 +38,10 @@
     result = ((result * PRIME) + (($z == null) ? 43 : $z.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((((("DataWithGetterNone(x=" + this.x) + ", y=") + this.y) + ", z=") + this.z) + ")");
   }
-  public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataWithGetterNone(final String z) {
+  public @java.lang.SuppressWarnings("all") DataWithGetterNone(final String z) {
     super();
     this.z = z;
   }
diff --git a/test/transform/resource/after-ecj/DelegateOnGetter.java b/test/transform/resource/after-ecj/DelegateOnGetter.java
index 06b57ceb..59f6a3b8 100644
--- a/test/transform/resource/after-ecj/DelegateOnGetter.java
+++ b/test/transform/resource/after-ecj/DelegateOnGetter.java
@@ -9,7 +9,7 @@ class DelegateOnGetter {
   DelegateOnGetter() {
     super();
   }
-  public @Delegate @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Bar getBar() {
+  public @Delegate @java.lang.SuppressWarnings("all") Bar getBar() {
     java.lang.Object value = this.bar.get();
     if ((value == null))
         {
@@ -35,10 +35,10 @@ class DelegateOnGetter {
         }
     return (Bar) ((value == this.bar) ? null : value);
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getInt() {
+  public @java.lang.SuppressWarnings("all") int getInt() {
     return this.getBar().getInt();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setList(final java.util.ArrayList<java.lang.String> list) {
+  public @java.lang.SuppressWarnings("all") void setList(final java.util.ArrayList<java.lang.String> list) {
     this.getBar().setList(list);
   }
 }
diff --git a/test/transform/resource/after-ecj/DelegateOnGetterNone.java b/test/transform/resource/after-ecj/DelegateOnGetterNone.java
index 2018e1e9..0cfb02c0 100644
--- a/test/transform/resource/after-ecj/DelegateOnGetterNone.java
+++ b/test/transform/resource/after-ecj/DelegateOnGetterNone.java
@@ -10,10 +10,10 @@ import lombok.Getter;
   DelegateOnGetterNone() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getInt() {
+  public @java.lang.SuppressWarnings("all") int getInt() {
     return this.bar.getInt();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setList(final java.util.ArrayList<java.lang.String> list) {
+  public @java.lang.SuppressWarnings("all") void setList(final java.util.ArrayList<java.lang.String> list) {
     this.bar.setList(list);
   }
 }
diff --git a/test/transform/resource/after-ecj/DelegateOnMethods.java b/test/transform/resource/after-ecj/DelegateOnMethods.java
index 3e833ebb..6560657c 100644
--- a/test/transform/resource/after-ecj/DelegateOnMethods.java
+++ b/test/transform/resource/after-ecj/DelegateOnMethods.java
@@ -7,7 +7,7 @@ abstract class DelegateOnMethods {
     super();
   }
   public abstract @Delegate Bar getBar();
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void bar(final java.util.ArrayList<java.lang.String> list) {
+  public @java.lang.SuppressWarnings("all") void bar(final java.util.ArrayList<java.lang.String> list) {
     this.getBar().bar(list);
   }
 }
diff --git a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java
index 3718c5d9..86f54139 100644
--- a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java
+++ b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java
@@ -27,10 +27,10 @@ class DelegatePlain {
   DelegatePlain() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void bar(final java.util.ArrayList<java.lang.String> list) {
+  public @java.lang.SuppressWarnings("all") void bar(final java.util.ArrayList<java.lang.String> list) {
     this.bar.bar(list);
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void foo() {
+  public @java.lang.SuppressWarnings("all") void foo() {
     this.foo.foo();
   }
 }
diff --git a/test/transform/resource/after-ecj/DelegateWithDeprecated.java b/test/transform/resource/after-ecj/DelegateWithDeprecated.java
index ab3aa188..71eb7889 100644
--- a/test/transform/resource/after-ecj/DelegateWithDeprecated.java
+++ b/test/transform/resource/after-ecj/DelegateWithDeprecated.java
@@ -9,13 +9,13 @@ class DelegateWithDeprecated {
   DelegateWithDeprecated() {
     super();
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void deprecatedAnnotation() {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void deprecatedAnnotation() {
     this.bar.deprecatedAnnotation();
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void deprecatedComment() {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void deprecatedComment() {
     this.bar.deprecatedComment();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void notDeprecated() {
+  public @java.lang.SuppressWarnings("all") void notDeprecated() {
     this.bar.notDeprecated();
   }
 }
diff --git a/test/transform/resource/after-ecj/DelegateWithVarargs.java b/test/transform/resource/after-ecj/DelegateWithVarargs.java
index a0b5b7b5..71a0ca5a 100644
--- a/test/transform/resource/after-ecj/DelegateWithVarargs.java
+++ b/test/transform/resource/after-ecj/DelegateWithVarargs.java
@@ -10,16 +10,16 @@ class DelegateWithVarargs {
   DelegateWithVarargs() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void array(final int[] array) {
+  public @java.lang.SuppressWarnings("all") void array(final int[] array) {
     this.bar.array(array);
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void arrayVarargs(final int[]... arrayVarargs) {
+  public @java.lang.SuppressWarnings("all") void arrayVarargs(final int[]... arrayVarargs) {
     this.bar.arrayVarargs(arrayVarargs);
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void justOneParameter(final int... varargs) {
+  public @java.lang.SuppressWarnings("all") void justOneParameter(final int... varargs) {
     this.bar.justOneParameter(varargs);
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void multipleParameters(final java.lang.String first, final int... varargs) {
+  public @java.lang.SuppressWarnings("all") void multipleParameters(final java.lang.String first, final int... varargs) {
     this.bar.multipleParameters(first, varargs);
   }
 }
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCode.java b/test/transform/resource/after-ecj/EqualsAndHashCode.java
index 74936ff2..8baa61f2 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCode.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCode.java
@@ -7,7 +7,7 @@
   EqualsAndHashCode() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCode)))
@@ -31,10 +31,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof EqualsAndHashCode);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
@@ -56,7 +56,7 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 {
   EqualsAndHashCode2() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCode2)))
@@ -74,7 +74,7 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 {
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
@@ -91,7 +91,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
   EqualsAndHashCode3() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCode3)))
@@ -101,10 +101,10 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof EqualsAndHashCode3);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     int result = 1;
     return result;
   }
@@ -113,7 +113,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
   EqualsAndHashCode4() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCode4)))
@@ -125,10 +125,10 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof EqualsAndHashCode4);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     int result = super.hashCode();
     return result;
   }
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java
index d2c7b201..1561962c 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java
@@ -2,7 +2,7 @@
   EqualsAndHashCodeConfigKeys1Parent() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeConfigKeys1Parent)))
@@ -12,10 +12,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof EqualsAndHashCodeConfigKeys1Parent);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     int result = 1;
     return result;
   }
@@ -25,7 +25,7 @@
   EqualsAndHashCodeConfigKeys1() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeConfigKeys1)))
@@ -37,10 +37,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof EqualsAndHashCodeConfigKeys1);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java
index a0cc1046..0245eae0 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java
@@ -2,7 +2,7 @@
   EqualsAndHashCodeConfigKeys2Object() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeConfigKeys2Object)))
@@ -12,10 +12,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof EqualsAndHashCodeConfigKeys2Object);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     int result = 1;
     return result;
   }
@@ -24,7 +24,7 @@
   EqualsAndHashCodeConfigKeys2Parent() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeConfigKeys2Parent)))
@@ -34,10 +34,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof EqualsAndHashCodeConfigKeys2Parent);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     int result = 1;
     return result;
   }
@@ -47,7 +47,7 @@
   EqualsAndHashCodeConfigKeys2() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeConfigKeys2)))
@@ -61,10 +61,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof EqualsAndHashCodeConfigKeys2);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = super.hashCode();
     result = ((result * PRIME) + this.x);
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeNestedShadow.java b/test/transform/resource/after-ecj/EqualsAndHashCodeNestedShadow.java
index 5af6e9d8..e08f523d 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCodeNestedShadow.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeNestedShadow.java
@@ -6,7 +6,7 @@ interface EqualsAndHashCodeNestedShadow {
       public Foo() {
         super();
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
         if ((o == this))
             return true;
         if ((! (o instanceof EqualsAndHashCodeNestedShadow.Bar.Foo)))
@@ -16,10 +16,10 @@ interface EqualsAndHashCodeNestedShadow {
             return false;
         return true;
       }
-      protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+      protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
         return (other instanceof EqualsAndHashCodeNestedShadow.Bar.Foo);
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
         int result = 1;
         return result;
       }
@@ -33,7 +33,7 @@ interface EqualsAndHashCodeNestedShadow {
       public Foo() {
         super();
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
         if ((o == this))
             return true;
         if ((! (o instanceof EqualsAndHashCodeNestedShadow.Baz.Foo)))
@@ -43,10 +43,10 @@ interface EqualsAndHashCodeNestedShadow {
             return false;
         return true;
       }
-      protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+      protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
         return (other instanceof EqualsAndHashCodeNestedShadow.Baz.Foo);
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
         int result = 1;
         return result;
       }
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java
index 30de15cf..8e93963a 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java
@@ -4,7 +4,7 @@ final @lombok.EqualsAndHashCode(of = {"x"}) class EqualsAndHashCodeOf {
   EqualsAndHashCodeOf() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeOf)))
@@ -14,7 +14,7 @@ final @lombok.EqualsAndHashCode(of = {"x"}) class EqualsAndHashCodeOf {
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
@@ -27,7 +27,7 @@ final @lombok.EqualsAndHashCode(exclude = {"y"}) class EqualsAndHashCodeExclude
   EqualsAndHashCodeExclude() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeExclude)))
@@ -37,7 +37,7 @@ final @lombok.EqualsAndHashCode(exclude = {"y"}) class EqualsAndHashCodeExclude
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java
index 3b12e4e4..cc0d6544 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java
@@ -24,7 +24,7 @@ final @lombok.EqualsAndHashCode(callSuper = true) class EqualsAndHashCodeWithExi
   private boolean canEqual(Object other) {
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeWithExistingMethods3)))
@@ -38,7 +38,7 @@ final @lombok.EqualsAndHashCode(callSuper = true) class EqualsAndHashCodeWithExi
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = super.hashCode();
     result = ((result * PRIME) + this.x);
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java
index a59d2835..d8af4c77 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java
@@ -10,7 +10,7 @@
   EqualsAndHashCodeWithOnParam() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final @Nullable java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final @Nullable java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeWithOnParam)))
@@ -34,10 +34,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final @Nullable java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final @Nullable java.lang.Object other) {
     return (other instanceof EqualsAndHashCodeWithOnParam);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
diff --git a/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java b/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java
index 6a727f1d..02def41a 100644
--- a/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java
+++ b/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java
@@ -1,6 +1,6 @@
 @lombok.RequiredArgsConstructor class FieldDefaultsViaConfigAndRequiredArgsConstructor {
   final int x;
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) {
+  public @java.lang.SuppressWarnings("all") FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) {
     super();
     this.x = x;
   }
diff --git a/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java b/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java
index 407d41b6..9cd996d5 100644
--- a/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java
+++ b/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java
@@ -3,7 +3,7 @@ class GenerateSuppressFBWarnings {
   GenerateSuppressFBWarnings() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") @javax.annotation.Generated("lombok") int getY() {
+  public @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") int getY() {
     return this.y;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/GetterAccessLevel.java b/test/transform/resource/after-ecj/GetterAccessLevel.java
index 533e05cc..14edfb56 100644
--- a/test/transform/resource/after-ecj/GetterAccessLevel.java
+++ b/test/transform/resource/after-ecj/GetterAccessLevel.java
@@ -13,31 +13,31 @@ class GetterAccessLevel {
   GetterAccessLevel() {
     super();
   }
-  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPrivate() {
+  private @java.lang.SuppressWarnings("all") boolean isPrivate() {
     return this.isPrivate;
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() {
+  @java.lang.SuppressWarnings("all") boolean isPackage() {
     return this.isPackage;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isProtected() {
+  protected @java.lang.SuppressWarnings("all") boolean isProtected() {
     return this.isProtected;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() {
+  public @java.lang.SuppressWarnings("all") boolean isPublic() {
     return this.isPublic;
   }
-  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getPrivateString() {
+  private @java.lang.SuppressWarnings("all") String getPrivateString() {
     return this.privateString;
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getPackageString() {
+  @java.lang.SuppressWarnings("all") String getPackageString() {
     return this.packageString;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getProtectedString() {
+  protected @java.lang.SuppressWarnings("all") String getProtectedString() {
     return this.protectedString;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getPublicString() {
+  public @java.lang.SuppressWarnings("all") String getPublicString() {
     return this.publicString;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getValue() {
+  public @java.lang.SuppressWarnings("all") String getValue() {
     return this.value;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterAlreadyExists.java b/test/transform/resource/after-ecj/GetterAlreadyExists.java
index b0856dce..04f5b81e 100644
--- a/test/transform/resource/after-ecj/GetterAlreadyExists.java
+++ b/test/transform/resource/after-ecj/GetterAlreadyExists.java
@@ -6,7 +6,7 @@ class Getter1 {
   boolean hasFoo() {
     return true;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() {
+  public @java.lang.SuppressWarnings("all") boolean isFoo() {
     return this.foo;
   }
 }
@@ -36,7 +36,7 @@ class Getter4 {
   String hasFoo() {
     return null;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
+  public @java.lang.SuppressWarnings("all") String getFoo() {
     return this.foo;
   }
 }
@@ -48,7 +48,7 @@ class Getter5 {
   String isFoo() {
     return null;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
+  public @java.lang.SuppressWarnings("all") String getFoo() {
     return this.foo;
   }
 }
@@ -69,7 +69,7 @@ class Getter7 {
   boolean hasFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
+  public @java.lang.SuppressWarnings("all") String getFoo() {
     return this.foo;
   }
 }
@@ -81,7 +81,7 @@ class Getter8 {
   boolean isFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
+  public @java.lang.SuppressWarnings("all") String getFoo() {
     return this.foo;
   }
 }
@@ -102,7 +102,7 @@ class Getter10 {
   static boolean hasFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() {
+  public @java.lang.SuppressWarnings("all") boolean isFoo() {
     return this.foo;
   }
 }
@@ -132,7 +132,7 @@ class Getter13 {
   static boolean hasFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
+  public @java.lang.SuppressWarnings("all") String getFoo() {
     return this.foo;
   }
 }
@@ -144,7 +144,7 @@ class Getter14 {
   static boolean isFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
+  public @java.lang.SuppressWarnings("all") String getFoo() {
     return this.foo;
   }
 }
@@ -165,7 +165,7 @@ class Getter16 {
   static String hasFoo() {
     return "";
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
+  public @java.lang.SuppressWarnings("all") String getFoo() {
     return this.foo;
   }
 }
@@ -177,7 +177,7 @@ class Getter17 {
   static String isFoo() {
     return "";
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
+  public @java.lang.SuppressWarnings("all") String getFoo() {
     return this.foo;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterBoolean.java b/test/transform/resource/after-ecj/GetterBoolean.java
index a1d1446e..a7dc2e2f 100644
--- a/test/transform/resource/after-ecj/GetterBoolean.java
+++ b/test/transform/resource/after-ecj/GetterBoolean.java
@@ -5,13 +5,13 @@ class Getter {
   Getter() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() {
+  public @java.lang.SuppressWarnings("all") boolean isFoo() {
     return this.foo;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBar() {
+  public @java.lang.SuppressWarnings("all") boolean isBar() {
     return this.isBar;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isHasBaz() {
+  public @java.lang.SuppressWarnings("all") boolean isHasBaz() {
     return this.hasBaz;
   }
 }
@@ -23,7 +23,7 @@ class MoreGetter {
   boolean hasFoo() {
     return true;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() {
+  public @java.lang.SuppressWarnings("all") boolean isFoo() {
     return this.foo;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterDeprecated.java b/test/transform/resource/after-ecj/GetterDeprecated.java
index fc7ce561..546f7fb7 100644
--- a/test/transform/resource/after-ecj/GetterDeprecated.java
+++ b/test/transform/resource/after-ecj/GetterDeprecated.java
@@ -5,10 +5,10 @@ class GetterDeprecated {
   GetterDeprecated() {
     super();
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getAnnotation() {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") int getAnnotation() {
     return this.annotation;
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getJavadoc() {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") int getJavadoc() {
     return this.javadoc;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterEnum.java b/test/transform/resource/after-ecj/GetterEnum.java
index 2299e69d..fd70ce9e 100644
--- a/test/transform/resource/after-ecj/GetterEnum.java
+++ b/test/transform/resource/after-ecj/GetterEnum.java
@@ -7,13 +7,13 @@ import lombok.RequiredArgsConstructor;
   private final @Getter String name;
   <clinit>() {
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getId() {
+  public @java.lang.SuppressWarnings("all") int getId() {
     return this.id;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
+  public @java.lang.SuppressWarnings("all") String getName() {
     return this.name;
   }
-  private @java.beans.ConstructorProperties({"id", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterEnum(final int id, final String name) {
+  private @java.lang.SuppressWarnings("all") GetterEnum(final int id, final String name) {
     super();
     this.id = id;
     this.name = name;
diff --git a/test/transform/resource/after-ecj/GetterLazy.java b/test/transform/resource/after-ecj/GetterLazy.java
index d1ec507c..8394f58d 100644
--- a/test/transform/resource/after-ecj/GetterLazy.java
+++ b/test/transform/resource/after-ecj/GetterLazy.java
@@ -8,7 +8,7 @@ class GetterLazy {
   GetterLazy() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueType getFieldName() {
+  public @java.lang.SuppressWarnings("all") ValueType getFieldName() {
     java.lang.Object value = this.fieldName.get();
     if ((value == null))
         {
diff --git a/test/transform/resource/after-ecj/GetterLazyBoolean.java b/test/transform/resource/after-ecj/GetterLazyBoolean.java
index 0a1d2564..174389e8 100644
--- a/test/transform/resource/after-ecj/GetterLazyBoolean.java
+++ b/test/transform/resource/after-ecj/GetterLazyBoolean.java
@@ -7,7 +7,7 @@
   private static boolean calculateBoolean() {
     return true;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBooleanValue() {
+  public @java.lang.SuppressWarnings("all") boolean isBooleanValue() {
     java.lang.Object value = this.booleanValue.get();
     if ((value == null))
         {
@@ -24,7 +24,7 @@
         }
     return (java.lang.Boolean) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isOtherBooleanValue() {
+  public @java.lang.SuppressWarnings("all") boolean isOtherBooleanValue() {
     java.lang.Object value = this.otherBooleanValue.get();
     if ((value == null))
         {
@@ -41,7 +41,7 @@
         }
     return (java.lang.Boolean) value;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof GetterLazyBoolean)))
@@ -53,16 +53,16 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof GetterLazyBoolean);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + (this.isBooleanValue() ? 79 : 97));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("GetterLazyBoolean(booleanValue=" + this.isBooleanValue()) + ")");
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterLazyEahcToString.java b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
index 40716f8b..e66a9c2e 100644
--- a/test/transform/resource/after-ecj/GetterLazyEahcToString.java
+++ b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
@@ -4,7 +4,7 @@
   GetterLazyEahcToString() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getValue() {
+  public @java.lang.SuppressWarnings("all") String getValue() {
     java.lang.Object value = this.value.get();
     if ((value == null))
         {
@@ -21,10 +21,10 @@
         }
     return (String) ((value == this.value) ? null : value);
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getValue2() {
+  public @java.lang.SuppressWarnings("all") String getValue2() {
     return this.value2;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof GetterLazyEahcToString)))
@@ -42,10 +42,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof GetterLazyEahcToString);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     final java.lang.Object $value = this.getValue();
@@ -54,7 +54,7 @@
     result = ((result * PRIME) + (($value2 == null) ? 43 : $value2.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("GetterLazyEahcToString(value=" + this.getValue()) + ", value2=") + this.value2) + ")");
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterLazyInvalid.java b/test/transform/resource/after-ecj/GetterLazyInvalid.java
index 8e2bc4f3..da89c333 100644
--- a/test/transform/resource/after-ecj/GetterLazyInvalid.java
+++ b/test/transform/resource/after-ecj/GetterLazyInvalid.java
@@ -27,7 +27,7 @@ class GetterLazyInvalidNone {
   GetterLazyInvalidClass() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFieldName() {
+  public @java.lang.SuppressWarnings("all") String getFieldName() {
     return this.fieldName;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterLazyNative.java b/test/transform/resource/after-ecj/GetterLazyNative.java
index 40fe1c84..db70f2f4 100644
--- a/test/transform/resource/after-ecj/GetterLazyNative.java
+++ b/test/transform/resource/after-ecj/GetterLazyNative.java
@@ -11,7 +11,7 @@ class GetterLazyNative {
   GetterLazyNative() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBooleanField() {
+  public @java.lang.SuppressWarnings("all") boolean isBooleanField() {
     java.lang.Object value = this.booleanField.get();
     if ((value == null))
         {
@@ -28,7 +28,7 @@ class GetterLazyNative {
         }
     return (java.lang.Boolean) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") byte getByteField() {
+  public @java.lang.SuppressWarnings("all") byte getByteField() {
     java.lang.Object value = this.byteField.get();
     if ((value == null))
         {
@@ -45,7 +45,7 @@ class GetterLazyNative {
         }
     return (java.lang.Byte) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") short getShortField() {
+  public @java.lang.SuppressWarnings("all") short getShortField() {
     java.lang.Object value = this.shortField.get();
     if ((value == null))
         {
@@ -62,7 +62,7 @@ class GetterLazyNative {
         }
     return (java.lang.Short) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getIntField() {
+  public @java.lang.SuppressWarnings("all") int getIntField() {
     java.lang.Object value = this.intField.get();
     if ((value == null))
         {
@@ -79,7 +79,7 @@ class GetterLazyNative {
         }
     return (java.lang.Integer) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") long getLongField() {
+  public @java.lang.SuppressWarnings("all") long getLongField() {
     java.lang.Object value = this.longField.get();
     if ((value == null))
         {
@@ -96,7 +96,7 @@ class GetterLazyNative {
         }
     return (java.lang.Long) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") float getFloatField() {
+  public @java.lang.SuppressWarnings("all") float getFloatField() {
     java.lang.Object value = this.floatField.get();
     if ((value == null))
         {
@@ -113,7 +113,7 @@ class GetterLazyNative {
         }
     return (java.lang.Float) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") double getDoubleField() {
+  public @java.lang.SuppressWarnings("all") double getDoubleField() {
     java.lang.Object value = this.doubleField.get();
     if ((value == null))
         {
@@ -130,7 +130,7 @@ class GetterLazyNative {
         }
     return (java.lang.Double) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") char getCharField() {
+  public @java.lang.SuppressWarnings("all") char getCharField() {
     java.lang.Object value = this.charField.get();
     if ((value == null))
         {
@@ -147,7 +147,7 @@ class GetterLazyNative {
         }
     return (java.lang.Character) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int[] getIntArrayField() {
+  public @java.lang.SuppressWarnings("all") int[] getIntArrayField() {
     java.lang.Object value = this.intArrayField.get();
     if ((value == null))
         {
diff --git a/test/transform/resource/after-ecj/GetterLazyTransient.java b/test/transform/resource/after-ecj/GetterLazyTransient.java
index 9bc0d9ae..3ffd9b69 100644
--- a/test/transform/resource/after-ecj/GetterLazyTransient.java
+++ b/test/transform/resource/after-ecj/GetterLazyTransient.java
@@ -5,7 +5,7 @@ class GetterLazyTransient {
   GetterLazyTransient() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getNonTransientField() {
+  public @java.lang.SuppressWarnings("all") int getNonTransientField() {
     java.lang.Object value = this.nonTransientField.get();
     if ((value == null))
         {
@@ -22,7 +22,7 @@ class GetterLazyTransient {
         }
     return (java.lang.Integer) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getNonLazyTransientField() {
+  public @java.lang.SuppressWarnings("all") int getNonLazyTransientField() {
     return this.nonLazyTransientField;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/GetterNone.java b/test/transform/resource/after-ecj/GetterNone.java
index e13379e0..f08726d0 100644
--- a/test/transform/resource/after-ecj/GetterNone.java
+++ b/test/transform/resource/after-ecj/GetterNone.java
@@ -6,7 +6,7 @@ import lombok.Getter;
   GetterNone() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() {
+  public @java.lang.SuppressWarnings("all") int getI() {
     return this.i;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterOnClass.java b/test/transform/resource/after-ecj/GetterOnClass.java
index deb56392..7668c9d3 100644
--- a/test/transform/resource/after-ecj/GetterOnClass.java
+++ b/test/transform/resource/after-ecj/GetterOnClass.java
@@ -4,7 +4,7 @@
   GetterOnClass1() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() {
+  public @java.lang.SuppressWarnings("all") boolean isPublic() {
     return this.isPublic;
   }
 }
@@ -15,10 +15,10 @@
   GetterOnClass2() {
     super();
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() {
+  @java.lang.SuppressWarnings("all") boolean isPackage() {
     return this.isPackage;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isProtected() {
+  protected @java.lang.SuppressWarnings("all") boolean isProtected() {
     return this.isProtected;
   }
 }
@@ -28,7 +28,7 @@
   GetterOnClass3() {
     super();
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() {
+  @java.lang.SuppressWarnings("all") boolean isPackage() {
     return this.isPackage;
   }
 }
@@ -38,7 +38,7 @@
   GetterOnClass4() {
     super();
   }
-  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPrivate() {
+  private @java.lang.SuppressWarnings("all") boolean isPrivate() {
     return this.isPrivate;
   }
 }
@@ -48,7 +48,7 @@
   GetterOnClass5() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() {
+  public @java.lang.SuppressWarnings("all") boolean isPublic() {
     return this.isPublic;
   }
 }
@@ -58,10 +58,10 @@
   GetterOnClass6() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getCouldBeNull() {
+  public @java.lang.SuppressWarnings("all") String getCouldBeNull() {
     return this.couldBeNull;
   }
-  public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getNonNull() {
+  public @lombok.NonNull @java.lang.SuppressWarnings("all") String getNonNull() {
     return this.nonNull;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterOnMethod.java b/test/transform/resource/after-ecj/GetterOnMethod.java
index 6b227326..a21f628c 100644
--- a/test/transform/resource/after-ecj/GetterOnMethod.java
+++ b/test/transform/resource/after-ecj/GetterOnMethod.java
@@ -7,13 +7,13 @@ class GetterOnMethod {
   GetterOnMethod() {
     super();
   }
-  public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() {
+  public @Deprecated @java.lang.SuppressWarnings("all") int getI() {
     return this.i;
   }
-  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getJ() {
+  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") int getJ() {
     return this.j;
   }
-  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getK() {
+  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") int getK() {
     return this.k;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors.java b/test/transform/resource/after-ecj/GetterOnMethodErrors.java
index 7ba02422..16c625b5 100644
--- a/test/transform/resource/after-ecj/GetterOnMethodErrors.java
+++ b/test/transform/resource/after-ecj/GetterOnMethodErrors.java
@@ -8,7 +8,7 @@ class PlaceFillerToMakeSurePositionIsRelevant {
   GetterOnMethodErrors() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getTest() {
+  public @java.lang.SuppressWarnings("all") int getTest() {
     return this.test;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java
index 0dfd4c13..bfaa5dd4 100644
--- a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java
+++ b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java
@@ -12,28 +12,28 @@ class GetterOnMethodErrors2 {
   GetterOnMethodErrors2() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad1() {
+  public @java.lang.SuppressWarnings("all") int getBad1() {
     return this.bad1;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad2() {
+  public @java.lang.SuppressWarnings("all") int getBad2() {
     return this.bad2;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad3() {
+  public @java.lang.SuppressWarnings("all") int getBad3() {
     return this.bad3;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad4() {
+  public @java.lang.SuppressWarnings("all") int getBad4() {
     return this.bad4;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood1() {
+  public @java.lang.SuppressWarnings("all") int getGood1() {
     return this.good1;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood2() {
+  public @java.lang.SuppressWarnings("all") int getGood2() {
     return this.good2;
   }
-  public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood3() {
+  public @Deprecated @java.lang.SuppressWarnings("all") int getGood3() {
     return this.good3;
   }
-  public @Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood4() {
+  public @Deprecated @Test @java.lang.SuppressWarnings("all") int getGood4() {
     return this.good4;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/GetterOnStatic.java b/test/transform/resource/after-ecj/GetterOnStatic.java
index 89b83ed0..ee90b897 100644
--- a/test/transform/resource/after-ecj/GetterOnStatic.java
+++ b/test/transform/resource/after-ecj/GetterOnStatic.java
@@ -6,10 +6,10 @@ class Getter {
   Getter() {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() {
+  public static @java.lang.SuppressWarnings("all") boolean isFoo() {
     return Getter.foo;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBar() {
+  public static @java.lang.SuppressWarnings("all") int getBar() {
     return Getter.bar;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterPlain.java b/test/transform/resource/after-ecj/GetterPlain.java
index d3801b62..10f0f9d7 100644
--- a/test/transform/resource/after-ecj/GetterPlain.java
+++ b/test/transform/resource/after-ecj/GetterPlain.java
@@ -5,10 +5,10 @@ class GetterPlain {
   GetterPlain() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() {
+  public @java.lang.SuppressWarnings("all") int getI() {
     return this.i;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFoo() {
+  public @java.lang.SuppressWarnings("all") int getFoo() {
     return this.foo;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterSetterJavadoc.java b/test/transform/resource/after-ecj/GetterSetterJavadoc.java
index 275b408d..4923fd02 100644
--- a/test/transform/resource/after-ecj/GetterSetterJavadoc.java
+++ b/test/transform/resource/after-ecj/GetterSetterJavadoc.java
@@ -1,12 +1,12 @@
 @lombok.Data class GetterSetterJavadoc1 {
   private int fieldName;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFieldName() {
+  public @java.lang.SuppressWarnings("all") int getFieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final int fieldName) {
+  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
     this.fieldName = fieldName;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof GetterSetterJavadoc1)))
@@ -18,19 +18,19 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof GetterSetterJavadoc1);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getFieldName());
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("GetterSetterJavadoc1(fieldName=" + this.getFieldName()) + ")");
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterSetterJavadoc1() {
+  public @java.lang.SuppressWarnings("all") GetterSetterJavadoc1() {
     super();
   }
 }
@@ -39,10 +39,10 @@ class GetterSetterJavadoc2 {
   GetterSetterJavadoc2() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFieldName() {
+  public @java.lang.SuppressWarnings("all") int getFieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final int fieldName) {
+  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
     this.fieldName = fieldName;
   }
 }
@@ -51,10 +51,10 @@ class GetterSetterJavadoc3 {
   GetterSetterJavadoc3() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFieldName() {
+  public @java.lang.SuppressWarnings("all") int getFieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final int fieldName) {
+  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
     this.fieldName = fieldName;
   }
 }
@@ -63,10 +63,10 @@ class GetterSetterJavadoc3 {
   GetterSetterJavadoc4() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int fieldName() {
+  public @java.lang.SuppressWarnings("all") int fieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterSetterJavadoc4 fieldName(final int fieldName) {
+  public @java.lang.SuppressWarnings("all") GetterSetterJavadoc4 fieldName(final int fieldName) {
     this.fieldName = fieldName;
     return this;
   }
@@ -76,10 +76,10 @@ class GetterSetterJavadoc3 {
   GetterSetterJavadoc5() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int fieldName() {
+  public @java.lang.SuppressWarnings("all") int fieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterSetterJavadoc5 fieldName(final int fieldName) {
+  public @java.lang.SuppressWarnings("all") GetterSetterJavadoc5 fieldName(final int fieldName) {
     this.fieldName = fieldName;
     return this;
   }
diff --git a/test/transform/resource/after-ecj/GetterWithDollar.java b/test/transform/resource/after-ecj/GetterWithDollar.java
index 424635ed..f4bc799c 100644
--- a/test/transform/resource/after-ecj/GetterWithDollar.java
+++ b/test/transform/resource/after-ecj/GetterWithDollar.java
@@ -3,7 +3,7 @@ class GetterWithDollar1 {
   GetterWithDollar1() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int get$i() {
+  public @java.lang.SuppressWarnings("all") int get$i() {
     return this.$i;
   }
 }
@@ -13,10 +13,10 @@ class GetterWithDollar2 {
   GetterWithDollar2() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int get$i() {
+  public @java.lang.SuppressWarnings("all") int get$i() {
     return this.$i;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() {
+  public @java.lang.SuppressWarnings("all") int getI() {
     return this.i;
   }
 }
diff --git a/test/transform/resource/after-ecj/MixGetterVal.java b/test/transform/resource/after-ecj/MixGetterVal.java
index fbc89a02..d9809703 100644
--- a/test/transform/resource/after-ecj/MixGetterVal.java
+++ b/test/transform/resource/after-ecj/MixGetterVal.java
@@ -13,7 +13,7 @@ class MixGetterVal {
     final @val int a = getX();
     m(a);
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/MultiFieldGetter.java b/test/transform/resource/after-ecj/MultiFieldGetter.java
index a608578e..151c61c8 100644
--- a/test/transform/resource/after-ecj/MultiFieldGetter.java
+++ b/test/transform/resource/after-ecj/MultiFieldGetter.java
@@ -6,10 +6,10 @@ class MultiFieldGetter {
   MultiFieldGetter() {
     super();
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  protected @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() {
+  protected @java.lang.SuppressWarnings("all") int getY() {
     return this.y;
   }
 }
@@ -19,10 +19,10 @@ class MultiFieldGetter {
   MultiFieldGetter2() {
     super();
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() {
+  @java.lang.SuppressWarnings("all") int getY() {
     return this.y;
   }
 }
diff --git a/test/transform/resource/after-ecj/NoArgsConstructorForce.java b/test/transform/resource/after-ecj/NoArgsConstructorForce.java
index d0e69b0d..850aa8a5 100644
--- a/test/transform/resource/after-ecj/NoArgsConstructorForce.java
+++ b/test/transform/resource/after-ecj/NoArgsConstructorForce.java
@@ -3,7 +3,7 @@ public @NoArgsConstructor(force = true) class NoArgsConstructorForce {
   private final int[] i;
   private final Object[] o;
   private final java.util.List<?>[] fullQualifiedList;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoArgsConstructorForce() {
+  public @java.lang.SuppressWarnings("all") NoArgsConstructorForce() {
     super();
     this.i = null;
     this.o = null;
diff --git a/test/transform/resource/after-ecj/NonNullPlain.java b/test/transform/resource/after-ecj/NonNullPlain.java
index 592ff4b5..9edb576b 100644
--- a/test/transform/resource/after-ecj/NonNullPlain.java
+++ b/test/transform/resource/after-ecj/NonNullPlain.java
@@ -5,7 +5,7 @@ import java.lang.annotation.*;
   @lombok.NonNull int i;
   @lombok.NonNull String s;
   @NotNull Object o;
-  public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) {
+  public @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) {
     super();
     if ((s == null))
         {
@@ -14,26 +14,26 @@ import java.lang.annotation.*;
     this.i = i;
     this.s = s;
   }
-  public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() {
+  public @lombok.NonNull @java.lang.SuppressWarnings("all") int getI() {
     return this.i;
   }
-  public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getS() {
+  public @lombok.NonNull @java.lang.SuppressWarnings("all") String getS() {
     return this.s;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Object getO() {
+  public @java.lang.SuppressWarnings("all") Object getO() {
     return this.o;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final @lombok.NonNull int i) {
+  public @java.lang.SuppressWarnings("all") void setI(final @lombok.NonNull int i) {
     this.i = i;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setS(final @lombok.NonNull String s) {
+  public @java.lang.SuppressWarnings("all") void setS(final @lombok.NonNull String s) {
     if ((s == null))
         {
           throw new java.lang.NullPointerException("s");
         }
     this.s = s;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setO(final Object o) {
+  public @java.lang.SuppressWarnings("all") void setO(final Object o) {
     this.o = o;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/NonNullWithAlternateException.java b/test/transform/resource/after-ecj/NonNullWithAlternateException.java
index 1df18538..8a547ecf 100644
--- a/test/transform/resource/after-ecj/NonNullWithAlternateException.java
+++ b/test/transform/resource/after-ecj/NonNullWithAlternateException.java
@@ -10,7 +10,7 @@ public class NonNullWithAlternateException {
         }
     System.out.println(arg);
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setTest(final @lombok.NonNull String test) {
+  public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) {
     if ((test == null))
         {
           throw new java.lang.IllegalArgumentException("test is null");
diff --git a/test/transform/resource/after-ecj/OnXJava7Style.java b/test/transform/resource/after-ecj/OnXJava7Style.java
index 415234d8..67f6e686 100644
--- a/test/transform/resource/after-ecj/OnXJava7Style.java
+++ b/test/transform/resource/after-ecj/OnXJava7Style.java
@@ -13,19 +13,19 @@ public class OnXJava7Style {
   public OnXJava7Style() {
     super();
   }
-  public @Foo @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getA() {
+  public @Foo @java.lang.SuppressWarnings("all") String getA() {
     return this.a;
   }
-  public @Foo() @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setB(final String b) {
+  public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) {
     this.b = b;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setC(final @Foo("a") String c) {
+  public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) {
     this.c = c;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setD(final @Bar(stuff = "b") String d) {
+  public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) {
     this.d = d;
   }
-  public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getE() {
+  public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() {
     return this.e;
   }
 }
diff --git a/test/transform/resource/after-ecj/OnXJava7StyleOn8.java b/test/transform/resource/after-ecj/OnXJava7StyleOn8.java
index da51a5f0..d3adca1c 100644
--- a/test/transform/resource/after-ecj/OnXJava7StyleOn8.java
+++ b/test/transform/resource/after-ecj/OnXJava7StyleOn8.java
@@ -13,19 +13,19 @@ public class OnXJava7StyleOn8 {
   public OnXJava7StyleOn8() {
     super();
   }
-  public @Foo @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getA() {
+  public @Foo @java.lang.SuppressWarnings("all") String getA() {
     return this.a;
   }
-  public @Foo() @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setB(final String b) {
+  public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) {
     this.b = b;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setC(final @Foo("a") String c) {
+  public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) {
     this.c = c;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setD(final @Bar(stuff = "b") String d) {
+  public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) {
     this.d = d;
   }
-  public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getE() {
+  public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() {
     return this.e;
   }
 }
diff --git a/test/transform/resource/after-ecj/OnXJava8Style.java b/test/transform/resource/after-ecj/OnXJava8Style.java
index 0e95a20b..4e39460e 100644
--- a/test/transform/resource/after-ecj/OnXJava8Style.java
+++ b/test/transform/resource/after-ecj/OnXJava8Style.java
@@ -13,19 +13,19 @@ public class OnXJava8Style {
   public OnXJava8Style() {
     super();
   }
-  public @Foo @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getA() {
+  public @Foo @java.lang.SuppressWarnings("all") String getA() {
     return this.a;
   }
-  public @Foo() @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setB(final String b) {
+  public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) {
     this.b = b;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setC(final @Foo("a") String c) {
+  public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) {
     this.c = c;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setD(final @Bar(stuff = "b") String d) {
+  public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) {
     this.d = d;
   }
-  public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getE() {
+  public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() {
     return this.e;
   }
 }
diff --git a/test/transform/resource/after-ecj/OnXJava8StyleOn7.java b/test/transform/resource/after-ecj/OnXJava8StyleOn7.java
index 28afb5a7..fca90ad7 100644
--- a/test/transform/resource/after-ecj/OnXJava8StyleOn7.java
+++ b/test/transform/resource/after-ecj/OnXJava8StyleOn7.java
@@ -13,19 +13,19 @@ public class OnXJava8StyleOn7 {
   public OnXJava8StyleOn7() {
     super();
   }
-  public @Foo @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getA() {
+  public @Foo @java.lang.SuppressWarnings("all") String getA() {
     return this.a;
   }
-  public @Foo() @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setB(final String b) {
+  public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) {
     this.b = b;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setC(final @Foo("a") String c) {
+  public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) {
     this.c = c;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setD(final @Bar(stuff = "b") String d) {
+  public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) {
     this.d = d;
   }
-  public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getE() {
+  public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() {
     return this.e;
   }
 }
diff --git a/test/transform/resource/after-ecj/SetterAccessLevel.java b/test/transform/resource/after-ecj/SetterAccessLevel.java
index db26226f..4c1a0b97 100644
--- a/test/transform/resource/after-ecj/SetterAccessLevel.java
+++ b/test/transform/resource/after-ecj/SetterAccessLevel.java
@@ -8,19 +8,19 @@ class SetterAccessLevel {
   SetterAccessLevel() {
     super();
   }
-  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPrivate(final boolean isPrivate) {
+  private @java.lang.SuppressWarnings("all") void setPrivate(final boolean isPrivate) {
     this.isPrivate = isPrivate;
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) {
+  @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) {
     this.isPackage = isPackage;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setProtected(final boolean isProtected) {
+  protected @java.lang.SuppressWarnings("all") void setProtected(final boolean isProtected) {
     this.isProtected = isProtected;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPublic(final boolean isPublic) {
+  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
     this.isPublic = isPublic;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setValue(final boolean value) {
+  public @java.lang.SuppressWarnings("all") void setValue(final boolean value) {
     this.value = value;
   }
 }
diff --git a/test/transform/resource/after-ecj/SetterAlreadyExists.java b/test/transform/resource/after-ecj/SetterAlreadyExists.java
index 4a4d0c4c..91b011b6 100644
--- a/test/transform/resource/after-ecj/SetterAlreadyExists.java
+++ b/test/transform/resource/after-ecj/SetterAlreadyExists.java
@@ -37,7 +37,7 @@ class Setter5 {
   }
   void setFoo() {
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final String foo) {
+  public @java.lang.SuppressWarnings("all") void setFoo(final String foo) {
     this.foo = foo;
   }
 }
@@ -48,7 +48,7 @@ class Setter6 {
   }
   void setFoo(String foo, int x) {
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final String foo) {
+  public @java.lang.SuppressWarnings("all") void setFoo(final String foo) {
     this.foo = foo;
   }
 }
diff --git a/test/transform/resource/after-ecj/SetterDeprecated.java b/test/transform/resource/after-ecj/SetterDeprecated.java
index 91008c96..d76612b7 100644
--- a/test/transform/resource/after-ecj/SetterDeprecated.java
+++ b/test/transform/resource/after-ecj/SetterDeprecated.java
@@ -5,10 +5,10 @@ class SetterDeprecated {
   SetterDeprecated() {
     super();
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setAnnotation(final int annotation) {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setAnnotation(final int annotation) {
     this.annotation = annotation;
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJavadoc(final int javadoc) {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setJavadoc(final int javadoc) {
     this.javadoc = javadoc;
   }
 }
diff --git a/test/transform/resource/after-ecj/SetterOnClass.java b/test/transform/resource/after-ecj/SetterOnClass.java
index 8e6455d3..aa3459bb 100644
--- a/test/transform/resource/after-ecj/SetterOnClass.java
+++ b/test/transform/resource/after-ecj/SetterOnClass.java
@@ -4,7 +4,7 @@
   SetterOnClass1() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPublic(final boolean isPublic) {
+  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
     this.isPublic = isPublic;
   }
 }
@@ -15,10 +15,10 @@
   SetterOnClass2() {
     super();
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) {
+  @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) {
     this.isPackage = isPackage;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setProtected(final boolean isProtected) {
+  protected @java.lang.SuppressWarnings("all") void setProtected(final boolean isProtected) {
     this.isProtected = isProtected;
   }
 }
@@ -28,7 +28,7 @@
   SetterOnClass3() {
     super();
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) {
+  @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) {
     this.isPackage = isPackage;
   }
 }
@@ -38,7 +38,7 @@
   SetterOnClass4() {
     super();
   }
-  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPrivate(final boolean isPrivate) {
+  private @java.lang.SuppressWarnings("all") void setPrivate(final boolean isPrivate) {
     this.isPrivate = isPrivate;
   }
 }
@@ -48,7 +48,7 @@
   SetterOnClass5() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPublic(final boolean isPublic) {
+  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
     this.isPublic = isPublic;
   }
 }
@@ -58,10 +58,10 @@
   SetterOnClass6() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setCouldBeNull(final String couldBeNull) {
+  public @java.lang.SuppressWarnings("all") void setCouldBeNull(final String couldBeNull) {
     this.couldBeNull = couldBeNull;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setNonNull(final @lombok.NonNull String nonNull) {
+  public @java.lang.SuppressWarnings("all") void setNonNull(final @lombok.NonNull String nonNull) {
     if ((nonNull == null))
         {
           throw new java.lang.NullPointerException("nonNull");
diff --git a/test/transform/resource/after-ecj/SetterOnMethod.java b/test/transform/resource/after-ecj/SetterOnMethod.java
index 4eaea8e5..8bdff212 100644
--- a/test/transform/resource/after-ecj/SetterOnMethod.java
+++ b/test/transform/resource/after-ecj/SetterOnMethod.java
@@ -2,10 +2,10 @@ import lombok.Setter;
 class SetterOnMethod {
   @lombok.Setter() int i;
   @lombok.Setter() int j;
-  public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
+  public @Deprecated @java.lang.SuppressWarnings("all") void setI(final int i) {
     this.i = i;
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setJ(final int j) {
     this.j = j;
   }
   SetterOnMethod() {
@@ -15,10 +15,10 @@ class SetterOnMethod {
 @lombok.Setter() class SetterOnClassOnMethod {
   int i;
   int j;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
+  public @java.lang.SuppressWarnings("all") void setI(final int i) {
     this.i = i;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) {
+  public @java.lang.SuppressWarnings("all") void setJ(final int j) {
     this.j = j;
   }
   SetterOnClassOnMethod() {
@@ -28,10 +28,10 @@ class SetterOnMethod {
 @lombok.Setter() class SetterOnClassAndOnAField {
   int i;
   @lombok.Setter() int j;
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setJ(final int j) {
     this.j = j;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
+  public @java.lang.SuppressWarnings("all") void setI(final int i) {
     this.i = i;
   }
   SetterOnClassAndOnAField() {
diff --git a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java
index 28799f42..d4ea9f5d 100644
--- a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java
+++ b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java
@@ -7,13 +7,13 @@ class SetterOnMethodOnParam {
   SetterOnMethodOnParam() {
     super();
   }
-  public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
+  public @Deprecated @java.lang.SuppressWarnings("all") void setI(final int i) {
     this.i = i;
   }
-  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final @Test int j) {
+  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") void setJ(final @Test int j) {
     this.j = j;
   }
-  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setK(final @Test int k) {
+  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") void setK(final @Test int k) {
     this.k = k;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/SetterOnParam.java b/test/transform/resource/after-ecj/SetterOnParam.java
index 7c2d1fc6..119c8fc3 100644
--- a/test/transform/resource/after-ecj/SetterOnParam.java
+++ b/test/transform/resource/after-ecj/SetterOnParam.java
@@ -2,10 +2,10 @@ import lombok.Setter;
 class SetterOnParam {
   @lombok.Setter() int i;
   @lombok.Setter() int j;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final @SuppressWarnings("all") int i) {
+  public @java.lang.SuppressWarnings("all") void setI(final @SuppressWarnings("all") int i) {
     this.i = i;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int j) {
+  public @java.lang.SuppressWarnings("all") void setJ(final @java.lang.SuppressWarnings("all") int j) {
     this.j = j;
   }
   SetterOnParam() {
@@ -15,10 +15,10 @@ class SetterOnParam {
 @lombok.Setter() class SetterOnClassOnParam {
   int i;
   int j;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
+  public @java.lang.SuppressWarnings("all") void setI(final int i) {
     this.i = i;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) {
+  public @java.lang.SuppressWarnings("all") void setJ(final int j) {
     this.j = j;
   }
   SetterOnClassOnParam() {
@@ -28,10 +28,10 @@ class SetterOnParam {
 @lombok.Setter() class SetterOnClassAndOnAFieldParam {
   int i;
   @lombok.Setter() int j;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int j) {
+  public @java.lang.SuppressWarnings("all") void setJ(final @java.lang.SuppressWarnings("all") int j) {
     this.j = j;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
+  public @java.lang.SuppressWarnings("all") void setI(final int i) {
     this.i = i;
   }
   SetterOnClassAndOnAFieldParam() {
diff --git a/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java b/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java
index 011b2241..21d22a8f 100644
--- a/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java
+++ b/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java
@@ -1,6 +1,6 @@
 class SetterOnParamAndOnMethod {
   @lombok.Setter() int i;
-  public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final @SuppressWarnings("all") int i) {
+  public @Deprecated @java.lang.SuppressWarnings("all") void setI(final @SuppressWarnings("all") int i) {
     this.i = i;
   }
   SetterOnParamAndOnMethod() {
diff --git a/test/transform/resource/after-ecj/SetterOnStatic.java b/test/transform/resource/after-ecj/SetterOnStatic.java
index 1c5b71ae..8a5abdd8 100644
--- a/test/transform/resource/after-ecj/SetterOnStatic.java
+++ b/test/transform/resource/after-ecj/SetterOnStatic.java
@@ -6,10 +6,10 @@ class Setter {
   Setter() {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final boolean foo) {
+  public static @java.lang.SuppressWarnings("all") void setFoo(final boolean foo) {
     Setter.foo = foo;
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setBar(final int bar) {
+  public static @java.lang.SuppressWarnings("all") void setBar(final int bar) {
     Setter.bar = bar;
   }
 }
diff --git a/test/transform/resource/after-ecj/SetterPlain.java b/test/transform/resource/after-ecj/SetterPlain.java
index 4f428f0b..a4b40295 100644
--- a/test/transform/resource/after-ecj/SetterPlain.java
+++ b/test/transform/resource/after-ecj/SetterPlain.java
@@ -5,10 +5,10 @@ class SetterPlain {
   SetterPlain() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
+  public @java.lang.SuppressWarnings("all") void setI(final int i) {
     this.i = i;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final int foo) {
+  public @java.lang.SuppressWarnings("all") void setFoo(final int foo) {
     this.foo = foo;
   }
 }
diff --git a/test/transform/resource/after-ecj/SetterWithDollar.java b/test/transform/resource/after-ecj/SetterWithDollar.java
index e8bd91df..c5bc14f1 100644
--- a/test/transform/resource/after-ecj/SetterWithDollar.java
+++ b/test/transform/resource/after-ecj/SetterWithDollar.java
@@ -3,7 +3,7 @@ class SetterWithDollar1 {
   SetterWithDollar1() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void set$i(final int $i) {
+  public @java.lang.SuppressWarnings("all") void set$i(final int $i) {
     this.$i = $i;
   }
 }
@@ -13,10 +13,10 @@ class SetterWithDollar2 {
   SetterWithDollar2() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void set$i(final int $i) {
+  public @java.lang.SuppressWarnings("all") void set$i(final int $i) {
     this.$i = $i;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
+  public @java.lang.SuppressWarnings("all") void setI(final int i) {
     this.i = i;
   }
 }
diff --git a/test/transform/resource/after-ecj/SimpleTypeResolution.java b/test/transform/resource/after-ecj/SimpleTypeResolution.java
index 736632bc..c413623e 100644
--- a/test/transform/resource/after-ecj/SimpleTypeResolution.java
+++ b/test/transform/resource/after-ecj/SimpleTypeResolution.java
@@ -7,7 +7,7 @@ class SimpleTypeResolutionSuccess {
   private @lombok.Getter int x;
   SimpleTypeResolutionSuccess() {
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
 }
diff --git a/test/transform/resource/after-ecj/ToStringConfiguration.java b/test/transform/resource/after-ecj/ToStringConfiguration.java
index ca36d1b4..8bb99146 100644
--- a/test/transform/resource/after-ecj/ToStringConfiguration.java
+++ b/test/transform/resource/after-ecj/ToStringConfiguration.java
@@ -5,10 +5,10 @@ import lombok.Getter;
   ToStringConfiguration() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("ToStringConfiguration(" + this.x) + ")");
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
 }
@@ -17,7 +17,7 @@ import lombok.Getter;
   ToStringConfiguration2() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("ToStringConfiguration2(x=" + this.x) + ")");
   }
 }
@@ -26,10 +26,10 @@ import lombok.Getter;
   ToStringConfiguration3() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("ToStringConfiguration3(" + this.getX()) + ")");
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ToStringInner.java b/test/transform/resource/after-ecj/ToStringInner.java
index 027ccd0c..a8624823 100644
--- a/test/transform/resource/after-ecj/ToStringInner.java
+++ b/test/transform/resource/after-ecj/ToStringInner.java
@@ -5,7 +5,7 @@ import lombok.ToString;
     ToStringInner() {
       super();
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("ToStringOuter.ToStringInner(y=" + this.y) + ")");
     }
   }
@@ -14,7 +14,7 @@ import lombok.ToString;
     ToStringStaticInner() {
       super();
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("ToStringOuter.ToStringStaticInner(y=" + this.y) + ")");
     }
   }
@@ -24,7 +24,7 @@ import lombok.ToString;
       ToStringMoreInner() {
         super();
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
         return (("ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name) + ")");
       }
     }
@@ -37,7 +37,7 @@ import lombok.ToString;
   ToStringOuter() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("ToStringOuter(x=" + this.x) + ", name=") + this.name) + ")");
   }
 }
diff --git a/test/transform/resource/after-ecj/ToStringPlain.java b/test/transform/resource/after-ecj/ToStringPlain.java
index 939aa78e..7c9b47f5 100644
--- a/test/transform/resource/after-ecj/ToStringPlain.java
+++ b/test/transform/resource/after-ecj/ToStringPlain.java
@@ -5,7 +5,7 @@ import lombok.ToString;
   ToString1() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("ToString1(x=" + this.x) + ", name=") + this.name) + ")");
   }
 }
@@ -15,7 +15,7 @@ import lombok.ToString;
   ToString2() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("ToString2(x=" + this.x) + ", name=") + this.name) + ")");
   }
 }
diff --git a/test/transform/resource/after-ecj/Tolerate.java b/test/transform/resource/after-ecj/Tolerate.java
index 1c7b1038..1fe5fe4c 100644
--- a/test/transform/resource/after-ecj/Tolerate.java
+++ b/test/transform/resource/after-ecj/Tolerate.java
@@ -7,10 +7,10 @@ import java.util.regex.Pattern;
   public @lombok.experimental.Tolerate void setPattern(String pattern) {
     setPattern(Pattern.compile(pattern));
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPattern(final Pattern pattern) {
+  public @java.lang.SuppressWarnings("all") void setPattern(final Pattern pattern) {
     this.pattern = pattern;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Pattern getPattern() {
+  public @java.lang.SuppressWarnings("all") Pattern getPattern() {
     return this.pattern;
   }
 }
@@ -22,13 +22,13 @@ import java.util.regex.Pattern;
   public Tolerate2 withPattern(String nameGlob, String extensionGlob) {
     return withPattern(((nameGlob.replace("*", ".*") + "\\.") + extensionGlob.replace("*", ".*")));
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Pattern getPattern() {
+  public @java.lang.SuppressWarnings("all") Pattern getPattern() {
     return this.pattern;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Tolerate2 withPattern(final Pattern pattern) {
+  public @java.lang.SuppressWarnings("all") Tolerate2 withPattern(final Pattern pattern) {
     return ((this.pattern == pattern) ? this : new Tolerate2(pattern));
   }
-  public @java.beans.ConstructorProperties({"pattern"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Tolerate2(final Pattern pattern) {
+  public @java.lang.SuppressWarnings("all") Tolerate2(final Pattern pattern) {
     super();
     this.pattern = pattern;
   }
diff --git a/test/transform/resource/after-ecj/TrickyTypeResolution.java b/test/transform/resource/after-ecj/TrickyTypeResolution.java
index 5ea802dc..4553aaba 100644
--- a/test/transform/resource/after-ecj/TrickyTypeResolution.java
+++ b/test/transform/resource/after-ecj/TrickyTypeResolution.java
@@ -20,7 +20,7 @@ class TrickySuccess {
   TrickySuccess() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
 }
diff --git a/test/transform/resource/after-ecj/UtilityClass.java b/test/transform/resource/after-ecj/UtilityClass.java
index 81d5d9e6..656c0184 100644
--- a/test/transform/resource/after-ecj/UtilityClass.java
+++ b/test/transform/resource/after-ecj/UtilityClass.java
@@ -11,7 +11,7 @@ final @lombok.experimental.UtilityClass class UtilityClass {
   static void someMethod() {
     System.out.println();
   }
-  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") UtilityClass() {
+  private @java.lang.SuppressWarnings("all") UtilityClass() {
     super();
     throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
   }
@@ -22,7 +22,7 @@ class UtilityInner {
       static int member;
       <clinit>() {
       }
-      private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InnerInnerInner() {
+      private @java.lang.SuppressWarnings("all") InnerInnerInner() {
         super();
         throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
       }
@@ -36,7 +36,7 @@ class UtilityInner {
       static int member;
       <clinit>() {
       }
-      private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InsideEnum() {
+      private @java.lang.SuppressWarnings("all") InsideEnum() {
         super();
         throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
       }
@@ -54,7 +54,7 @@ class UtilityInner {
       static int member;
       <clinit>() {
       }
-      private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InsideInterface() {
+      private @java.lang.SuppressWarnings("all") InsideInterface() {
         super();
         throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
       }
diff --git a/test/transform/resource/after-ecj/ValueCallSuper.java b/test/transform/resource/after-ecj/ValueCallSuper.java
index 4e84f42c..0c28b9b6 100644
--- a/test/transform/resource/after-ecj/ValueCallSuper.java
+++ b/test/transform/resource/after-ecj/ValueCallSuper.java
@@ -4,7 +4,7 @@ class ValueParent {
   }

 }

 final @lombok.Value class ValueCallSuper extends ValueParent {

-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {

+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {

     if ((o == this))

         return true;

     if ((! (o instanceof ValueCallSuper)))

@@ -16,17 +16,17 @@ final @lombok.Value class ValueCallSuper extends ValueParent {
         return false;

     return true;

   }

-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {

+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {

     return (other instanceof ValueCallSuper);

   }

-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {

+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {

     int result = super.hashCode();

     return result;

   }

-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {

+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {

     return "ValueCallSuper()";

   }

-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueCallSuper() {

+  public @java.lang.SuppressWarnings("all") ValueCallSuper() {

     super();

   }

 }

diff --git a/test/transform/resource/after-ecj/ValueExperimental.java b/test/transform/resource/after-ecj/ValueExperimental.java
index 92deb614..dd13574a 100644
--- a/test/transform/resource/after-ecj/ValueExperimental.java
+++ b/test/transform/resource/after-ecj/ValueExperimental.java
@@ -1,39 +1,39 @@
 import lombok.experimental.Value;
 final @Value class ValueExperimental1 {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof ValueExperimental1)))
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return "ValueExperimental1()";
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueExperimental1() {
+  public @java.lang.SuppressWarnings("all") ValueExperimental1() {
     super();
   }
 }
 final @lombok.experimental.Value class ValueExperimental2 {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof ValueExperimental2)))
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return "ValueExperimental2()";
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueExperimental2() {
+  public @java.lang.SuppressWarnings("all") ValueExperimental2() {
     super();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ValueExperimentalStarImport.java b/test/transform/resource/after-ecj/ValueExperimentalStarImport.java
index 5b366e04..b69e85d9 100644
--- a/test/transform/resource/after-ecj/ValueExperimentalStarImport.java
+++ b/test/transform/resource/after-ecj/ValueExperimentalStarImport.java
@@ -1,20 +1,20 @@
 import lombok.experimental.*;
 final @Value class ValueExperimentalStarImport {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof ValueExperimentalStarImport)))
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return "ValueExperimentalStarImport()";
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueExperimentalStarImport() {
+  public @java.lang.SuppressWarnings("all") ValueExperimentalStarImport() {
     super();
   }
 }
diff --git a/test/transform/resource/after-ecj/ValuePlain.java b/test/transform/resource/after-ecj/ValuePlain.java
index 6a3265c9..442a63ac 100644
--- a/test/transform/resource/after-ecj/ValuePlain.java
+++ b/test/transform/resource/after-ecj/ValuePlain.java
@@ -2,13 +2,13 @@ import lombok.Value;
 final @lombok.Value class Value1 {
   private final int x;
   private final String name;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
+  public @java.lang.SuppressWarnings("all") String getName() {
     return this.name;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Value1)))
@@ -22,7 +22,7 @@ final @lombok.Value class Value1 {
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -30,10 +30,10 @@ final @lombok.Value class Value1 {
     result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("Value1(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Value1(final int x, final String name) {
+  public @java.lang.SuppressWarnings("all") Value1(final int x, final String name) {
     super();
     this.x = x;
     this.name = name;
@@ -42,13 +42,13 @@ final @lombok.Value class Value1 {
 @Value @lombok.experimental.NonFinal class Value2 {
   public final int x;
   private final String name;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
+  public @java.lang.SuppressWarnings("all") String getName() {
     return this.name;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Value2)))
@@ -64,10 +64,10 @@ final @lombok.Value class Value1 {
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
     return (other instanceof Value2);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -75,10 +75,10 @@ final @lombok.Value class Value1 {
     result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("Value2(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Value2(final int x, final String name) {
+  public @java.lang.SuppressWarnings("all") Value2(final int x, final String name) {
     super();
     this.x = x;
     this.name = name;
@@ -87,13 +87,13 @@ final @lombok.Value class Value1 {
 final @Value class Value3 {
   private @lombok.experimental.NonFinal int x;
   private final int y;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
+  public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() {
+  public @java.lang.SuppressWarnings("all") int getY() {
     return this.y;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Value3)))
@@ -105,17 +105,17 @@ final @Value class Value3 {
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
     result = ((result * PRIME) + this.getY());
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("Value3(x=" + this.getX()) + ", y=") + this.getY()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x", "y"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Value3(final int x, final int y) {
+  public @java.lang.SuppressWarnings("all") Value3(final int x, final int y) {
     super();
     this.x = x;
     this.y = y;
diff --git a/test/transform/resource/after-ecj/ValueStaticField.java b/test/transform/resource/after-ecj/ValueStaticField.java
index 75e337ce..dd116fc7 100644
--- a/test/transform/resource/after-ecj/ValueStaticField.java
+++ b/test/transform/resource/after-ecj/ValueStaticField.java
@@ -4,21 +4,21 @@ final @Value class ValueStaticField {
   static String PASSWORD = "Ken sent me";
   <clinit>() {
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof ValueStaticField)))
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return "ValueStaticField()";
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueStaticField() {
+  public @java.lang.SuppressWarnings("all") ValueStaticField() {
     super();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/WitherAccessLevel.java b/test/transform/resource/after-ecj/WitherAccessLevel.java
index 18b896df..09a2e514 100644
--- a/test/transform/resource/after-ecj/WitherAccessLevel.java
+++ b/test/transform/resource/after-ecj/WitherAccessLevel.java
@@ -9,19 +9,19 @@ class WitherAccessLevel {
   WitherAccessLevel(boolean isNone, boolean isPrivate, boolean isPackage, boolean isProtected, boolean isPublic, boolean value) {
     super();
   }
-  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withPrivate(final boolean isPrivate) {
+  private @java.lang.SuppressWarnings("all") WitherAccessLevel withPrivate(final boolean isPrivate) {
     return ((this.isPrivate == isPrivate) ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value));
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withPackage(final boolean isPackage) {
+  @java.lang.SuppressWarnings("all") WitherAccessLevel withPackage(final boolean isPackage) {
     return ((this.isPackage == isPackage) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value));
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withProtected(final boolean isProtected) {
+  protected @java.lang.SuppressWarnings("all") WitherAccessLevel withProtected(final boolean isProtected) {
     return ((this.isProtected == isProtected) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value));
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withPublic(final boolean isPublic) {
+  public @java.lang.SuppressWarnings("all") WitherAccessLevel withPublic(final boolean isPublic) {
     return ((this.isPublic == isPublic) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value));
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withValue(final boolean value) {
+  public @java.lang.SuppressWarnings("all") WitherAccessLevel withValue(final boolean value) {
     return ((this.value == value) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value));
   }
 }
diff --git a/test/transform/resource/after-ecj/WitherAlreadyExists.java b/test/transform/resource/after-ecj/WitherAlreadyExists.java
index f0186ca3..ded10755 100644
--- a/test/transform/resource/after-ecj/WitherAlreadyExists.java
+++ b/test/transform/resource/after-ecj/WitherAlreadyExists.java
@@ -37,7 +37,7 @@ class Wither5 {
   Wither5(String foo) {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Wither5 withFoo(final String foo) {
+  public @java.lang.SuppressWarnings("all") Wither5 withFoo(final String foo) {
     return ((this.foo == foo) ? this : new Wither5(foo));
   }
 }
@@ -48,7 +48,7 @@ class Wither6 {
   Wither6(String foo) {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Wither6 withFoo(final String foo) {
+  public @java.lang.SuppressWarnings("all") Wither6 withFoo(final String foo) {
     return ((this.foo == foo) ? this : new Wither6(foo));
   }
 }
diff --git a/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java b/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java
index 4443085c..10e993e1 100644
--- a/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java
+++ b/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java
@@ -4,13 +4,13 @@
   final int x = 10;
   int y = 20;
   final int z;
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAndAllArgsConstructor<T, J, L> withTest(final J test) {
+  public @java.lang.SuppressWarnings("all") WitherAndAllArgsConstructor<T, J, L> withTest(final J test) {
     return ((this.test == test) ? this : new WitherAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z));
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) {
+  public @java.lang.SuppressWarnings("all") WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) {
     return ((this.test2 == test2) ? this : new WitherAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z));
   }
-  public @java.beans.ConstructorProperties({"test", "test2", "y", "z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) {
+  public @java.lang.SuppressWarnings("all") WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) {
     super();
     this.test = test;
     this.test2 = test2;
diff --git a/test/transform/resource/after-ecj/WitherDeprecated.java b/test/transform/resource/after-ecj/WitherDeprecated.java
index 90e5fb88..b57d0d79 100644
--- a/test/transform/resource/after-ecj/WitherDeprecated.java
+++ b/test/transform/resource/after-ecj/WitherDeprecated.java
@@ -5,10 +5,10 @@ class WitherDeprecated {
   WitherDeprecated(int annotation, int javadoc) {
     super();
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherDeprecated withAnnotation(final int annotation) {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WitherDeprecated withAnnotation(final int annotation) {
     return ((this.annotation == annotation) ? this : new WitherDeprecated(annotation, this.javadoc));
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherDeprecated withJavadoc(final int javadoc) {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WitherDeprecated withJavadoc(final int javadoc) {
     return ((this.javadoc == javadoc) ? this : new WitherDeprecated(this.annotation, javadoc));
   }
 }
diff --git a/test/transform/resource/after-ecj/WitherOnClass.java b/test/transform/resource/after-ecj/WitherOnClass.java
index 1d5414d0..82132e87 100644
--- a/test/transform/resource/after-ecj/WitherOnClass.java
+++ b/test/transform/resource/after-ecj/WitherOnClass.java
@@ -4,7 +4,7 @@
   WitherOnClass1(boolean isNone, boolean isPublic) {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass1 withPublic(final boolean isPublic) {
+  public @java.lang.SuppressWarnings("all") WitherOnClass1 withPublic(final boolean isPublic) {
     return ((this.isPublic == isPublic) ? this : new WitherOnClass1(this.isNone, isPublic));
   }
 }
@@ -15,10 +15,10 @@
   WitherOnClass2(boolean isNone, boolean isProtected, boolean isPackage) {
     super();
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass2 withPackage(final boolean isPackage) {
+  @java.lang.SuppressWarnings("all") WitherOnClass2 withPackage(final boolean isPackage) {
     return ((this.isPackage == isPackage) ? this : new WitherOnClass2(this.isNone, this.isProtected, isPackage));
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass2 withProtected(final boolean isProtected) {
+  protected @java.lang.SuppressWarnings("all") WitherOnClass2 withProtected(final boolean isProtected) {
     return ((this.isProtected == isProtected) ? this : new WitherOnClass2(this.isNone, isProtected, this.isPackage));
   }
 }
@@ -28,10 +28,10 @@
   WitherOnClass3(String couldBeNull, String nonNull) {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass3 withCouldBeNull(final String couldBeNull) {
+  public @java.lang.SuppressWarnings("all") WitherOnClass3 withCouldBeNull(final String couldBeNull) {
     return ((this.couldBeNull == couldBeNull) ? this : new WitherOnClass3(couldBeNull, this.nonNull));
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass3 withNonNull(final @lombok.NonNull String nonNull) {
+  public @java.lang.SuppressWarnings("all") WitherOnClass3 withNonNull(final @lombok.NonNull String nonNull) {
     if ((nonNull == null))
         {
           throw new java.lang.NullPointerException("nonNull");
@@ -46,7 +46,7 @@
     super();
     this.fY = y;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass4 withY(final int fY) {
+  public @java.lang.SuppressWarnings("all") WitherOnClass4 withY(final int fY) {
     return ((this.fY == fY) ? this : new WitherOnClass4(fY));
   }
 }
diff --git a/test/transform/resource/after-ecj/WitherPlain.java b/test/transform/resource/after-ecj/WitherPlain.java
index 52177ef1..ae1988bc 100644
--- a/test/transform/resource/after-ecj/WitherPlain.java
+++ b/test/transform/resource/after-ecj/WitherPlain.java
@@ -7,10 +7,10 @@ class WitherPlain {
     this.i = i;
     this.foo = foo;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherPlain withI(final int i) {
+  public @java.lang.SuppressWarnings("all") WitherPlain withI(final int i) {
     return ((this.i == i) ? this : new WitherPlain(i, this.foo));
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherPlain withFoo(final int foo) {
+  public @java.lang.SuppressWarnings("all") WitherPlain withFoo(final int foo) {
     return ((this.foo == foo) ? this : new WitherPlain(this.i, foo));
   }
 }
diff --git a/test/transform/resource/after-ecj/WitherWithAbstract.java b/test/transform/resource/after-ecj/WitherWithAbstract.java
index 90fd6448..ed71347e 100644
--- a/test/transform/resource/after-ecj/WitherWithAbstract.java
+++ b/test/transform/resource/after-ecj/WitherWithAbstract.java
@@ -3,5 +3,5 @@ abstract class WitherWithAbstract {
   WitherWithAbstract() {
     super();
   }
-  public abstract @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithAbstract withFoo(final String foo);
+  public abstract @java.lang.SuppressWarnings("all") WitherWithAbstract withFoo(final String foo);
 }
diff --git a/test/transform/resource/after-ecj/WitherWithGenerics.java b/test/transform/resource/after-ecj/WitherWithGenerics.java
index 66d8a8f8..ee73297c 100644
--- a/test/transform/resource/after-ecj/WitherWithGenerics.java
+++ b/test/transform/resource/after-ecj/WitherWithGenerics.java
@@ -6,13 +6,13 @@ class WitherWithGenerics<T, J extends T, L extends java.lang.Number> {
   public WitherWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest(final J test) {
+  public @java.lang.SuppressWarnings("all") WitherWithGenerics<T, J, L> withTest(final J test) {
     return ((this.test == test) ? this : new WitherWithGenerics<T, J, L>(test, this.test2, this.test3));
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) {
+  public @java.lang.SuppressWarnings("all") WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) {
     return ((this.test2 == test2) ? this : new WitherWithGenerics<T, J, L>(this.test, test2, this.test3));
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) {
+  public @java.lang.SuppressWarnings("all") WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) {
     return ((this.test3 == test3) ? this : new WitherWithGenerics<T, J, L>(this.test, this.test2, test3));
   }
 }
diff --git a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages
index 0b520462..3a3a052d 100644
--- a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages
+++ b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages
@@ -1,3 +1,3 @@
 3 @NonNull is meaningless on a primitive.
-16 @NonNull is meaningless on a primitive.
-42 @NonNull is meaningless on a primitive.
\ No newline at end of file
+14 @NonNull is meaningless on a primitive.
+36 @NonNull is meaningless on a primitive.