diff --git a/.gitignore b/.gitignore
index 4fc554ede..0363e0707 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ test-output
 
 # Misc.
 .DS_Store
+checkstyle.cache
diff --git a/build-config/src/main/resources/build-config/checkstyle.xml b/build-config/src/main/resources/build-config/checkstyle.xml
index 9051361d1..213a0d21f 100644
--- a/build-config/src/main/resources/build-config/checkstyle.xml
+++ b/build-config/src/main/resources/build-config/checkstyle.xml
@@ -15,6 +15,8 @@
         <property name="basedir" value="${basedir}"/>
     -->
 
+    <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
     <!-- Checks that each Java package has a Javadoc file used for commenting. -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage       -->
     <!--
@@ -29,6 +31,13 @@
 
     <module name="FileLength"/>
 
+    <module name="LineLength">
+        <property name="max" value="150"/>
+        <property name="fileExtensions" value="java" />
+    </module>
+
+    <module name="SuppressWithPlainTextCommentFilter"/>
+
     <!-- Following interprets the header file as regular expressions. -->
     <!-- <module name="RegexpHeader"/>                                -->
 
@@ -60,8 +69,6 @@
 
     <module name="TreeWalker">
 
-        <property name="cacheFile" value="${checkstyle.cache.file}"/>
-
         <module name="SuppressWarningsHolder"/>
 
         <!-- Checks for Javadoc comments.                     -->
@@ -115,9 +122,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <property name="max" value="120"/>
-        </module>
         <module name="MethodLength"/>
         <module name="ParameterNumber">
             <property name="max" value="10"/>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1960db308..523a71511 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
         <org.apache.maven.plugins.javadoc.version>3.1.0</org.apache.maven.plugins.javadoc.version>
         <org.springframework.version>4.0.3.RELEASE</org.springframework.version>
         <org.eclipse.tycho.compiler-jdt.version>0.26.0</org.eclipse.tycho.compiler-jdt.version>
-        <com.puppycrawl.tools.checkstyle.version>8.18</com.puppycrawl.tools.checkstyle.version>
+        <com.puppycrawl.tools.checkstyle.version>8.29</com.puppycrawl.tools.checkstyle.version>
         <add.release.arguments />
         <forkCount>1</forkCount>
         <assertj.version>3.11.1</assertj.version>
@@ -278,7 +278,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.0</version>
                     <configuration>
                         <configLocation>build-config/checkstyle.xml</configLocation>
                         <consoleOutput>true</consoleOutput>
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/SimpleConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/SimpleConversion.java
index c143085bb..f0e0ccd88 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/SimpleConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/SimpleConversion.java
@@ -45,7 +45,6 @@ public abstract class SimpleConversion implements ConversionProvider {
         return Collections.emptyList();
     }
 
-
     /**
      * Returns the conversion string from source to target. The placeholder {@code <SOURCE>} can be used to represent a
      * reference to the source value.
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/HelperMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/HelperMethod.java
index 697d01a73..fcf8068ed 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/HelperMethod.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/HelperMethod.java
@@ -177,8 +177,6 @@ public abstract class HelperMethod implements Method {
         return true;
     }
 
-
-
     /**
      * There's currently only one parameter foreseen instead of a list of parameter
      *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleMethodResolver.java b/processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleMethodResolver.java
index 40dbb7490..61610badf 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleMethodResolver.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleMethodResolver.java
@@ -73,7 +73,6 @@ public final class LifecycleMethodResolver {
                         existingVariableNames );
     }
 
-
     /**
      * @param method the method to obtain the beforeMapping methods for
      * @param selectionParameters method selectionParameters
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/ObjectFactoryMethodResolver.java b/processor/src/main/java/org/mapstruct/ap/internal/model/ObjectFactoryMethodResolver.java
index b64dd8888..f4b39ab1a 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/ObjectFactoryMethodResolver.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/ObjectFactoryMethodResolver.java
@@ -50,8 +50,6 @@ public class ObjectFactoryMethodResolver {
         return getFactoryMethod( method, method.getResultType(), selectionParameters, ctx );
     }
 
-
-
     /**
      * returns a no arg factory method
      *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java
index 8fc7fcdc5..822ba0dd6 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java
@@ -145,7 +145,6 @@ public class TypeFactory {
         return getType( typeElement, isLiteral );
     }
 
-
     /**
      * Determines if the type with the given full qualified name is part of the classpath
      *
@@ -597,7 +596,6 @@ public class TypeFactory {
         return typeMirror;
     }
 
-
     /**
      * Whether the given type is ready to be processed or not. It can be processed if it is not of kind
      * {@link TypeKind#ERROR} and all {@link AstModifyingAnnotationProcessor}s (if any) indicated that they've fully
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java
index 4efb8011c..d68936f54 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java
@@ -176,7 +176,6 @@ public abstract class AnnotationBasedComponentModelProcessor implements ModelEle
         );
     }
 
-
     /**
      * Removes duplicate constructor parameter annotations. If an annotation is already present on the constructor, it
      * does not have be defined on the constructor parameter, too. For example, for CDI, the javax.inject.Inject
diff --git a/processor/src/main/java/org/mapstruct/ap/spi/DefaultAccessorNamingStrategy.java b/processor/src/main/java/org/mapstruct/ap/spi/DefaultAccessorNamingStrategy.java
index c3c14deb0..82ecb4e17 100644
--- a/processor/src/main/java/org/mapstruct/ap/spi/DefaultAccessorNamingStrategy.java
+++ b/processor/src/main/java/org/mapstruct/ap/spi/DefaultAccessorNamingStrategy.java
@@ -86,7 +86,6 @@ public class DefaultAccessorNamingStrategy implements AccessorNamingStrategy {
         return isNonBooleanGetterName || ( isBooleanGetterName && returnTypeIsBoolean );
     }
 
-
     /**
      * Returns {@code true} when the {@link ExecutableElement} is a setter method. A setter starts with 'set'. The
      * remainder of the name is supposed to reflect the property name.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/accessibility/referenced/a/ReferencedMapperDefaultOther.java b/processor/src/test/java/org/mapstruct/ap/test/accessibility/referenced/a/ReferencedMapperDefaultOther.java
index 81dcc306f..7d3ab7014 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/accessibility/referenced/a/ReferencedMapperDefaultOther.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/accessibility/referenced/a/ReferencedMapperDefaultOther.java
@@ -8,7 +8,6 @@ package org.mapstruct.ap.test.accessibility.referenced.a;
 import org.mapstruct.ap.test.accessibility.referenced.ReferencedSource;
 import org.mapstruct.ap.test.accessibility.referenced.ReferencedTarget;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_1170/PetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_1170/PetMapper.java
index 7dd9ff50a..96b7e8b72 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_1170/PetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_1170/PetMapper.java
@@ -29,7 +29,6 @@ public class PetMapper {
         .put( 3L, "cat" )
         .put( 4L, "dog" ).build();
 
-
     /**
      * method to be used when using an adder
      *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_375/Source.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_375/Source.java
index 6f9b15403..2418fb7fd 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_375/Source.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_375/Source.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.bugs._375;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetElement.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetElement.java
index dc794a62f..532c44052 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetElement.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetElement.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.bugs._513;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetKey.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetKey.java
index e697afc20..aef8b8ece 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetKey.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetKey.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.bugs._513;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetValue.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetValue.java
index d999de75a..beda1c138 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetValue.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetValue.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.bugs._513;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_913/Issue913GetterMapperForCollectionsTest.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_913/Issue913GetterMapperForCollectionsTest.java
index c9c3182ed..e63d91b5e 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_913/Issue913GetterMapperForCollectionsTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_913/Issue913GetterMapperForCollectionsTest.java
@@ -198,8 +198,6 @@ public class Issue913GetterMapperForCollectionsTest {
         assertThat( domain2.getLongs() ).isEmpty();
     }
 
-
-
     /**
      * These assert check if non-null and default mapping is working as expected.
      *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/adder/PetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/adder/PetMapper.java
index c2cf92ed6..ef80c4b6c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/adder/PetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/adder/PetMapper.java
@@ -31,7 +31,6 @@ public class PetMapper {
         .put( 3L, "cat" )
         .put( 4L, "dog" ).build();
 
-
     /**
      * method to be used when using an adder
      *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/adder/source/SingleElementSource.java b/processor/src/test/java/org/mapstruct/ap/test/collection/adder/source/SingleElementSource.java
index 91e277a20..01ab35a91 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/adder/source/SingleElementSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/adder/source/SingleElementSource.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.collection.adder.source;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/localdatetoxmlgregoriancalendarconversion/Source.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/localdatetoxmlgregoriancalendarconversion/Source.java
index 23fc7a5ed..081fc1edb 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/localdatetoxmlgregoriancalendarconversion/Source.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/localdatetoxmlgregoriancalendarconversion/Source.java
@@ -7,7 +7,6 @@ package org.mapstruct.ap.test.conversion.java8time.localdatetoxmlgregoriancalend
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
  * @author Andreas Gudian
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/AmbiguousBarFactory.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/AmbiguousBarFactory.java
index cb1c30a2d..2c6c07040 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/AmbiguousBarFactory.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/AmbiguousBarFactory.java
@@ -7,7 +7,6 @@ package org.mapstruct.ap.test.erroneous.ambiguousannotatedfactorymethod;
 
 import org.mapstruct.ObjectFactory;
 
-
 /**
  * @author Remo Meier
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Foo.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Foo.java
index 796dd0fae..679efa835 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Foo.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Foo.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.erroneous.ambiguousannotatedfactorymethod;
 
-
 /**
  * @author Remo Meier
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Source.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Source.java
index 8fdd2ad52..0a4e64dc5 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Source.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Source.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.erroneous.ambiguousannotatedfactorymethod;
 
-
 /**
  * @author Remo Meier
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Target.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Target.java
index 71b5880ad..f15dc0e8d 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Target.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Target.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.erroneous.ambiguousannotatedfactorymethod;
 
-
 /**
  * @author Remo Meier
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Foo.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Foo.java
index 2373a6549..7d1308992 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Foo.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Foo.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.erroneous.ambiguousfactorymethod;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Source.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Source.java
index ea0c9a247..2aabe7e06 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Source.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Source.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.erroneous.ambiguousfactorymethod;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Target.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Target.java
index 2342d880e..025ae810f 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Target.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Target.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.erroneous.ambiguousfactorymethod;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/a/BarFactory.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/a/BarFactory.java
index 35cb5c446..b0e2a46e4 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/a/BarFactory.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/a/BarFactory.java
@@ -7,7 +7,6 @@ package org.mapstruct.ap.test.erroneous.ambiguousfactorymethod.a;
 
 import org.mapstruct.ap.test.erroneous.ambiguousfactorymethod.Bar;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/generics/AbstractTo.java b/processor/src/test/java/org/mapstruct/ap/test/generics/AbstractTo.java
index 5d7f0ba82..c0f4c423e 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/generics/AbstractTo.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/generics/AbstractTo.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.generics;
 
-
 /**
  * @author Andreas Gudian
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/generics/TargetTo.java b/processor/src/test/java/org/mapstruct/ap/test/generics/TargetTo.java
index 799dc2509..cac761f14 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/generics/TargetTo.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/generics/TargetTo.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.generics;
 
-
 /**
  * @author Andreas Gudian
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/_target/AdderUsageObserver.java b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/_target/AdderUsageObserver.java
index 96de5cd1d..e7cae2946 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/_target/AdderUsageObserver.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/_target/AdderUsageObserver.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.nestedsourceproperties._target;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/_target/ChartEntryLabel.java b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/_target/ChartEntryLabel.java
index bd13f1fcb..77d2e6865 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/_target/ChartEntryLabel.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/_target/ChartEntryLabel.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.nestedsourceproperties._target;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/source/Song.java b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/source/Song.java
index f3c285626..f1ebe5074 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/source/Song.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/source/Song.java
@@ -7,7 +7,6 @@ package org.mapstruct.ap.test.nestedsourceproperties.source;
 
 import java.util.List;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nullcheck/MyLongWrapper.java b/processor/src/test/java/org/mapstruct/ap/test/nullcheck/MyLongWrapper.java
index d070c6494..2836f7b3d 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nullcheck/MyLongWrapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nullcheck/MyLongWrapper.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.nullcheck;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/references/Target.java b/processor/src/test/java/org/mapstruct/ap/test/references/Target.java
index 53feca7fc..78fd2df3a 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/references/Target.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/references/Target.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.references;
 
-
 /**
  * @author Andreas Gudian
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveMapper.java b/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveMapper.java
index 4ab200f9f..aaee7eafe 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveMapper.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.selection.primitives;
 
-
 /**
  * @author Sjaak Derksen
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/source/constants/Source1.java b/processor/src/test/java/org/mapstruct/ap/test/source/constants/Source1.java
index e9797fdec..00f9d9fc4 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/source/constants/Source1.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/source/constants/Source1.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.source.constants;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/source/constants/Source2.java b/processor/src/test/java/org/mapstruct/ap/test/source/constants/Source2.java
index eb5cc07a2..aaad0dd73 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/source/constants/Source2.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/source/constants/Source2.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.source.constants;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/source/constants/Target2.java b/processor/src/test/java/org/mapstruct/ap/test/source/constants/Target2.java
index e64b3f7e7..56a1570cb 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/source/constants/Target2.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/source/constants/Target2.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.source.constants;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/template/Source.java b/processor/src/test/java/org/mapstruct/ap/test/template/Source.java
index a5013e5ac..b330d98c2 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/template/Source.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/template/Source.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.template;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/template/Target.java b/processor/src/test/java/org/mapstruct/ap/test/template/Target.java
index 3d8c63faf..5ef24faaf 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/template/Target.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/template/Target.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.template;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/runner/GeneratedSource.java b/processor/src/test/java/org/mapstruct/ap/testutil/runner/GeneratedSource.java
index 35e3ddb0e..f5a98bfee 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/runner/GeneratedSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/runner/GeneratedSource.java
@@ -57,7 +57,6 @@ public class GeneratedSource implements TestRule {
         GeneratedSource.compilingStatement.remove();
     }
 
-
     /**
      * Adds more mappers that need to be compared.
      *
diff --git a/processor/src/test/resources/checkstyle-for-generated-sources.xml b/processor/src/test/resources/checkstyle-for-generated-sources.xml
index eecb42111..295fbeeff 100644
--- a/processor/src/test/resources/checkstyle-for-generated-sources.xml
+++ b/processor/src/test/resources/checkstyle-for-generated-sources.xml
@@ -7,6 +7,8 @@
 <!-- Based on sun_checks.xml from the CheckStyle distribution -->
 
 <module name="Checker">
+
+    <property name="cacheFile" value="${checkstyle.cache.file}"/>
     <!--
         If you set the basedir property below, then all reported file
         names will be relative to the specified directory. See
@@ -56,8 +58,6 @@
 
     <module name="TreeWalker">
 
-        <property name="cacheFile" value="${checkstyle.cache.file}"/>
-
         <!-- Checks for Naming Conventions.                  -->
         <!-- See http://checkstyle.sf.net/config_naming.html -->
    <!-- <module name="ConstantName"/>