Merge remote-tracking branch 'origin/master' into playNiceWithOtherAP

109 files changed, 759 insertions, 722 deletions

diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java
index 450c35fa..09b94c8e 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") @javax.annotation.Generated("lombok") @lombok.Generated String fieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluent fieldName(final String fieldName) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated 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") @javax.annotation.Generated("lombok") @lombok.Generated 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") @javax.annotation.Generated("lombok") @lombok.Generated String fieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getOtherFieldWithOverride() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated 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") @javax.annotation.Generated("lombok") @lombok.Generated 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") @javax.annotation.Generated("lombok") @lombok.Generated 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") @javax.annotation.Generated("lombok") @lombok.Generated 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") @javax.annotation.Generated("lombok") @lombok.Generated void setActualField(final String fActualField) {
     this.fActualField = fActualField;
   }
 }
@@ -69,10 +69,10 @@ class AccessorsChain {