You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2023/02/13 08:19:27 UTC

[maven-compiler-plugin] branch master updated (f9b6bd0 -> f7a4613)

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git


    from f9b6bd0  [MCOMPILER-523] Test with Maven 3.9.0 and fix the failing IT (#176)
     new 3dca82f  [MCOMPILER-526] Add packages to please the formatter
     new cc78aee  [MCOMPILER-526] Upgrade to parent 39
     new f7a4613  [MCOMPILER-526] Reformat

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            |   63 +-
 src/it/MCOMPILER-129/src/main/java/MyClass.java    |   44 +-
 .../src/main/java/org/issue/SimpleAnnotation.java  |    7 +-
 .../java/org/issue/SimpleAnnotationProcessor.java  |   46 +-
 .../src/main/java/org/issue/SimpleObject.java      |    8 +-
 .../src/test/java/org/issue/SimpleTestObject.java  |    8 +-
 .../org/apache/maven/plugins/compiler/it/App.java  |   36 +-
 .../org/apache/maven/plugins/compiler/it/App2.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App3.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App4.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App5.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App6.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App7.java |   36 +-
 .../apache/maven/plugins/compiler/it/AppTest.java  |   27 +-
 .../org/apache/maven/plugins/compiler/it/App.java  |   36 +-
 .../org/apache/maven/plugins/compiler/it/App2.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App3.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App4.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App5.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App6.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App7.java |   36 +-
 .../apache/maven/plugins/compiler/it/AppTest.java  |   27 +-
 .../org/apache/maven/plugins/compiler/it/App.java  |   36 +-
 .../org/apache/maven/plugins/compiler/it/App2.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App3.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App4.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App5.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App6.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App7.java |   36 +-
 .../apache/maven/plugins/compiler/it/AppTest.java  |   27 +-
 .../org/apache/maven/plugins/compiler/it/App.java  |   36 +-
 .../org/apache/maven/plugins/compiler/it/App2.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App3.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App4.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App5.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App6.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App7.java |   36 +-
 .../apache/maven/plugins/compiler/it/AppTest.java  |   27 +-
 .../main/java/org/example/pce/sample/Dummy.java    |   14 +-
 .../src/main/java/dummy/HelloWorld.java            |   53 +-
 src/it/MCOMPILER-192/verify.groovy                 |    1 -
 .../src/main/java/org/issue/Person.java            |    4 +-
 .../java/org/issue/SimpleAnnotationProcessor.java  |  226 ++-
 .../src/main/java/org/issue/SimpleAnnotation.java  |   59 +-
 .../src/main/java/org/issue/SimpleObject.java      |   48 +-
 .../src/test/java/org/issue/SimpleTestObject.java  |   48 +-
 .../src/main/java/dummy/HelloWorld.java            |   53 +-
 .../src/main/java/dummy/package-info.java          |    2 +-
 src/it/MCOMPILER-205/verify.groovy                 |    1 -
 .../src/main/java/org/issue/MCompiler224.java      |   13 +-
 .../org/issue/MCompiler224AnnotationProcessor.java |   39 +-
 .../src/main/java/org/issue/user/User.java         |   13 +-
 .../src/main/java/example/FinalExample.java        |   89 +-
 .../src/main/java/com/foo/MyClass.java             |   46 +-
 .../src/main/java/com/foo/MyClass.java             |   46 +-
 .../src/main/java/module-info.java                 |   44 +-
 .../src/test/java/com/foo/MyTest.java              |   53 +-
 .../src/main/java/MyClass.java                     |   44 +-
 .../src/test/java/MyTest.java                      |   49 +-
 .../src/main/java/processor1/Processor1.java       |   17 +-
 .../src/main/java/processor2/dep/Foo.java          |    9 +-
 .../src/main/java/processor2/Processor2.java       |   17 +-
 .../project/src/main/java/project/Project.java     |   14 +-
 .../src/main/java/com/foo/MyClass.java             |   46 +-
 .../src/main/java/module-info.java                 |   43 +-
 .../src/test/java/com/foo/MyTest.java              |   53 +-
 .../src/main/java/com/foo/MyClass.java             |   12 +-
 .../src/test/java/com/foo/MyTest.java              |   11 +-
 .../app/src/main/java/module-info.java             |   44 +-
 .../app/src/main/java/org/maven/test/app/Main.java |   63 +-
 .../lib/src/main/java/module-info.java             |   44 +-
 .../lib/src/main/java/org/maven/test/lib/Sout.java |   64 +-
 .../src/main/java/com/foo/ParameterClass.java      |   10 +-
 .../src/test/java/com/foo/ParameterTest.java       |   20 +-
 .../src/main/java/module-info.java                 |    8 +-
 .../src/test/java/test/MyTest.java                 |   11 +-
 .../src/main/java/MyClass.java                     |   10 +-
 .../MCOMPILER-328_multiReleaseOutput/verify.groovy |    4 +-
 .../a/src/main/java/module-info.java               |    4 +-
 .../b/src/main/java/module-info.java               |    3 +-
 .../b/src/main/java/test/Foo.java                  |    6 +-
 .../b/src/main/java/test/package-info.java         |    5 +-
 .../acceptance/server/PooledJenkinsController.java |   41 +-
 .../dependent-module/src/main/java/Main.java       |    9 +-
 .../service/src/main/java/TestService.java         |   11 +-
 .../MCOMPILER-349_dependencyChanged/verify.groovy  |    1 -
 .../main360/src/main/java/module-info.java         |    7 +-
 .../MCOMPILER-366/src/main/java/module-info.java   |   10 +-
 .../src/main/java/org/maven/test/Main.java         |   13 +-
 .../src/main/java/org/maven/bug/A.java             |   13 +-
 .../src/main/java/org/maven/bug/B.java             |   13 +-
 .../src/main/java11/org/maven/bug/B.java           |   13 +-
 .../src/main/java9/org/maven/bug/A9.java           |   13 +-
 .../src/main/java9/org/maven/bug/B.java            |   13 +-
 .../module2/src/main/java/com/natros/mcp/Foo.java  |    7 +-
 .../dependent-module/src/main/java/Main.java       |    7 +-
 .../service/src/main/java/TestService.java         |    9 +-
 .../verify.groovy                                  |    1 -
 .../app/src/main/java/org/test/app/Main.java       |    7 +-
 .../app/src/test/java/org/test/app/MainTest.java   |    9 +-
 .../main/java/org/test/service/JSONService.java    |    6 +-
 .../src/main/java/org/test/service/Service.java    |    7 +-
 .../src/main/java/dummy/HelloWorld.java            |   13 +-
 .../src/main/java/dummy/package-info.java          |    2 +-
 src/it/MCOMPILER-485/verify.groovy                 |    1 -
 .../src/main/java/dummy/package-info.java          |    2 +-
 src/it/MCOMPILER-495/verify.groovy                 |    1 -
 .../src/main/java/dummy/Person.java                |    4 +-
 .../src/main/java/dummy/foo/Person.java            |    4 +-
 .../src/main/java/dummy/package-info.java          |    2 +-
 .../MCOMPILER-500-package-info-incr/verify.groovy  |    1 -
 .../AnnotationProcessorDependencyV1.java           |    6 +-
 .../AnnotationProcessorDependencyV2.java           |    6 +-
 .../mcompiler503/SimpleAnnotationProcessor.java    |   83 +-
 .../main/java/mcompiler503/SimpleAnnotation.java   |    6 +-
 .../src/main/java/mcompiler503/SimpleObject.java   |    6 +-
 .../test/java/mcompiler503/SimpleTestObject.java   |    6 +-
 src/it/MCOMPILER-512/src/main/java/dummy/Main.java |   12 +-
 src/it/MCOMPILER-512/src/test/java/dummy/Test.java |   11 +-
 .../SimpleAnnotation.java                          |    8 +-
 .../SimpleObject.java                              |    8 +-
 .../src/main/java/module-info.java                 |   43 +-
 .../src/main/java/org/maven/test/Main.java         |   63 +-
 .../src/main/java/module-info.java                 |   47 +-
 .../src/main/java/org/maven/test/Main.java         |   63 +-
 .../src/main/java/module-info.java                 |   43 +-
 .../src/main/java/org/maven/test/Main.java         |   53 +-
 .../src/main/java/module-info.java                 |   47 +-
 .../src/main/java/org/maven/test/Main.java         |   63 +-
 .../src/main/java/MyClass.java                     |   10 +-
 .../default-fork-windows/src/test/java/MyTest.java |   11 +-
 src/it/default-fork-windows/verify.groovy          |    4 +-
 src/it/default-fork/src/main/java/MyClass.java     |   10 +-
 src/it/default-fork/src/test/java/MyTest.java      |   11 +-
 src/it/default-fork/verify.groovy                  |    4 +-
 .../src/main/java/MyClass.java                     |   23 -
 .../src/main/java/foo/MyClass.java}                |    4 +-
 .../src/test/java/{ => foo}/MyTest.java            |   11 +-
 src/it/default-incremental-disable/verify.groovy   |    4 +-
 src/it/default/src/main/java/MyClass.java          |   10 +-
 src/it/default/src/test/java/MyTest.java           |   11 +-
 src/it/default/verify.bsh                          |    4 +-
 .../verify.groovy                                  |    1 -
 .../main/java/org/apache/maven/it0055/Person.java  |   21 +-
 .../java/org/apache/maven/it0055/PersonTwo.java    |   21 +-
 .../java/org/apache/maven/it0055/PersonTest.java   |   23 +-
 .../org/apache/maven/it0055/PersonTwoTest.java     |   23 +-
 .../java/com/mycompany/jdk16annotation/App.java    |   16 +-
 .../mycompany/jdk16annotation/ServiceProvider.java |   12 +-
 .../jdk16annotation/ServiceProviderProcessor.java  |   40 +-
 .../com/mycompany/jdk16annotation/AppTest.java     |   29 +-
 .../bar/src/main/java/module-info.java             |   44 +-
 .../jdk9-exportsto/foo/src/main/java/foo/Foo.java  |   43 +-
 .../foo/src/main/java/module-info.java             |   45 +-
 .../src/main/java/module-info.java                 |   41 +-
 .../src/main/java/org/maven/test/Main.java         |   69 +-
 .../src/test/java/bar/BarTests.java                |   11 +-
 .../src/test/java/module-info.java                 |    3 +-
 .../src/main/java/foo/Foo.java                     |    9 +-
 .../src/main/java/module-info.java                 |    4 +-
 .../src/test/java/bar/BarTests.java                |   15 +-
 .../src/test/java/module-info.java                 |    3 +-
 .../src/main/java/foo/Foo.java                     |    9 +-
 .../src/main/java/module-info.java                 |    3 +-
 .../src/test/java/foo/FooTests.java                |   15 +-
 .../src/test/java/module-info.java                 |    3 +-
 .../src/main/java/module-info.java                 |   41 +-
 .../src/main/java/org/maven/test/Main.java         |   69 +-
 .../src/test/java/org/maven/test/MainTest.java     |   59 +-
 src/it/mcompiler-106/src/main/java/MyClass.java    |   10 +-
 .../src/main/java/org/maven/test/Main.java         |    9 +-
 src/it/mcompiler-120/verify.groovy                 |    1 -
 src/it/mcompiler-135/src/main/java/MyClass.java    |   10 +-
 .../src/main/java/org/maven/test/MyClass.java      |    8 +-
 src/it/mcompiler-182/src/main/java/BeanA.java      |    7 +-
 src/it/mcompiler-182/src/main/java/BeanA2.java     |    5 +-
 src/it/mcompiler-182/verify.groovy                 |    3 +-
 .../src/main/java/BeanA.java                       |    7 +-
 .../src/main/java/BeanA2.java                      |    5 +-
 src/it/mcompiler-21_class-remove/verify.groovy     |    1 -
 .../src/main/java/BeanA.java                       |    7 +-
 .../src/main/java/BeanA2.java                      |    5 +-
 .../mcompiler-21_methodname-change/verify.groovy   |    1 -
 .../multirelease-base/src/main/java/base/Base.java |    3 +-
 .../multirelease-base/src/main/java/mr/A.java      |    8 +-
 .../multirelease-base/src/main/java/mr/I.java      |    8 +-
 .../multirelease-base/src/test/java/mr/ATest.java  |   44 +-
 .../multirelease-nine/src/main/java/mr/A.java      |   14 +-
 .../multirelease-nine/src/test/java/mr/ATest.java  |   46 +-
 .../multirelease-base/src/main/java/base/Base.java |    3 +-
 .../multirelease-base/src/main/java/mr/A.java      |    8 +-
 .../multirelease-base/src/main/java/mr/I.java      |    8 +-
 .../multirelease-base/src/test/java/mr/ATest.java  |   44 +-
 .../multirelease-nine/src/main/java/mr/A.java      |   14 +-
 .../multirelease-nine/src/test/java/mr/ATest.java  |   46 +-
 .../src/main/java-mr/9/module-info.java            |    7 +-
 .../packaging-plugin/src/main/java-mr/9/mr/A.java  |   14 +-
 .../packaging-plugin/src/main/java/base/Base.java  |    3 +-
 .../packaging-plugin/src/main/java/mr/A.java       |    8 +-
 .../packaging-plugin/src/main/java/mr/I.java       |    8 +-
 .../packaging-plugin/src/test/java/mr/ATest.java   |   40 +-
 .../src/main/java/base/Base.java                   |    3 +-
 .../singleproject-runtime/src/main/java/mr/A.java  |    8 +-
 .../singleproject-runtime/src/main/java/mr/I.java  |    8 +-
 .../src/main/java9/module-info.java                |    7 +-
 .../singleproject-runtime/src/main/java9/mr/A.java |   14 +-
 .../src/test/java/mr/ATest.java                    |   40 +-
 .../src/main/java/base/Base.java                   |    3 +-
 .../src/main/java/mr/A.java                        |    8 +-
 .../src/main/java/mr/I.java                        |    8 +-
 .../src/main/java9/module-info.java                |    7 +-
 .../src/main/java9/mr/A.java                       |   14 +-
 .../src/test/java/mr/ATest.java                    |   40 +-
 .../src/main/java/MyClass.java                     |   14 +-
 .../non-english-warnings/src/test/java/MyTest.java |   14 +-
 src/it/non-english-warnings/verify.bsh             |    5 +-
 .../SourcePathReadGoal.java                        |   78 +-
 .../src/main/java/com/ta3/MyClass.java             |   46 +-
 .../src/main/java/com/ta2/MyClass.java             |   46 +-
 .../src/main/java/module-info.java                 |   46 +-
 .../src/main/java/com/ta2/MyClass.java             |   46 +-
 .../src/main/java/com/ta2/plus/MyClass.java        |   46 +-
 .../src/main/java/module-info.java                 |   46 +-
 src/it/test1/src/main/java/MyClass.java            |   10 +-
 .../plugin/compiler/AbstractCompilerMojo.java      | 1459 ++++++++------------
 .../compiler/CompilationFailureException.java      |   38 +-
 .../apache/maven/plugin/compiler/CompilerMojo.java |  340 ++---
 .../plugin/compiler/DependencyCoordinate.java      |  328 ++---
 .../maven/plugin/compiler/TestCompilerMojo.java    |  344 ++---
 .../plugin/compiler/CompilerMojoTestCase.java      |  468 +++----
 .../plugin/compiler/stubs/CompilerManagerStub.java |   20 +-
 .../maven/plugin/compiler/stubs/CompilerStub.java  |   69 +-
 .../plugin/compiler/stubs/DebugEnabledLog.java     |   13 +-
 .../src/main/java/TestCompile0.java                |   12 +-
 .../src/test/java/TestCompile0Test.java            |   10 +-
 .../src/main/java/TestCompile0.java                |   12 +-
 .../src/main/java/TestCompile0.java                |   12 +-
 .../src/test/java/TestCompile0Test.java            |   10 +-
 .../src/main/java/TestCompile0.java                |   12 +-
 .../src/test/java/TestCompile0Test.java            |   10 +-
 .../src/main/java/TestCompile0.java                |   12 +-
 .../src/test/java/TestCompile0Test.java            |   10 +-
 .../src/main/java/TestCompile1.java                |   12 +-
 .../src/test/java/TestCompile1TestCase.java        |   10 +-
 .../src/main/java/TestCompile2.java                |   12 +-
 .../src/main/java/TestCompile3.java                |   12 +-
 .../src/main/java/TestCompile4.java                |   12 +-
 .../src/test/java/TestCompile2TestCase.java        |   10 +-
 .../src/test/java/TestCompile3TestCase.java        |   10 +-
 .../src/test/java/TestCompile4TestCase.java        |   10 +-
 .../src/main/java/TestCompile2.java                |   12 +-
 .../src/main/java/TestCompile3.java                |   12 +-
 .../src/main/java/TestCompile4.java                |   12 +-
 .../src/test/java/TestCompile2TestCase.java        |   10 +-
 .../src/test/java/TestCompile3TestCase.java        |   10 +-
 .../src/test/java/TestCompile4TestCase.java        |   10 +-
 .../src/main/java/TestCompile2.java                |   12 +-
 .../src/main/java/TestCompile3.java                |   12 +-
 .../src/main/java/TestCompile4.java                |   12 +-
 .../src/test/java/TestCompile2TestCase.java        |   10 +-
 .../src/test/java/TestCompile3TestCase.java        |   10 +-
 .../src/test/java/TestCompile4TestCase.java        |   10 +-
 .../src/main/java/TestSkipMainCompile0.java        |   12 +-
 .../src/test/java/TestSkipMainCompile0Test.java    |   12 +-
 .../src/main/java/TestSkipTestCompile0.java        |   12 +-
 .../src/test/java/TestSkipTestCompile0Test.java    |   10 +-
 266 files changed, 3740 insertions(+), 5025 deletions(-)
 delete mode 100644 src/it/default-incremental-disable/src/main/java/MyClass.java
 copy src/it/{MCOMPILER-192/src/main/java/dummy/license.txt => default-incremental-disable/src/main/java/foo/MyClass.java} (95%)
 rename src/it/default-incremental-disable/src/test/java/{ => foo}/MyTest.java (93%)


[maven-compiler-plugin] 02/03: [MCOMPILER-526] Upgrade to parent 39

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git

commit cc78aee657a684af721b3efafd0e1525272d4201
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Feb 10 08:55:20 2023 +0100

    [MCOMPILER-526] Upgrade to parent 39
---
 pom.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 992a2d9..a20f8b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>37</version>
+    <version>39</version>
     <relativePath />
   </parent>
 
@@ -215,6 +215,17 @@ under the License.
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>sisu-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <configuration>
+          <java>
+            <includes>
+              <include>src/**/*.java</include>
+            </includes>
+          </java>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 


[maven-compiler-plugin] 01/03: [MCOMPILER-526] Add packages to please the formatter

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git

commit 3dca82f4bf91e747c81ff3fe43e670f7cd7c08e1
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Feb 10 10:11:40 2023 +0100

    [MCOMPILER-526] Add packages to please the formatter
---
 .../src/main/java/MyClass.java                     |  1 +
 .../MCOMPILER-328_multiReleaseOutput/verify.groovy |  4 ++--
 .../dependent-module/src/main/java/Main.java       |  1 +
 .../service/src/main/java/TestService.java         |  1 +
 .../dependent-module/src/main/java/Main.java       |  1 +
 .../service/src/main/java/TestService.java         |  1 +
 .../src/main/java/MyClass.java                     |  1 +
 .../default-fork-windows/src/test/java/MyTest.java |  1 +
 src/it/default-fork-windows/verify.groovy          |  4 ++--
 src/it/default-fork/src/main/java/MyClass.java     |  1 +
 src/it/default-fork/src/test/java/MyTest.java      |  1 +
 src/it/default-fork/verify.groovy                  |  4 ++--
 .../src/main/java/{ => foo}/MyClass.java           |  1 +
 .../src/test/java/{ => foo}/MyTest.java            |  1 +
 src/it/default-incremental-disable/verify.groovy   |  4 ++--
 src/it/default/src/main/java/MyClass.java          |  1 +
 src/it/default/src/test/java/MyTest.java           |  1 +
 src/it/default/verify.bsh                          |  4 ++--
 src/it/mcompiler-106/src/main/java/MyClass.java    |  1 +
 src/it/mcompiler-135/src/main/java/MyClass.java    |  1 +
 src/it/mcompiler-182/src/main/java/BeanA.java      |  1 +
 src/it/mcompiler-182/src/main/java/BeanA2.java     |  1 +
 src/it/mcompiler-182/verify.groovy                 |  2 +-
 .../src/main/java/BeanA.java                       |  1 +
 .../src/main/java/BeanA2.java                      |  1 +
 .../src/main/java/BeanA.java                       |  1 +
 .../src/main/java/BeanA2.java                      |  1 +
 .../src/main/java/MyClass.java                     |  1 +
 .../non-english-warnings/src/test/java/MyTest.java |  1 +
 src/it/non-english-warnings/verify.bsh             |  4 ++--
 src/it/test1/src/main/java/MyClass.java            |  1 +
 .../plugin/compiler/CompilerMojoTestCase.java      | 28 +++++++++++-----------
 .../src/main/java/TestCompile0.java                |  1 +
 .../src/test/java/TestCompile0Test.java            |  1 +
 .../src/main/java/TestCompile0.java                |  1 +
 .../src/main/java/TestCompile0.java                |  1 +
 .../src/test/java/TestCompile0Test.java            |  1 +
 .../src/main/java/TestCompile0.java                |  1 +
 .../src/test/java/TestCompile0Test.java            |  1 +
 .../src/main/java/TestCompile0.java                |  1 +
 .../src/test/java/TestCompile0Test.java            |  1 +
 .../src/main/java/TestCompile1.java                |  1 +
 .../src/test/java/TestCompile1TestCase.java        |  1 +
 .../src/main/java/TestCompile2.java                |  1 +
 .../src/main/java/TestCompile3.java                |  1 +
 .../src/main/java/TestCompile4.java                |  1 +
 .../src/test/java/TestCompile2TestCase.java        |  1 +
 .../src/test/java/TestCompile3TestCase.java        |  1 +
 .../src/test/java/TestCompile4TestCase.java        |  1 +
 .../src/main/java/TestCompile2.java                |  1 +
 .../src/main/java/TestCompile3.java                |  1 +
 .../src/main/java/TestCompile4.java                |  1 +
 .../src/test/java/TestCompile2TestCase.java        |  1 +
 .../src/test/java/TestCompile3TestCase.java        |  1 +
 .../src/test/java/TestCompile4TestCase.java        |  1 +
 .../src/main/java/TestCompile2.java                |  2 +-
 .../src/main/java/TestCompile3.java                |  1 +
 .../src/main/java/TestCompile4.java                |  1 +
 .../src/test/java/TestCompile2TestCase.java        |  1 +
 .../src/test/java/TestCompile3TestCase.java        |  1 +
 .../src/test/java/TestCompile4TestCase.java        |  1 +
 .../src/main/java/TestSkipMainCompile0.java        |  1 +
 .../src/test/java/TestSkipMainCompile0Test.java    |  1 +
 .../src/main/java/TestSkipTestCompile0.java        |  1 +
 .../src/test/java/TestSkipTestCompile0Test.java    |  1 +
 65 files changed, 84 insertions(+), 28 deletions(-)

diff --git a/src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java b/src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java
+++ b/src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class MyClass
 {
diff --git a/src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy b/src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy
index ea03de5..f3423da 100644
--- a/src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy
+++ b/src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-assert !new File( basedir, 'target/classes/MyClass.class').exists()
+assert !new File( basedir, 'target/classes/foo/MyClass.class').exists()
 
-assert new File( basedir, 'target/classes/META-INF/versions/9/MyClass.class').exists()
\ No newline at end of file
+assert new File( basedir, 'target/classes/META-INF/versions/9/foo/MyClass.class').exists()
\ No newline at end of file
diff --git a/src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java b/src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java
index f77ad07..1d0ba1f 100644
--- a/src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java
+++ b/src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class Main
 {
diff --git a/src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java b/src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java
index df21d26..2e1d747 100644
--- a/src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java
+++ b/src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestService
 {
diff --git a/src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java b/src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java
index dbad7cf..1403991 100644
--- a/src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java
+++ b/src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class Main
 {
diff --git a/src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java b/src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java
index 7d5e878..4fb1ade 100644
--- a/src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java
+++ b/src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestService
 {
diff --git a/src/it/default-fork-windows/src/main/java/MyClass.java b/src/it/default-fork-windows/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/default-fork-windows/src/main/java/MyClass.java
+++ b/src/it/default-fork-windows/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class MyClass
 {
diff --git a/src/it/default-fork-windows/src/test/java/MyTest.java b/src/it/default-fork-windows/src/test/java/MyTest.java
index 46ba41d..33d4178 100644
--- a/src/it/default-fork-windows/src/test/java/MyTest.java
+++ b/src/it/default-fork-windows/src/test/java/MyTest.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/it/default-fork-windows/verify.groovy b/src/it/default-fork-windows/verify.groovy
index 6b1651d..2d4a24c 100644
--- a/src/it/default-fork-windows/verify.groovy
+++ b/src/it/default-fork-windows/verify.groovy
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-assert new File( basedir, 'target/classes/MyClass.class').exists()
+assert new File( basedir, 'target/classes/foo/MyClass.class').exists()
 
-assert new File( basedir, 'target/test-classes/MyTest.class').exists()
+assert new File( basedir, 'target/test-classes/foo/MyTest.class').exists()
 
 assert !new File( basedir, 'target/classes/javac.sh').exists()
 assert !new File( basedir, 'target/classes/javac.bat').exists()
diff --git a/src/it/default-fork/src/main/java/MyClass.java b/src/it/default-fork/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/default-fork/src/main/java/MyClass.java
+++ b/src/it/default-fork/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class MyClass
 {
diff --git a/src/it/default-fork/src/test/java/MyTest.java b/src/it/default-fork/src/test/java/MyTest.java
index 46ba41d..33d4178 100644
--- a/src/it/default-fork/src/test/java/MyTest.java
+++ b/src/it/default-fork/src/test/java/MyTest.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/it/default-fork/verify.groovy b/src/it/default-fork/verify.groovy
index ba3bd7a..6fb1fa1 100644
--- a/src/it/default-fork/verify.groovy
+++ b/src/it/default-fork/verify.groovy
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-assert new File( basedir, 'target/classes/MyClass.class').exists()
+assert new File( basedir, 'target/classes/foo/MyClass.class').exists()
 
-assert new File( basedir, 'target/test-classes/MyTest.class').exists()
+assert new File( basedir, 'target/test-classes/foo/MyTest.class').exists()
 
 assert !new File( basedir, 'target/classes/javac.sh').exists()
 assert !new File( basedir, 'target/classes/javac.bat').exists()
diff --git a/src/it/default-incremental-disable/src/main/java/MyClass.java b/src/it/default-incremental-disable/src/main/java/foo/MyClass.java
similarity index 98%
rename from src/it/default-incremental-disable/src/main/java/MyClass.java
rename to src/it/default-incremental-disable/src/main/java/foo/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/default-incremental-disable/src/main/java/MyClass.java
+++ b/src/it/default-incremental-disable/src/main/java/foo/MyClass.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class MyClass
 {
diff --git a/src/it/default-incremental-disable/src/test/java/MyTest.java b/src/it/default-incremental-disable/src/test/java/foo/MyTest.java
similarity index 98%
rename from src/it/default-incremental-disable/src/test/java/MyTest.java
rename to src/it/default-incremental-disable/src/test/java/foo/MyTest.java
index 46ba41d..33d4178 100644
--- a/src/it/default-incremental-disable/src/test/java/MyTest.java
+++ b/src/it/default-incremental-disable/src/test/java/foo/MyTest.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/it/default-incremental-disable/verify.groovy b/src/it/default-incremental-disable/verify.groovy
index 2f72f1c..2f9fe2c 100644
--- a/src/it/default-incremental-disable/verify.groovy
+++ b/src/it/default-incremental-disable/verify.groovy
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-assert new File( basedir, "target/classes/MyClass.class" ).exists();
-assert new File( basedir, "target/test-classes/MyTest.class" ).exists();
+assert new File( basedir, "target/classes/foo/MyClass.class" ).exists();
+assert new File( basedir, "target/test-classes/foo/MyTest.class" ).exists();
 
 content = new File( basedir, 'build.log' ).text;
 
diff --git a/src/it/default/src/main/java/MyClass.java b/src/it/default/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/default/src/main/java/MyClass.java
+++ b/src/it/default/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class MyClass
 {
diff --git a/src/it/default/src/test/java/MyTest.java b/src/it/default/src/test/java/MyTest.java
index 46ba41d..33d4178 100644
--- a/src/it/default/src/test/java/MyTest.java
+++ b/src/it/default/src/test/java/MyTest.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/it/default/verify.bsh b/src/it/default/verify.bsh
index 12bb543..402fb94 100644
--- a/src/it/default/verify.bsh
+++ b/src/it/default/verify.bsh
@@ -23,14 +23,14 @@ import java.util.regex.*;
 
 try
 {
-    File mainClass = new File( basedir, "target/classes/MyClass.class" );
+    File mainClass = new File( basedir, "target/classes/foo/MyClass.class" );
     if ( !mainClass.isFile() )
     {
         System.out.println( "Main class not existent: " + mainClass );
         return false;
     }
 
-    File testClass = new File( basedir, "target/test-classes/MyTest.class" );
+    File testClass = new File( basedir, "target/test-classes/foo/MyTest.class" );
     if ( !testClass.isFile() )
     {
         System.out.println( "Test class not existent: " + testClass );
diff --git a/src/it/mcompiler-106/src/main/java/MyClass.java b/src/it/mcompiler-106/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/mcompiler-106/src/main/java/MyClass.java
+++ b/src/it/mcompiler-106/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class MyClass
 {
diff --git a/src/it/mcompiler-135/src/main/java/MyClass.java b/src/it/mcompiler-135/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/mcompiler-135/src/main/java/MyClass.java
+++ b/src/it/mcompiler-135/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class MyClass
 {
diff --git a/src/it/mcompiler-182/src/main/java/BeanA.java b/src/it/mcompiler-182/src/main/java/BeanA.java
index 4d31495..aa6a35e 100644
--- a/src/it/mcompiler-182/src/main/java/BeanA.java
+++ b/src/it/mcompiler-182/src/main/java/BeanA.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 /**
  * dumb test bean
diff --git a/src/it/mcompiler-182/src/main/java/BeanA2.java b/src/it/mcompiler-182/src/main/java/BeanA2.java
index e572562..4273136 100644
--- a/src/it/mcompiler-182/src/main/java/BeanA2.java
+++ b/src/it/mcompiler-182/src/main/java/BeanA2.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 /**
  * dumb test bean
diff --git a/src/it/mcompiler-182/verify.groovy b/src/it/mcompiler-182/verify.groovy
index 316aeaf..fdff21e 100644
--- a/src/it/mcompiler-182/verify.groovy
+++ b/src/it/mcompiler-182/verify.groovy
@@ -23,4 +23,4 @@ content = logFile.text
 
 assert content.contains( 'COMPILATION ERROR :' )
 
-assert !new File( basedir, 'target/classes/BeanA.class' ).exists();
+assert !new File( basedir, 'target/classes/foo/BeanA.class' ).exists();
diff --git a/src/it/mcompiler-21_class-remove/src/main/java/BeanA.java b/src/it/mcompiler-21_class-remove/src/main/java/BeanA.java
index 4d31495..aa6a35e 100644
--- a/src/it/mcompiler-21_class-remove/src/main/java/BeanA.java
+++ b/src/it/mcompiler-21_class-remove/src/main/java/BeanA.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 /**
  * dumb test bean
diff --git a/src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java b/src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java
index e572562..4273136 100644
--- a/src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java
+++ b/src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 /**
  * dumb test bean
diff --git a/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java b/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java
index 4d31495..aa6a35e 100644
--- a/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java
+++ b/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 /**
  * dumb test bean
diff --git a/src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java b/src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java
index e572562..4273136 100644
--- a/src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java
+++ b/src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 /**
  * dumb test bean
diff --git a/src/it/non-english-warnings/src/main/java/MyClass.java b/src/it/non-english-warnings/src/main/java/MyClass.java
index 22efe45..62c02ee 100644
--- a/src/it/non-english-warnings/src/main/java/MyClass.java
+++ b/src/it/non-english-warnings/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class MyClass
 {
diff --git a/src/it/non-english-warnings/src/test/java/MyTest.java b/src/it/non-english-warnings/src/test/java/MyTest.java
index 1de5f62..a51de2b 100644
--- a/src/it/non-english-warnings/src/test/java/MyTest.java
+++ b/src/it/non-english-warnings/src/test/java/MyTest.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class MyTest
 {
diff --git a/src/it/non-english-warnings/verify.bsh b/src/it/non-english-warnings/verify.bsh
index 8b1bc6e..919db9d 100644
--- a/src/it/non-english-warnings/verify.bsh
+++ b/src/it/non-english-warnings/verify.bsh
@@ -21,13 +21,13 @@ import java.io.*;
 import java.util.*;
 import java.util.regex.*;
 
-File mainClass = new File( basedir, "target/classes/MyClass.class" );
+File mainClass = new File( basedir, "target/classes/foo/MyClass.class" );
 if ( !mainClass.isFile() )
 {
     throw new FileNotFoundException( "Main class not existent: " + mainClass );
 }
 
-File testClass = new File( basedir, "target/test-classes/MyTest.class" );
+File testClass = new File( basedir, "target/test-classes/foo/MyTest.class" );
 if ( !testClass.isFile() )
 {
     throw new FileNotFoundException( "Test class not existent: " + testClass );
diff --git a/src/it/test1/src/main/java/MyClass.java b/src/it/test1/src/main/java/MyClass.java
index 4945381..90a9370 100644
--- a/src/it/test1/src/main/java/MyClass.java
+++ b/src/it/test1/src/main/java/MyClass.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class MyClass
 {
diff --git a/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java b/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
index 6c12627..ae3e670 100644
--- a/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
+++ b/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
@@ -67,7 +67,7 @@ public class CompilerMojoTestCase
         
         compileMojo.execute();
 
-        File testClass = new File( compileMojo.getOutputDirectory(), "TestCompile0.class" );
+        File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile0.class" );
 
         assertTrue( testClass.exists() );
 
@@ -80,7 +80,7 @@ public class CompilerMojoTestCase
         assertNotNull( "MCOMPILER-94: artifact file should only be null if there is nothing to compile",
                        projectArtifact.getFile() );
 
-        testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile0Test.class" );
+        testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile0Test.class" );
         
         verify( log ).warn( startsWith( "No explicit value set for target or release!" ) );
 
@@ -150,13 +150,13 @@ public class CompilerMojoTestCase
 
         compileMojo.execute();
 
-        File testClass = new File( compileMojo.getOutputDirectory(), "TestCompile2.class" );
+        File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile2.class" );
         assertFalse( testClass.exists() );
 
-        testClass = new File( compileMojo.getOutputDirectory(), "TestCompile3.class" );
+        testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile3.class" );
         assertFalse( testClass.exists() );
 
-        testClass = new File( compileMojo.getOutputDirectory(), "TestCompile4.class" );
+        testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile4.class" );
         assertTrue( testClass.exists() );
 
         TestCompilerMojo testCompileMojo = getTestCompilerMojo( compileMojo,
@@ -167,13 +167,13 @@ public class CompilerMojoTestCase
 
         testCompileMojo.execute();
 
-        testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile2TestCase.class" );
+        testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile2TestCase.class" );
         assertFalse( testClass.exists() );
 
-        testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile3TestCase.class" );
+        testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile3TestCase.class" );
         assertFalse( testClass.exists() );
 
-        testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile4TestCase.class" );
+        testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile4TestCase.class" );
         assertTrue( testClass.exists() );
     }
 
@@ -192,7 +192,7 @@ public class CompilerMojoTestCase
 
         compileMojo.execute();
 
-        File testClass = new File( compileMojo.getOutputDirectory(), "TestCompile1.class" );
+        File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestCompile1.class" );
         assertTrue( testClass.exists() );
 
         TestCompilerMojo testCompileMojo =
@@ -203,7 +203,7 @@ public class CompilerMojoTestCase
 
         testCompileMojo.execute();
 
-        testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile1TestCase.class" );
+        testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestCompile1TestCase.class" );
         assertTrue( testClass.exists() );
     }
 
@@ -345,13 +345,13 @@ public class CompilerMojoTestCase
         CompilerMojo compileMojo = getCompilerMojo( "target/test-classes/unit/compiler-skip-main/plugin-config.xml" );
         setVariableValueToObject( compileMojo, "skipMain", true );
         compileMojo.execute();
-        File testClass = new File( compileMojo.getOutputDirectory(), "TestSkipMainCompile0.class" );
+        File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestSkipMainCompile0.class" );
         assertFalse( testClass.exists() );
 
         TestCompilerMojo testCompileMojo =
             getTestCompilerMojo( compileMojo, "target/test-classes/unit/compiler-skip-main/plugin-config.xml" );
         testCompileMojo.execute();
-        testClass = new File( testCompileMojo.getOutputDirectory(), "TestSkipMainCompile0Test.class" );
+        testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestSkipMainCompile0Test.class" );
         assertTrue( testClass.exists() );
     }
     
@@ -365,14 +365,14 @@ public class CompilerMojoTestCase
     {
         CompilerMojo compileMojo = getCompilerMojo( "target/test-classes/unit/compiler-skip-test/plugin-config.xml" );
         compileMojo.execute();
-        File testClass = new File( compileMojo.getOutputDirectory(), "TestSkipTestCompile0.class" );
+        File testClass = new File( compileMojo.getOutputDirectory(), "foo/TestSkipTestCompile0.class" );
         assertTrue( testClass.exists() );
 
         TestCompilerMojo testCompileMojo =
             getTestCompilerMojo( compileMojo, "target/test-classes/unit/compiler-skip-test/plugin-config.xml" );
         setVariableValueToObject( testCompileMojo, "skip", true );
         testCompileMojo.execute();
-        testClass = new File( testCompileMojo.getOutputDirectory(), "TestSkipTestCompile0Test.class" );
+        testClass = new File( testCompileMojo.getOutputDirectory(), "foo/TestSkipTestCompile0Test.class" );
         assertFalse( testClass.exists() );
     }
 
diff --git a/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java b/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java
index 44c0359..959bdc7 100644
--- a/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java
+++ b/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile0
 {
diff --git a/src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java b/src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java
index 5df6d4f..e4a02f7 100644
--- a/src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java
+++ b/src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-basic-sourcetarget/src/main/java/TestCompile0.java b/src/test/resources/unit/compiler-basic-sourcetarget/src/main/java/TestCompile0.java
index 44c0359..959bdc7 100644
--- a/src/test/resources/unit/compiler-basic-sourcetarget/src/main/java/TestCompile0.java
+++ b/src/test/resources/unit/compiler-basic-sourcetarget/src/main/java/TestCompile0.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile0
 {
diff --git a/src/test/resources/unit/compiler-basic-test/src/main/java/TestCompile0.java b/src/test/resources/unit/compiler-basic-test/src/main/java/TestCompile0.java
index 44c0359..959bdc7 100644
--- a/src/test/resources/unit/compiler-basic-test/src/main/java/TestCompile0.java
+++ b/src/test/resources/unit/compiler-basic-test/src/main/java/TestCompile0.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile0
 {
diff --git a/src/test/resources/unit/compiler-basic-test/src/test/java/TestCompile0Test.java b/src/test/resources/unit/compiler-basic-test/src/test/java/TestCompile0Test.java
index 5df6d4f..e4a02f7 100644
--- a/src/test/resources/unit/compiler-basic-test/src/test/java/TestCompile0Test.java
+++ b/src/test/resources/unit/compiler-basic-test/src/test/java/TestCompile0Test.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java b/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java
index 44c0359..959bdc7 100644
--- a/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java
+++ b/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile0
 {
diff --git a/src/test/resources/unit/compiler-fail-test/src/test/java/TestCompile0Test.java b/src/test/resources/unit/compiler-fail-test/src/test/java/TestCompile0Test.java
index 5df6d4f..e4a02f7 100644
--- a/src/test/resources/unit/compiler-fail-test/src/test/java/TestCompile0Test.java
+++ b/src/test/resources/unit/compiler-fail-test/src/test/java/TestCompile0Test.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-failonerror-test/src/main/java/TestCompile0.java b/src/test/resources/unit/compiler-failonerror-test/src/main/java/TestCompile0.java
index 44c0359..959bdc7 100644
--- a/src/test/resources/unit/compiler-failonerror-test/src/main/java/TestCompile0.java
+++ b/src/test/resources/unit/compiler-failonerror-test/src/main/java/TestCompile0.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile0
 {
diff --git a/src/test/resources/unit/compiler-failonerror-test/src/test/java/TestCompile0Test.java b/src/test/resources/unit/compiler-failonerror-test/src/test/java/TestCompile0Test.java
index 5df6d4f..e4a02f7 100644
--- a/src/test/resources/unit/compiler-failonerror-test/src/test/java/TestCompile0Test.java
+++ b/src/test/resources/unit/compiler-failonerror-test/src/test/java/TestCompile0Test.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-fork-test/src/main/java/TestCompile1.java b/src/test/resources/unit/compiler-fork-test/src/main/java/TestCompile1.java
index 4e4ded8..c694c3f 100644
--- a/src/test/resources/unit/compiler-fork-test/src/main/java/TestCompile1.java
+++ b/src/test/resources/unit/compiler-fork-test/src/main/java/TestCompile1.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile1
 {
diff --git a/src/test/resources/unit/compiler-fork-test/src/test/java/TestCompile1TestCase.java b/src/test/resources/unit/compiler-fork-test/src/test/java/TestCompile1TestCase.java
index ede2355..cf276f9 100644
--- a/src/test/resources/unit/compiler-fork-test/src/test/java/TestCompile1TestCase.java
+++ b/src/test/resources/unit/compiler-fork-test/src/test/java/TestCompile1TestCase.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile2.java b/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile2.java
index 18053c3..ff8fa23 100644
--- a/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile2.java
+++ b/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile2.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile2
 {
diff --git a/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile3.java b/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile3.java
index 5091952..e618ca9 100644
--- a/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile3.java
+++ b/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile3.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile3
 {
diff --git a/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile4.java b/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile4.java
index d066004..779c8d0 100644
--- a/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile4.java
+++ b/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile4.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile4
 {
diff --git a/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile2TestCase.java b/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile2TestCase.java
index 14392e3..b052039 100644
--- a/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile2TestCase.java
+++ b/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile2TestCase.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile3TestCase.java b/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile3TestCase.java
index fc81992..9f77f43 100644
--- a/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile3TestCase.java
+++ b/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile3TestCase.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile4TestCase.java b/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile4TestCase.java
index e42e21b..2210fc1 100644
--- a/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile4TestCase.java
+++ b/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile4TestCase.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java b/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java
index 18053c3..ff8fa23 100644
--- a/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java
+++ b/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile2
 {
diff --git a/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java b/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java
index 5091952..e618ca9 100644
--- a/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java
+++ b/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile3
 {
diff --git a/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java b/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java
index d066004..779c8d0 100644
--- a/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java
+++ b/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile4
 {
diff --git a/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile2TestCase.java b/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile2TestCase.java
index 14392e3..b052039 100644
--- a/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile2TestCase.java
+++ b/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile2TestCase.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile3TestCase.java b/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile3TestCase.java
index fc81992..9f77f43 100644
--- a/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile3TestCase.java
+++ b/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile3TestCase.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile4TestCase.java b/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile4TestCase.java
index e42e21b..2210fc1 100644
--- a/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile4TestCase.java
+++ b/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile4TestCase.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java
index 18053c3..e187e0c 100644
--- a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java
+++ b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile2
 {
@@ -25,5 +26,4 @@ public class TestCompile2
 
         System.out.println( "Woo Hoo!" );
     }
-
 }
\ No newline at end of file
diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java
index 5091952..e618ca9 100644
--- a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java
+++ b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile3
 {
diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java
index d066004..779c8d0 100644
--- a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java
+++ b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestCompile4
 {
diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java
index 14392e3..b052039 100644
--- a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java
+++ b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java
index fc81992..9f77f43 100644
--- a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java
+++ b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java
index e42e21b..2210fc1 100644
--- a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java
+++ b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-skip-main/src/main/java/TestSkipMainCompile0.java b/src/test/resources/unit/compiler-skip-main/src/main/java/TestSkipMainCompile0.java
index f1788b4..a7805d7 100644
--- a/src/test/resources/unit/compiler-skip-main/src/main/java/TestSkipMainCompile0.java
+++ b/src/test/resources/unit/compiler-skip-main/src/main/java/TestSkipMainCompile0.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestSkipMainCompile0
 {
diff --git a/src/test/resources/unit/compiler-skip-main/src/test/java/TestSkipMainCompile0Test.java b/src/test/resources/unit/compiler-skip-main/src/test/java/TestSkipMainCompile0Test.java
index 3058998..d3d66b4 100644
--- a/src/test/resources/unit/compiler-skip-main/src/test/java/TestSkipMainCompile0Test.java
+++ b/src/test/resources/unit/compiler-skip-main/src/test/java/TestSkipMainCompile0Test.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/resources/unit/compiler-skip-test/src/main/java/TestSkipTestCompile0.java b/src/test/resources/unit/compiler-skip-test/src/main/java/TestSkipTestCompile0.java
index 95bcc5a..08911a9 100644
--- a/src/test/resources/unit/compiler-skip-test/src/main/java/TestSkipTestCompile0.java
+++ b/src/test/resources/unit/compiler-skip-test/src/main/java/TestSkipTestCompile0.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 public class TestSkipTestCompile0
 {
diff --git a/src/test/resources/unit/compiler-skip-test/src/test/java/TestSkipTestCompile0Test.java b/src/test/resources/unit/compiler-skip-test/src/test/java/TestSkipTestCompile0Test.java
index aa5e09d..0c64e55 100644
--- a/src/test/resources/unit/compiler-skip-test/src/test/java/TestSkipTestCompile0Test.java
+++ b/src/test/resources/unit/compiler-skip-test/src/test/java/TestSkipTestCompile0Test.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import junit.framework.TestCase;
 


[maven-compiler-plugin] 03/03: [MCOMPILER-526] Reformat

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git

commit f7a4613eaa2364dcaf10f96f04a6b1afb2feb7ed
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Feb 10 10:13:04 2023 +0100

    [MCOMPILER-526] Reformat
    
    # Conflicts:
    #       src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
---
 pom.xml                                            |   50 +-
 src/it/MCOMPILER-129/src/main/java/MyClass.java    |   44 +-
 .../src/main/java/org/issue/SimpleAnnotation.java  |    7 +-
 .../java/org/issue/SimpleAnnotationProcessor.java  |   46 +-
 .../src/main/java/org/issue/SimpleObject.java      |    8 +-
 .../src/test/java/org/issue/SimpleTestObject.java  |    8 +-
 .../org/apache/maven/plugins/compiler/it/App.java  |   36 +-
 .../org/apache/maven/plugins/compiler/it/App2.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App3.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App4.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App5.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App6.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App7.java |   36 +-
 .../apache/maven/plugins/compiler/it/AppTest.java  |   27 +-
 .../org/apache/maven/plugins/compiler/it/App.java  |   36 +-
 .../org/apache/maven/plugins/compiler/it/App2.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App3.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App4.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App5.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App6.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App7.java |   36 +-
 .../apache/maven/plugins/compiler/it/AppTest.java  |   27 +-
 .../org/apache/maven/plugins/compiler/it/App.java  |   36 +-
 .../org/apache/maven/plugins/compiler/it/App2.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App3.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App4.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App5.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App6.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App7.java |   36 +-
 .../apache/maven/plugins/compiler/it/AppTest.java  |   27 +-
 .../org/apache/maven/plugins/compiler/it/App.java  |   36 +-
 .../org/apache/maven/plugins/compiler/it/App2.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App3.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App4.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App5.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App6.java |   36 +-
 .../org/apache/maven/plugins/compiler/it/App7.java |   36 +-
 .../apache/maven/plugins/compiler/it/AppTest.java  |   27 +-
 .../main/java/org/example/pce/sample/Dummy.java    |   14 +-
 .../src/main/java/dummy/HelloWorld.java            |   53 +-
 src/it/MCOMPILER-192/verify.groovy                 |    1 -
 .../src/main/java/org/issue/Person.java            |    4 +-
 .../java/org/issue/SimpleAnnotationProcessor.java  |  226 ++-
 .../src/main/java/org/issue/SimpleAnnotation.java  |   59 +-
 .../src/main/java/org/issue/SimpleObject.java      |   48 +-
 .../src/test/java/org/issue/SimpleTestObject.java  |   48 +-
 .../src/main/java/dummy/HelloWorld.java            |   53 +-
 .../src/main/java/dummy/package-info.java          |    2 +-
 src/it/MCOMPILER-205/verify.groovy                 |    1 -
 .../src/main/java/org/issue/MCompiler224.java      |   13 +-
 .../org/issue/MCompiler224AnnotationProcessor.java |   39 +-
 .../src/main/java/org/issue/user/User.java         |   13 +-
 .../src/main/java/example/FinalExample.java        |   89 +-
 .../src/main/java/com/foo/MyClass.java             |   46 +-
 .../src/main/java/com/foo/MyClass.java             |   46 +-
 .../src/main/java/module-info.java                 |   44 +-
 .../src/test/java/com/foo/MyTest.java              |   53 +-
 .../src/main/java/MyClass.java                     |   44 +-
 .../src/test/java/MyTest.java                      |   49 +-
 .../src/main/java/processor1/Processor1.java       |   17 +-
 .../src/main/java/processor2/dep/Foo.java          |    9 +-
 .../src/main/java/processor2/Processor2.java       |   17 +-
 .../project/src/main/java/project/Project.java     |   14 +-
 .../src/main/java/com/foo/MyClass.java             |   46 +-
 .../src/main/java/module-info.java                 |   43 +-
 .../src/test/java/com/foo/MyTest.java              |   53 +-
 .../src/main/java/com/foo/MyClass.java             |   12 +-
 .../src/test/java/com/foo/MyTest.java              |   11 +-
 .../app/src/main/java/module-info.java             |   44 +-
 .../app/src/main/java/org/maven/test/app/Main.java |   63 +-
 .../lib/src/main/java/module-info.java             |   44 +-
 .../lib/src/main/java/org/maven/test/lib/Sout.java |   64 +-
 .../src/main/java/com/foo/ParameterClass.java      |   10 +-
 .../src/test/java/com/foo/ParameterTest.java       |   20 +-
 .../src/main/java/module-info.java                 |    8 +-
 .../src/test/java/test/MyTest.java                 |   11 +-
 .../src/main/java/MyClass.java                     |    9 +-
 .../a/src/main/java/module-info.java               |    4 +-
 .../b/src/main/java/module-info.java               |    3 +-
 .../b/src/main/java/test/Foo.java                  |    6 +-
 .../b/src/main/java/test/package-info.java         |    5 +-
 .../acceptance/server/PooledJenkinsController.java |   41 +-
 .../dependent-module/src/main/java/Main.java       |    8 +-
 .../service/src/main/java/TestService.java         |   10 +-
 .../MCOMPILER-349_dependencyChanged/verify.groovy  |    1 -
 .../main360/src/main/java/module-info.java         |    7 +-
 .../MCOMPILER-366/src/main/java/module-info.java   |   10 +-
 .../src/main/java/org/maven/test/Main.java         |   13 +-
 .../src/main/java/org/maven/bug/A.java             |   13 +-
 .../src/main/java/org/maven/bug/B.java             |   13 +-
 .../src/main/java11/org/maven/bug/B.java           |   13 +-
 .../src/main/java9/org/maven/bug/A9.java           |   13 +-
 .../src/main/java9/org/maven/bug/B.java            |   13 +-
 .../module2/src/main/java/com/natros/mcp/Foo.java  |    7 +-
 .../dependent-module/src/main/java/Main.java       |    6 +-
 .../service/src/main/java/TestService.java         |    8 +-
 .../verify.groovy                                  |    1 -
 .../app/src/main/java/org/test/app/Main.java       |    7 +-
 .../app/src/test/java/org/test/app/MainTest.java   |    9 +-
 .../main/java/org/test/service/JSONService.java    |    6 +-
 .../src/main/java/org/test/service/Service.java    |    7 +-
 .../src/main/java/dummy/HelloWorld.java            |   13 +-
 .../src/main/java/dummy/package-info.java          |    2 +-
 src/it/MCOMPILER-485/verify.groovy                 |    1 -
 .../src/main/java/dummy/package-info.java          |    2 +-
 src/it/MCOMPILER-495/verify.groovy                 |    1 -
 .../src/main/java/dummy/Person.java                |    4 +-
 .../src/main/java/dummy/foo/Person.java            |    4 +-
 .../src/main/java/dummy/package-info.java          |    2 +-
 .../MCOMPILER-500-package-info-incr/verify.groovy  |    1 -
 .../AnnotationProcessorDependencyV1.java           |    6 +-
 .../AnnotationProcessorDependencyV2.java           |    6 +-
 .../mcompiler503/SimpleAnnotationProcessor.java    |   83 +-
 .../main/java/mcompiler503/SimpleAnnotation.java   |    6 +-
 .../src/main/java/mcompiler503/SimpleObject.java   |    6 +-
 .../test/java/mcompiler503/SimpleTestObject.java   |    6 +-
 src/it/MCOMPILER-512/src/main/java/dummy/Main.java |   12 +-
 src/it/MCOMPILER-512/src/test/java/dummy/Test.java |   11 +-
 .../SimpleAnnotation.java                          |    8 +-
 .../SimpleObject.java                              |    8 +-
 .../src/main/java/module-info.java                 |   43 +-
 .../src/main/java/org/maven/test/Main.java         |   63 +-
 .../src/main/java/module-info.java                 |   47 +-
 .../src/main/java/org/maven/test/Main.java         |   63 +-
 .../src/main/java/module-info.java                 |   43 +-
 .../src/main/java/org/maven/test/Main.java         |   53 +-
 .../src/main/java/module-info.java                 |   47 +-
 .../src/main/java/org/maven/test/Main.java         |   63 +-
 .../src/main/java/MyClass.java                     |    9 +-
 .../default-fork-windows/src/test/java/MyTest.java |   10 +-
 src/it/default-fork/src/main/java/MyClass.java     |    9 +-
 src/it/default-fork/src/test/java/MyTest.java      |   10 +-
 .../src/main/java/foo/MyClass.java                 |    9 +-
 .../src/test/java/foo/MyTest.java                  |   10 +-
 src/it/default/src/main/java/MyClass.java          |    9 +-
 src/it/default/src/test/java/MyTest.java           |   10 +-
 .../verify.groovy                                  |    1 -
 .../main/java/org/apache/maven/it0055/Person.java  |   21 +-
 .../java/org/apache/maven/it0055/PersonTwo.java    |   21 +-
 .../java/org/apache/maven/it0055/PersonTest.java   |   23 +-
 .../org/apache/maven/it0055/PersonTwoTest.java     |   23 +-
 .../java/com/mycompany/jdk16annotation/App.java    |   16 +-
 .../mycompany/jdk16annotation/ServiceProvider.java |   12 +-
 .../jdk16annotation/ServiceProviderProcessor.java  |   40 +-
 .../com/mycompany/jdk16annotation/AppTest.java     |   29 +-
 .../bar/src/main/java/module-info.java             |   44 +-
 .../jdk9-exportsto/foo/src/main/java/foo/Foo.java  |   43 +-
 .../foo/src/main/java/module-info.java             |   45 +-
 .../src/main/java/module-info.java                 |   41 +-
 .../src/main/java/org/maven/test/Main.java         |   69 +-
 .../src/test/java/bar/BarTests.java                |   11 +-
 .../src/test/java/module-info.java                 |    3 +-
 .../src/main/java/foo/Foo.java                     |    9 +-
 .../src/main/java/module-info.java                 |    4 +-
 .../src/test/java/bar/BarTests.java                |   15 +-
 .../src/test/java/module-info.java                 |    3 +-
 .../src/main/java/foo/Foo.java                     |    9 +-
 .../src/main/java/module-info.java                 |    3 +-
 .../src/test/java/foo/FooTests.java                |   15 +-
 .../src/test/java/module-info.java                 |    3 +-
 .../src/main/java/module-info.java                 |   41 +-
 .../src/main/java/org/maven/test/Main.java         |   69 +-
 .../src/test/java/org/maven/test/MainTest.java     |   59 +-
 src/it/mcompiler-106/src/main/java/MyClass.java    |    9 +-
 .../src/main/java/org/maven/test/Main.java         |    9 +-
 src/it/mcompiler-120/verify.groovy                 |    1 -
 src/it/mcompiler-135/src/main/java/MyClass.java    |    9 +-
 .../src/main/java/org/maven/test/MyClass.java      |    8 +-
 src/it/mcompiler-182/src/main/java/BeanA.java      |    6 +-
 src/it/mcompiler-182/src/main/java/BeanA2.java     |    4 +-
 src/it/mcompiler-182/verify.groovy                 |    1 -
 .../src/main/java/BeanA.java                       |    6 +-
 .../src/main/java/BeanA2.java                      |    4 +-
 src/it/mcompiler-21_class-remove/verify.groovy     |    1 -
 .../src/main/java/BeanA.java                       |    6 +-
 .../src/main/java/BeanA2.java                      |    4 +-
 .../mcompiler-21_methodname-change/verify.groovy   |    1 -
 .../multirelease-base/src/main/java/base/Base.java |    3 +-
 .../multirelease-base/src/main/java/mr/A.java      |    8 +-
 .../multirelease-base/src/main/java/mr/I.java      |    8 +-
 .../multirelease-base/src/test/java/mr/ATest.java  |   44 +-
 .../multirelease-nine/src/main/java/mr/A.java      |   14 +-
 .../multirelease-nine/src/test/java/mr/ATest.java  |   46 +-
 .../multirelease-base/src/main/java/base/Base.java |    3 +-
 .../multirelease-base/src/main/java/mr/A.java      |    8 +-
 .../multirelease-base/src/main/java/mr/I.java      |    8 +-
 .../multirelease-base/src/test/java/mr/ATest.java  |   44 +-
 .../multirelease-nine/src/main/java/mr/A.java      |   14 +-
 .../multirelease-nine/src/test/java/mr/ATest.java  |   46 +-
 .../src/main/java-mr/9/module-info.java            |    7 +-
 .../packaging-plugin/src/main/java-mr/9/mr/A.java  |   14 +-
 .../packaging-plugin/src/main/java/base/Base.java  |    3 +-
 .../packaging-plugin/src/main/java/mr/A.java       |    8 +-
 .../packaging-plugin/src/main/java/mr/I.java       |    8 +-
 .../packaging-plugin/src/test/java/mr/ATest.java   |   40 +-
 .../src/main/java/base/Base.java                   |    3 +-
 .../singleproject-runtime/src/main/java/mr/A.java  |    8 +-
 .../singleproject-runtime/src/main/java/mr/I.java  |    8 +-
 .../src/main/java9/module-info.java                |    7 +-
 .../singleproject-runtime/src/main/java9/mr/A.java |   14 +-
 .../src/test/java/mr/ATest.java                    |   40 +-
 .../src/main/java/base/Base.java                   |    3 +-
 .../src/main/java/mr/A.java                        |    8 +-
 .../src/main/java/mr/I.java                        |    8 +-
 .../src/main/java9/module-info.java                |    7 +-
 .../src/main/java9/mr/A.java                       |   14 +-
 .../src/test/java/mr/ATest.java                    |   40 +-
 .../src/main/java/MyClass.java                     |   13 +-
 .../non-english-warnings/src/test/java/MyTest.java |   13 +-
 src/it/non-english-warnings/verify.bsh             |    1 +
 .../SourcePathReadGoal.java                        |   78 +-
 .../src/main/java/com/ta3/MyClass.java             |   46 +-
 .../src/main/java/com/ta2/MyClass.java             |   46 +-
 .../src/main/java/module-info.java                 |   46 +-
 .../src/main/java/com/ta2/MyClass.java             |   46 +-
 .../src/main/java/com/ta2/plus/MyClass.java        |   46 +-
 .../src/main/java/module-info.java                 |   46 +-
 src/it/test1/src/main/java/MyClass.java            |    9 +-
 .../plugin/compiler/AbstractCompilerMojo.java      | 1459 ++++++++------------
 .../compiler/CompilationFailureException.java      |   38 +-
 .../apache/maven/plugin/compiler/CompilerMojo.java |  340 ++---
 .../plugin/compiler/DependencyCoordinate.java      |  328 ++---
 .../maven/plugin/compiler/TestCompilerMojo.java    |  344 ++---
 .../plugin/compiler/CompilerMojoTestCase.java      |  468 +++----
 .../plugin/compiler/stubs/CompilerManagerStub.java |   20 +-
 .../maven/plugin/compiler/stubs/CompilerStub.java  |   69 +-
 .../plugin/compiler/stubs/DebugEnabledLog.java     |   13 +-
 .../src/main/java/TestCompile0.java                |   11 +-
 .../src/test/java/TestCompile0Test.java            |    9 +-
 .../src/main/java/TestCompile0.java                |   11 +-
 .../src/main/java/TestCompile0.java                |   11 +-
 .../src/test/java/TestCompile0Test.java            |    9 +-
 .../src/main/java/TestCompile0.java                |   11 +-
 .../src/test/java/TestCompile0Test.java            |    9 +-
 .../src/main/java/TestCompile0.java                |   11 +-
 .../src/test/java/TestCompile0Test.java            |    9 +-
 .../src/main/java/TestCompile1.java                |   11 +-
 .../src/test/java/TestCompile1TestCase.java        |    9 +-
 .../src/main/java/TestCompile2.java                |   11 +-
 .../src/main/java/TestCompile3.java                |   11 +-
 .../src/main/java/TestCompile4.java                |   11 +-
 .../src/test/java/TestCompile2TestCase.java        |    9 +-
 .../src/test/java/TestCompile3TestCase.java        |    9 +-
 .../src/test/java/TestCompile4TestCase.java        |    9 +-
 .../src/main/java/TestCompile2.java                |   11 +-
 .../src/main/java/TestCompile3.java                |   11 +-
 .../src/main/java/TestCompile4.java                |   11 +-
 .../src/test/java/TestCompile2TestCase.java        |    9 +-
 .../src/test/java/TestCompile3TestCase.java        |    9 +-
 .../src/test/java/TestCompile4TestCase.java        |    9 +-
 .../src/main/java/TestCompile2.java                |   10 +-
 .../src/main/java/TestCompile3.java                |   11 +-
 .../src/main/java/TestCompile4.java                |   11 +-
 .../src/test/java/TestCompile2TestCase.java        |    9 +-
 .../src/test/java/TestCompile3TestCase.java        |    9 +-
 .../src/test/java/TestCompile4TestCase.java        |    9 +-
 .../src/main/java/TestSkipMainCompile0.java        |   11 +-
 .../src/test/java/TestSkipMainCompile0Test.java    |   11 +-
 .../src/main/java/TestSkipTestCompile0.java        |   11 +-
 .../src/test/java/TestSkipTestCompile0Test.java    |    9 +-
 260 files changed, 3660 insertions(+), 4991 deletions(-)

diff --git a/pom.xml b/pom.xml
index a20f8b9..774e606 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -37,6 +35,12 @@ under the License.
   <description>The Compiler Plugin is used to compile the sources of your project.</description>
   <inceptionYear>2001</inceptionYear>
 
+  <contributors>
+    <contributor>
+      <name>Jan Sievers</name>
+    </contributor>
+  </contributors>
+
   <prerequisites>
     <maven>${mavenVersion}</maven>
   </prerequisites>
@@ -44,8 +48,8 @@ under the License.
   <scm>
     <connection>scm:git:https://github.com/apache/maven-compiler-plugin.git</connection>
     <developerConnection>scm:git:https://github.com/apache/maven-compiler-plugin.git</developerConnection>
-    <url>https://github.com/apache/maven-compiler-plugin/tree/${project.scm.tag}</url>
     <tag>maven-compiler-plugin-3.10.0</tag>
+    <url>https://github.com/apache/maven-compiler-plugin/tree/${project.scm.tag}</url>
   </scm>
   <issueManagement>
     <system>JIRA</system>
@@ -80,25 +84,6 @@ under the License.
     <invoker.junitPackageName>org.apache.maven.plugins.compiler.its</invoker.junitPackageName>
   </properties>
 
-  <contributors>
-    <contributor>
-      <name>Jan Sievers</name>
-    </contributor>
-  </contributors>
-
-  <repositories>
-    <repository>
-      <id>plexus.snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/plexus-snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -145,16 +130,16 @@ under the License.
       <version>1.1</version>
       <exclusions>
         <exclusion>
-          <artifactId>maven-core</artifactId>
           <groupId>org.apache.maven</groupId>
+          <artifactId>maven-core</artifactId>
         </exclusion>
         <exclusion>
-          <artifactId>maven-plugin-api</artifactId>
           <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-api</artifactId>
         </exclusion>
         <exclusion>
-          <artifactId>maven-shared-utils</artifactId>
           <groupId>org.apache.maven.shared</groupId>
+          <artifactId>maven-shared-utils</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -209,6 +194,19 @@ under the License.
     </dependency>
   </dependencies>
 
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>plexus.snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/plexus-snapshots</url>
+    </repository>
+  </repositories>
+
   <build>
     <plugins>
       <plugin>
diff --git a/src/it/MCOMPILER-129/src/main/java/MyClass.java b/src/it/MCOMPILER-129/src/main/java/MyClass.java
index 80144b0..d4132bb 100644
--- a/src/it/MCOMPILER-129/src/main/java/MyClass.java
+++ b/src/it/MCOMPILER-129/src/main/java/MyClass.java
@@ -1,23 +1,21 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class MyClass
-{
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package foo;
+
+public class MyClass {}
diff --git a/src/it/MCOMPILER-157/annotation-processor/src/main/java/org/issue/SimpleAnnotation.java b/src/it/MCOMPILER-157/annotation-processor/src/main/java/org/issue/SimpleAnnotation.java
index ccae163..5339365 100644
--- a/src/it/MCOMPILER-157/annotation-processor/src/main/java/org/issue/SimpleAnnotation.java
+++ b/src/it/MCOMPILER-157/annotation-processor/src/main/java/org/issue/SimpleAnnotation.java
@@ -1,5 +1,3 @@
-package org.issue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.issue;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.issue;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -26,6 +25,4 @@ import java.lang.annotation.Target;
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.SOURCE)
-public @interface SimpleAnnotation {
-
-}
+public @interface SimpleAnnotation {}
diff --git a/src/it/MCOMPILER-157/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java b/src/it/MCOMPILER-157/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
index 30823a1..b95f3e2 100644
--- a/src/it/MCOMPILER-157/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
+++ b/src/it/MCOMPILER-157/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
@@ -1,5 +1,3 @@
-package org.issue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,10 +16,7 @@ package org.issue;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Set;
+package org.issue;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Filer;
@@ -37,44 +32,39 @@ import javax.lang.model.util.Elements;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 
-@SupportedSourceVersion( SourceVersion.RELEASE_6 )
-@SupportedAnnotationTypes( "org.issue.SimpleAnnotation" )
-public class SimpleAnnotationProcessor
-    extends AbstractProcessor
-{
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Set;
+
+@SupportedSourceVersion(SourceVersion.RELEASE_6)
+@SupportedAnnotationTypes("org.issue.SimpleAnnotation")
+public class SimpleAnnotationProcessor extends AbstractProcessor {
 
     @Override
-    public boolean process( Set<? extends TypeElement> annotations, RoundEnvironment roundEnv )
-    {
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         Filer filer = processingEnv.getFiler();
 
         Elements elementUtils = processingEnv.getElementUtils();
 
-        Set<? extends Element> elements = roundEnv.getElementsAnnotatedWith( SimpleAnnotation.class );
+        Set<? extends Element> elements = roundEnv.getElementsAnnotatedWith(SimpleAnnotation.class);
 
-        for ( Element element : elements )
-        {
+        for (Element element : elements) {
             Name name = element.getSimpleName();
 
-            PackageElement packageElement = elementUtils.getPackageOf( element );
+            PackageElement packageElement = elementUtils.getPackageOf(element);
 
-            try
-            {
-                FileObject resource =
-                    filer.createResource( StandardLocation.SOURCE_OUTPUT, packageElement.getQualifiedName(), name
-                        + ".txt", element );
+            try {
+                FileObject resource = filer.createResource(
+                        StandardLocation.SOURCE_OUTPUT, packageElement.getQualifiedName(), name + ".txt", element);
 
                 Writer writer = resource.openWriter();
-                writer.write( name.toString() );
+                writer.write(name.toString());
                 writer.close();
-            }
-            catch ( IOException e )
-            {
-                throw new RuntimeException( e );
+            } catch (IOException e) {
+                throw new RuntimeException(e);
             }
         }
 
         return !elements.isEmpty();
     }
-
 }
diff --git a/src/it/MCOMPILER-157/annotation-user/src/main/java/org/issue/SimpleObject.java b/src/it/MCOMPILER-157/annotation-user/src/main/java/org/issue/SimpleObject.java
index 56524fb..18b8fc4 100644
--- a/src/it/MCOMPILER-157/annotation-user/src/main/java/org/issue/SimpleObject.java
+++ b/src/it/MCOMPILER-157/annotation-user/src/main/java/org/issue/SimpleObject.java
@@ -1,5 +1,3 @@
-package org.issue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,7 @@ package org.issue;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.issue;
 
 @SimpleAnnotation
-public class SimpleObject
-{
-
-}
+public class SimpleObject {}
diff --git a/src/it/MCOMPILER-157/annotation-user/src/test/java/org/issue/SimpleTestObject.java b/src/it/MCOMPILER-157/annotation-user/src/test/java/org/issue/SimpleTestObject.java
index 9024f6a..706dccf 100644
--- a/src/it/MCOMPILER-157/annotation-user/src/test/java/org/issue/SimpleTestObject.java
+++ b/src/it/MCOMPILER-157/annotation-user/src/test/java/org/issue/SimpleTestObject.java
@@ -1,5 +1,3 @@
-package org.issue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,7 @@ package org.issue;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.issue;
 
 @SimpleAnnotation
-public class SimpleTestObject
-{
-
-}
+public class SimpleTestObject {}
diff --git a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App.java b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App.java
index bcbf5dd..3fa54ed 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,35 +16,29 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  */
-public class App
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App2.java b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App2.java
index 6a22d39..9a6511f 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App2.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App2.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App2
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App2 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App3.java b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App3.java
index d970eec..eb55f16 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App3.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App3.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App3
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App3 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App4.java b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App4.java
index 1cce4d8..1156f54 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App4.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App4.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App4
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App4 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App5.java b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App5.java
index beab680..dd3c028 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App5.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App5.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App5
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App5 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App6.java b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App6.java
index c748ea2..ca09789 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App6.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App6.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App6
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App6 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App7.java b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App7.java
index 0b09cdf..e0f50da 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App7.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App7.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App7
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App7 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-1/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java b/src/it/MCOMPILER-170/mcompiler-170-1/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java
index 464f9af..af3a454 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-1/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-1/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +16,7 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -27,32 +25,27 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
-    extends TestCase
-{
+public class AppTest extends TestCase {
     /**
      * Create the test case
      *
      * @param testName name of the test case
      */
-    public AppTest( String testName )
-    {
-        super( testName );
+    public AppTest(String testName) {
+        super(testName);
     }
 
     /**
      * @return the suite of tests being tested
      */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
+    public static Test suite() {
+        return new TestSuite(AppTest.class);
     }
 
     /**
      * Rigourous Test :-)
      */
-    public void testApp()
-    {
-        assertTrue( true );
+    public void testApp() {
+        assertTrue(true);
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App.java b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App.java
index bcbf5dd..3fa54ed 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,35 +16,29 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  */
-public class App
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App2.java b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App2.java
index 6a22d39..9a6511f 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App2.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App2.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App2
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App2 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App3.java b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App3.java
index d970eec..eb55f16 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App3.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App3.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App3
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App3 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App4.java b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App4.java
index 1cce4d8..1156f54 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App4.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App4.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App4
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App4 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App5.java b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App5.java
index beab680..dd3c028 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App5.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App5.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App5
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App5 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App6.java b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App6.java
index c748ea2..ca09789 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App6.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App6.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App6
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App6 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App7.java b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App7.java
index 0b09cdf..e0f50da 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App7.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App7.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App7
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App7 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-2/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java b/src/it/MCOMPILER-170/mcompiler-170-2/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java
index 464f9af..af3a454 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-2/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-2/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +16,7 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -27,32 +25,27 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
-    extends TestCase
-{
+public class AppTest extends TestCase {
     /**
      * Create the test case
      *
      * @param testName name of the test case
      */
-    public AppTest( String testName )
-    {
-        super( testName );
+    public AppTest(String testName) {
+        super(testName);
     }
 
     /**
      * @return the suite of tests being tested
      */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
+    public static Test suite() {
+        return new TestSuite(AppTest.class);
     }
 
     /**
      * Rigourous Test :-)
      */
-    public void testApp()
-    {
-        assertTrue( true );
+    public void testApp() {
+        assertTrue(true);
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App.java b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App.java
index bcbf5dd..3fa54ed 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,35 +16,29 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  */
-public class App
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App2.java b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App2.java
index 6a22d39..9a6511f 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App2.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App2.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App2
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App2 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App3.java b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App3.java
index d970eec..eb55f16 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App3.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App3.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App3
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App3 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App4.java b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App4.java
index 1cce4d8..1156f54 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App4.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App4.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App4
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App4 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App5.java b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App5.java
index beab680..dd3c028 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App5.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App5.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App5
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App5 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App6.java b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App6.java
index c748ea2..ca09789 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App6.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App6.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App6
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App6 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App7.java b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App7.java
index 0b09cdf..e0f50da 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App7.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App7.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App7
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App7 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-3/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java b/src/it/MCOMPILER-170/mcompiler-170-3/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java
index 464f9af..af3a454 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-3/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-3/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +16,7 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -27,32 +25,27 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
-    extends TestCase
-{
+public class AppTest extends TestCase {
     /**
      * Create the test case
      *
      * @param testName name of the test case
      */
-    public AppTest( String testName )
-    {
-        super( testName );
+    public AppTest(String testName) {
+        super(testName);
     }
 
     /**
      * @return the suite of tests being tested
      */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
+    public static Test suite() {
+        return new TestSuite(AppTest.class);
     }
 
     /**
      * Rigourous Test :-)
      */
-    public void testApp()
-    {
-        assertTrue( true );
+    public void testApp() {
+        assertTrue(true);
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App.java b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App.java
index bcbf5dd..3fa54ed 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,35 +16,29 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  */
-public class App
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App2.java b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App2.java
index 6a22d39..9a6511f 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App2.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App2.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App2
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App2 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App3.java b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App3.java
index d970eec..eb55f16 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App3.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App3.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App3
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App3 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App4.java b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App4.java
index 1cce4d8..1156f54 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App4.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App4.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App4
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App4 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App5.java b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App5.java
index beab680..dd3c028 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App5.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App5.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App5
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App5 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App6.java b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App6.java
index c748ea2..ca09789 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App6.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App6.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App6
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App6 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App7.java b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App7.java
index 0b09cdf..e0f50da 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App7.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App7.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,36 +16,30 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 /**
  * Hello world!
  *
  */
-public class App7
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App7 {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public static void mainFoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public static void mainFoo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void bar( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void bar(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void foo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void foo(String[] args) {
+        System.out.println("Hello World!");
     }
 
-    public void barfoo( String[] args )
-    {
-        System.out.println( "Hello World!" );
+    public void barfoo(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/MCOMPILER-170/mcompiler-170-4/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java b/src/it/MCOMPILER-170/mcompiler-170-4/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java
index 464f9af..af3a454 100644
--- a/src/it/MCOMPILER-170/mcompiler-170-4/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java
+++ b/src/it/MCOMPILER-170/mcompiler-170-4/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.plugins.compiler.it;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +16,7 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.plugins.compiler.it;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -27,32 +25,27 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
-    extends TestCase
-{
+public class AppTest extends TestCase {
     /**
      * Create the test case
      *
      * @param testName name of the test case
      */
-    public AppTest( String testName )
-    {
-        super( testName );
+    public AppTest(String testName) {
+        super(testName);
     }
 
     /**
      * @return the suite of tests being tested
      */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
+    public static Test suite() {
+        return new TestSuite(AppTest.class);
     }
 
     /**
      * Rigourous Test :-)
      */
-    public void testApp()
-    {
-        assertTrue( true );
+    public void testApp() {
+        assertTrue(true);
     }
 }
diff --git a/src/it/MCOMPILER-190/src/main/java/org/example/pce/sample/Dummy.java b/src/it/MCOMPILER-190/src/main/java/org/example/pce/sample/Dummy.java
index 96a49ff..0022539 100644
--- a/src/it/MCOMPILER-190/src/main/java/org/example/pce/sample/Dummy.java
+++ b/src/it/MCOMPILER-190/src/main/java/org/example/pce/sample/Dummy.java
@@ -1,5 +1,3 @@
-package org.example.pce.sample;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.example.pce.sample;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,10 +16,10 @@ package org.example.pce.sample;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.example.pce.sample;
 
 public class Dummy {
-	public static void main(final String[] args) {
-		String dummy = new Integer(1);
-	}
+    public static void main(final String[] args) {
+        String dummy = new Integer(1);
+    }
 }
diff --git a/src/it/MCOMPILER-192/src/main/java/dummy/HelloWorld.java b/src/it/MCOMPILER-192/src/main/java/dummy/HelloWorld.java
index f223c74..7ceb91c 100644
--- a/src/it/MCOMPILER-192/src/main/java/dummy/HelloWorld.java
+++ b/src/it/MCOMPILER-192/src/main/java/dummy/HelloWorld.java
@@ -1,28 +1,25 @@
-package dummy;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-public class HelloWorld
-{
-   public static void main(String[] argv) {
-      System.out.println("Hello World");
-   }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package dummy;
+
+public class HelloWorld {
+    public static void main(String[] argv) {
+        System.out.println("Hello World");
+    }
+}
diff --git a/src/it/MCOMPILER-192/verify.groovy b/src/it/MCOMPILER-192/verify.groovy
index 4e6e3b0..a23fe87 100644
--- a/src/it/MCOMPILER-192/verify.groovy
+++ b/src/it/MCOMPILER-192/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/MCOMPILER-197/src/main/java/org/issue/Person.java b/src/it/MCOMPILER-197/src/main/java/org/issue/Person.java
index 701035c..d80a49b 100644
--- a/src/it/MCOMPILER-197/src/main/java/org/issue/Person.java
+++ b/src/it/MCOMPILER-197/src/main/java/org/issue/Person.java
@@ -1,5 +1,3 @@
-package org.issue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.issue;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.issue;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -28,6 +27,7 @@ public class Person {
     @Id
     @GeneratedValue
     private long id;
+
     private String name;
 
     public long getId() {
diff --git a/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java b/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
index a3dcbf9..b2dfd6c 100644
--- a/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
+++ b/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java
@@ -1,121 +1,105 @@
-package org.issue;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Set;
-
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.Filer;
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.Name;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.util.Elements;
-import javax.tools.FileObject;
-import javax.tools.JavaFileObject;
-import javax.tools.StandardLocation;
-
-@SupportedSourceVersion( SourceVersion.RELEASE_6 )
-@SupportedAnnotationTypes( "org.issue.SimpleAnnotation" )
-public class SimpleAnnotationProcessor
-    extends AbstractProcessor
-{
-
-    @Override
-    public boolean process( Set<? extends TypeElement> annotations, RoundEnvironment roundEnv )
-    {
-        if ( annotations.isEmpty() )
-        {
-            return true;
-        }
-
-        // assert that commons-lang3 is on the classpath
-        try
-        {
-            getClass().getClassLoader().loadClass( "org.apache.commons.lang3.StringUtils" );
-        }
-        catch ( ClassNotFoundException expected )
-        {
-            throw new RuntimeException( "Expected org.apache.commons.lang3.StringUtils to be on the processorpath,"
-                + "because it is a declared dependency of the annotation processor." );
-        }
-
-        // assert that commons-io is NOT on the classpath, as it is only a project dependency in "annotation-user"
-        try
-        {
-            getClass().getClassLoader().loadClass( "org.apache.commons.io.IOUtils" );
-            throw new RuntimeException( "Expected a ClassNotFoundException because "
-                + "org.apache.commons.io.IOUtils is not supposed to be on the processorpath." );
-        }
-        catch ( ClassNotFoundException expected )
-        {
-            // expected.
-        }
-
-        Filer filer = processingEnv.getFiler();
-
-        Elements elementUtils = processingEnv.getElementUtils();
-
-        Set<? extends Element> elements = roundEnv.getElementsAnnotatedWith( annotations.iterator().next() );
-
-        for ( Element element : elements )
-        {
-            Name name = element.getSimpleName();
-
-            PackageElement packageElement = elementUtils.getPackageOf( element );
-
-            try
-            {
-                Name packageName = packageElement.getQualifiedName();
-                FileObject resource =
-                    filer.createResource( StandardLocation.SOURCE_OUTPUT, packageName, name
-                        + ".txt", element );
-
-                Writer writer = resource.openWriter();
-                writer.write( name.toString() );
-                writer.close();
-
-                String className = name + "Companion";
-                JavaFileObject javaFile = filer.createSourceFile( packageName + "." + className, element );
-
-                Writer javaWriter = javaFile.openWriter();
-                javaWriter.append( "package " ).append( packageName ).append( ";\n\n" );
-                javaWriter.append( "public class " ).append( className ).append( " {\n" );
-                javaWriter.append( "    public " ).append( className ).append( "() {\n" );
-                javaWriter.append( "        System.out.println(\"Hey there!\");\n" );
-                javaWriter.append( "    }\n}\n" );
-                javaWriter.close();
-            }
-            catch ( IOException e )
-            {
-                throw new RuntimeException( e );
-            }
-        }
-
-        return !elements.isEmpty();
-    }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.issue;
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.Filer;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Name;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.Elements;
+import javax.tools.FileObject;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardLocation;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Set;
+
+@SupportedSourceVersion(SourceVersion.RELEASE_6)
+@SupportedAnnotationTypes("org.issue.SimpleAnnotation")
+public class SimpleAnnotationProcessor extends AbstractProcessor {
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        if (annotations.isEmpty()) {
+            return true;
+        }
+
+        // assert that commons-lang3 is on the classpath
+        try {
+            getClass().getClassLoader().loadClass("org.apache.commons.lang3.StringUtils");
+        } catch (ClassNotFoundException expected) {
+            throw new RuntimeException("Expected org.apache.commons.lang3.StringUtils to be on the processorpath,"
+                    + "because it is a declared dependency of the annotation processor.");
+        }
+
+        // assert that commons-io is NOT on the classpath, as it is only a project dependency in "annotation-user"
+        try {
+            getClass().getClassLoader().loadClass("org.apache.commons.io.IOUtils");
+            throw new RuntimeException("Expected a ClassNotFoundException because "
+                    + "org.apache.commons.io.IOUtils is not supposed to be on the processorpath.");
+        } catch (ClassNotFoundException expected) {
+            // expected.
+        }
+
+        Filer filer = processingEnv.getFiler();
+
+        Elements elementUtils = processingEnv.getElementUtils();
+
+        Set<? extends Element> elements =
+                roundEnv.getElementsAnnotatedWith(annotations.iterator().next());
+
+        for (Element element : elements) {
+            Name name = element.getSimpleName();
+
+            PackageElement packageElement = elementUtils.getPackageOf(element);
+
+            try {
+                Name packageName = packageElement.getQualifiedName();
+                FileObject resource =
+                        filer.createResource(StandardLocation.SOURCE_OUTPUT, packageName, name + ".txt", element);
+
+                Writer writer = resource.openWriter();
+                writer.write(name.toString());
+                writer.close();
+
+                String className = name + "Companion";
+                JavaFileObject javaFile = filer.createSourceFile(packageName + "." + className, element);
+
+                Writer javaWriter = javaFile.openWriter();
+                javaWriter.append("package ").append(packageName).append(";\n\n");
+                javaWriter.append("public class ").append(className).append(" {\n");
+                javaWriter.append("    public ").append(className).append("() {\n");
+                javaWriter.append("        System.out.println(\"Hey there!\");\n");
+                javaWriter.append("    }\n}\n");
+                javaWriter.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return !elements.isEmpty();
+    }
+}
diff --git a/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/SimpleAnnotation.java b/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/SimpleAnnotation.java
index b867beb..5339365 100644
--- a/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/SimpleAnnotation.java
+++ b/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/SimpleAnnotation.java
@@ -1,31 +1,28 @@
-package org.issue;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface SimpleAnnotation {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.issue;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.SOURCE)
+public @interface SimpleAnnotation {}
diff --git a/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/SimpleObject.java b/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/SimpleObject.java
index 5b7a43f..18b8fc4 100644
--- a/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/SimpleObject.java
+++ b/src/it/MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/SimpleObject.java
@@ -1,26 +1,22 @@
-package org.issue;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-@SimpleAnnotation
-public class SimpleObject
-{
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.issue;
+
+@SimpleAnnotation
+public class SimpleObject {}
diff --git a/src/it/MCOMPILER-203-processorpath/annotation-user/src/test/java/org/issue/SimpleTestObject.java b/src/it/MCOMPILER-203-processorpath/annotation-user/src/test/java/org/issue/SimpleTestObject.java
index 48aed12..706dccf 100644
--- a/src/it/MCOMPILER-203-processorpath/annotation-user/src/test/java/org/issue/SimpleTestObject.java
+++ b/src/it/MCOMPILER-203-processorpath/annotation-user/src/test/java/org/issue/SimpleTestObject.java
@@ -1,26 +1,22 @@
-package org.issue;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-@SimpleAnnotation
-public class SimpleTestObject
-{
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.issue;
+
+@SimpleAnnotation
+public class SimpleTestObject {}
diff --git a/src/it/MCOMPILER-205/src/main/java/dummy/HelloWorld.java b/src/it/MCOMPILER-205/src/main/java/dummy/HelloWorld.java
index f223c74..7ceb91c 100644
--- a/src/it/MCOMPILER-205/src/main/java/dummy/HelloWorld.java
+++ b/src/it/MCOMPILER-205/src/main/java/dummy/HelloWorld.java
@@ -1,28 +1,25 @@
-package dummy;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-public class HelloWorld
-{
-   public static void main(String[] argv) {
-      System.out.println("Hello World");
-   }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package dummy;
+
+public class HelloWorld {
+    public static void main(String[] argv) {
+        System.out.println("Hello World");
+    }
+}
diff --git a/src/it/MCOMPILER-205/src/main/java/dummy/package-info.java b/src/it/MCOMPILER-205/src/main/java/dummy/package-info.java
index ed72542..9d2deff 100644
--- a/src/it/MCOMPILER-205/src/main/java/dummy/package-info.java
+++ b/src/it/MCOMPILER-205/src/main/java/dummy/package-info.java
@@ -20,4 +20,4 @@
 /**
  * This is the package javadoc
  */
-package dummy;
\ No newline at end of file
+package dummy;
diff --git a/src/it/MCOMPILER-205/verify.groovy b/src/it/MCOMPILER-205/verify.groovy
index 1526f86..1041376 100644
--- a/src/it/MCOMPILER-205/verify.groovy
+++ b/src/it/MCOMPILER-205/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224.java b/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224.java
index c47ffa0..045a64b 100644
--- a/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224.java
+++ b/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224.java
@@ -1,5 +1,3 @@
-package org.issue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.issue;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,9 +16,6 @@ package org.issue;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.issue;
 
-
-public @interface MCompiler224
-{
-
-}
+public @interface MCompiler224 {}
diff --git a/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224AnnotationProcessor.java b/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224AnnotationProcessor.java
index 2e92f08..c7ded6b 100644
--- a/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224AnnotationProcessor.java
+++ b/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224AnnotationProcessor.java
@@ -1,5 +1,3 @@
-package org.issue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.issue;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,9 +16,7 @@ package org.issue;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-
-import java.util.Set;
+package org.issue;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Messager;
@@ -31,38 +27,31 @@ import javax.lang.model.SourceVersion;
 import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic.Kind;
 
+import java.util.Set;
+
 /* @formatter:off */
-@SupportedAnnotationTypes( { 
-    "org.issue.MCompiler224"
-} )
+@SupportedAnnotationTypes({"org.issue.MCompiler224"})
 /* @formatter:on */
-@SupportedSourceVersion( SourceVersion.RELEASE_6 )
-public class MCompiler224AnnotationProcessor
-    extends AbstractProcessor
-{
+@SupportedSourceVersion(SourceVersion.RELEASE_6)
+public class MCompiler224AnnotationProcessor extends AbstractProcessor {
 
     @Override
-    public boolean process( final Set<? extends TypeElement> elts, final RoundEnvironment env )
-    {
-        if ( elts.isEmpty() )
-        {
+    public boolean process(final Set<? extends TypeElement> elts, final RoundEnvironment env) {
+        if (elts.isEmpty()) {
             return true;
         }
 
         final Messager messager = this.processingEnv.getMessager();
 
-        for ( final Kind kind : Kind.values() )
-        {
-            if ( Kind.ERROR == kind )
-            {
+        for (final Kind kind : Kind.values()) {
+            if (Kind.ERROR == kind) {
                 continue;
             }
 
-            System.out.println( "Testing message for: " + kind );
-            messager.printMessage( kind, kind + " Test message." );
+            System.out.println("Testing message for: " + kind);
+            messager.printMessage(kind, kind + " Test message.");
         }
 
         return true;
     }
-
 }
diff --git a/src/it/MCOMPILER-224/annotation-user/src/main/java/org/issue/user/User.java b/src/it/MCOMPILER-224/annotation-user/src/main/java/org/issue/user/User.java
index 38b2ebd..660beaf 100644
--- a/src/it/MCOMPILER-224/annotation-user/src/main/java/org/issue/user/User.java
+++ b/src/it/MCOMPILER-224/annotation-user/src/main/java/org/issue/user/User.java
@@ -1,5 +1,3 @@
-package org.issue.user;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.issue.user;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,12 +16,9 @@ package org.issue.user;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.issue.user;
 
 import org.issue.MCompiler224;
 
 @MCompiler224
-public class User
-{
-
-}
+public class User {}
diff --git a/src/it/MCOMPILER-228/src/main/java/example/FinalExample.java b/src/it/MCOMPILER-228/src/main/java/example/FinalExample.java
index bb57777..dd510e8 100644
--- a/src/it/MCOMPILER-228/src/main/java/example/FinalExample.java
+++ b/src/it/MCOMPILER-228/src/main/java/example/FinalExample.java
@@ -1,49 +1,40 @@
-package example;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.Comparator;
-
-public class FinalExample 
-{
-    public static final Comparator<String> comparator = ( o1, o2 ) -> 
-    {
-        final String desc1 = o1;
-        final String desc2 = o2;
-        final int compareTo;
-        if ( desc1 == null ) 
-        {
-            compareTo = -1;
-        }
-        else if ( desc2 == null )
-        {
-            compareTo = 1;
-        }
-        else
-        {
-            compareTo = desc1.compareTo( desc2 );
-        }
-        if ( compareTo == 0 )
-        {
-            return 3;
-        }
-        return compareTo;
-    };
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package example;
+
+import java.util.Comparator;
+
+public class FinalExample {
+    public static final Comparator<String> comparator = (o1, o2) -> {
+        final String desc1 = o1;
+        final String desc2 = o2;
+        final int compareTo;
+        if (desc1 == null) {
+            compareTo = -1;
+        } else if (desc2 == null) {
+            compareTo = 1;
+        } else {
+            compareTo = desc1.compareTo(desc2);
+        }
+        if (compareTo == 0) {
+            return 3;
+        }
+        return compareTo;
+    };
+}
diff --git a/src/it/MCOMPILER-260_customArguments/src/main/java/com/foo/MyClass.java b/src/it/MCOMPILER-260_customArguments/src/main/java/com/foo/MyClass.java
index dae085a..f646e4a 100644
--- a/src/it/MCOMPILER-260_customArguments/src/main/java/com/foo/MyClass.java
+++ b/src/it/MCOMPILER-260_customArguments/src/main/java/com/foo/MyClass.java
@@ -1,25 +1,21 @@
-package com.foo;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class MyClass
-{
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.foo;
+
+public class MyClass {}
diff --git a/src/it/MCOMPILER-268_modulepath/src/main/java/com/foo/MyClass.java b/src/it/MCOMPILER-268_modulepath/src/main/java/com/foo/MyClass.java
index dae085a..f646e4a 100644
--- a/src/it/MCOMPILER-268_modulepath/src/main/java/com/foo/MyClass.java
+++ b/src/it/MCOMPILER-268_modulepath/src/main/java/com/foo/MyClass.java
@@ -1,25 +1,21 @@
-package com.foo;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class MyClass
-{
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.foo;
+
+public class MyClass {}
diff --git a/src/it/MCOMPILER-268_modulepath/src/main/java/module-info.java b/src/it/MCOMPILER-268_modulepath/src/main/java/module-info.java
index d9800e3..029b6e7 100644
--- a/src/it/MCOMPILER-268_modulepath/src/main/java/module-info.java
+++ b/src/it/MCOMPILER-268_modulepath/src/main/java/module-info.java
@@ -1,22 +1,22 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module M.N {
-    requires org.apache.commons.lang3;
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module M.N {
+    requires org.apache.commons.lang3;
+}
diff --git a/src/it/MCOMPILER-268_modulepath/src/test/java/com/foo/MyTest.java b/src/it/MCOMPILER-268_modulepath/src/test/java/com/foo/MyTest.java
index efb936e..072b808 100644
--- a/src/it/MCOMPILER-268_modulepath/src/test/java/com/foo/MyTest.java
+++ b/src/it/MCOMPILER-268_modulepath/src/test/java/com/foo/MyTest.java
@@ -1,28 +1,25 @@
-package com.foo;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-
-public class MyTest
-    extends TestCase
-{
-    private MyClass myClass = new MyClass();
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.foo;
+
+import junit.framework.TestCase;
+
+public class MyTest extends TestCase {
+    private MyClass myClass = new MyClass();
+}
diff --git a/src/it/MCOMPILER-270_release/src/main/java/MyClass.java b/src/it/MCOMPILER-270_release/src/main/java/MyClass.java
index 4f94734..d4132bb 100644
--- a/src/it/MCOMPILER-270_release/src/main/java/MyClass.java
+++ b/src/it/MCOMPILER-270_release/src/main/java/MyClass.java
@@ -1,23 +1,21 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class MyClass
-{
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package foo;
+
+public class MyClass {}
diff --git a/src/it/MCOMPILER-270_release/src/test/java/MyTest.java b/src/it/MCOMPILER-270_release/src/test/java/MyTest.java
index d80ce85..77db4f1 100644
--- a/src/it/MCOMPILER-270_release/src/test/java/MyTest.java
+++ b/src/it/MCOMPILER-270_release/src/test/java/MyTest.java
@@ -1,26 +1,23 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-
-public class MyTest
-    extends TestCase
-{
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package foo;
+
+import junit.framework.TestCase;
+
+public class MyTest extends TestCase {}
diff --git a/src/it/MCOMPILER-272/processor1/src/main/java/processor1/Processor1.java b/src/it/MCOMPILER-272/processor1/src/main/java/processor1/Processor1.java
index 319d274..d163849 100644
--- a/src/it/MCOMPILER-272/processor1/src/main/java/processor1/Processor1.java
+++ b/src/it/MCOMPILER-272/processor1/src/main/java/processor1/Processor1.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,21 +18,18 @@
  */
 package processor1;
 
-import java.util.Set;
-
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.lang.model.element.TypeElement;
 
+import java.util.Set;
+
 @SupportedAnnotationTypes({"java.lang.SuppressWarnings"})
-public class Processor1
-    extends AbstractProcessor
-{
+public class Processor1 extends AbstractProcessor {
     @Override
-    public boolean process ( Set<? extends TypeElement> annotations, RoundEnvironment roundEnv )
-    {
-        System.out.println( "Run processor1" );
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        System.out.println("Run processor1");
         return false;
     }
 }
diff --git a/src/it/MCOMPILER-272/processor2-dep/src/main/java/processor2/dep/Foo.java b/src/it/MCOMPILER-272/processor2-dep/src/main/java/processor2/dep/Foo.java
index bd1e92a..f9fa52a 100644
--- a/src/it/MCOMPILER-272/processor2-dep/src/main/java/processor2/dep/Foo.java
+++ b/src/it/MCOMPILER-272/processor2-dep/src/main/java/processor2/dep/Foo.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,4 @@
  */
 package processor2.dep;
 
-public class Foo
-{
-
-}
+public class Foo {}
diff --git a/src/it/MCOMPILER-272/processor2/src/main/java/processor2/Processor2.java b/src/it/MCOMPILER-272/processor2/src/main/java/processor2/Processor2.java
index b96a20f..c2adcb0 100644
--- a/src/it/MCOMPILER-272/processor2/src/main/java/processor2/Processor2.java
+++ b/src/it/MCOMPILER-272/processor2/src/main/java/processor2/Processor2.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,21 +18,18 @@
  */
 package processor2;
 
-import java.util.Set;
-
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.lang.model.element.TypeElement;
 
+import java.util.Set;
+
 @SupportedAnnotationTypes({"java.lang.SuppressWarnings"})
-public class Processor2
-    extends AbstractProcessor
-{
+public class Processor2 extends AbstractProcessor {
     @Override
-    public boolean process ( Set<? extends TypeElement> annotations, RoundEnvironment roundEnv )
-    {
-        System.out.println( "Run processor2" );
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        System.out.println("Run processor2");
         new processor2.dep.Foo();
         return false;
     }
diff --git a/src/it/MCOMPILER-272/project/src/main/java/project/Project.java b/src/it/MCOMPILER-272/project/src/main/java/project/Project.java
index 9f00a99..be9e170 100644
--- a/src/it/MCOMPILER-272/project/src/main/java/project/Project.java
+++ b/src/it/MCOMPILER-272/project/src/main/java/project/Project.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,11 +20,7 @@ package project;
 
 import java.util.List;
 
-public class Project
-{
-    @SuppressWarnings( "rawtypes" )
-    public void foo( List toto )
-    {
-
-    }
+public class Project {
+    @SuppressWarnings("rawtypes")
+    public void foo(List toto) {}
 }
diff --git a/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/com/foo/MyClass.java b/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/com/foo/MyClass.java
index dae085a..f646e4a 100644
--- a/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/com/foo/MyClass.java
+++ b/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/com/foo/MyClass.java
@@ -1,25 +1,21 @@
-package com.foo;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class MyClass
-{
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.foo;
+
+public class MyClass {}
diff --git a/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/module-info.java b/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/module-info.java
index c0e023a..e30faf1 100644
--- a/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/module-info.java
+++ b/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/module-info.java
@@ -1,22 +1,21 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module M.N {
-    
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.foo;
+
+module M.N {}
diff --git a/src/it/MCOMPILER-275_separate-moduleinfo/src/test/java/com/foo/MyTest.java b/src/it/MCOMPILER-275_separate-moduleinfo/src/test/java/com/foo/MyTest.java
index efb936e..072b808 100644
--- a/src/it/MCOMPILER-275_separate-moduleinfo/src/test/java/com/foo/MyTest.java
+++ b/src/it/MCOMPILER-275_separate-moduleinfo/src/test/java/com/foo/MyTest.java
@@ -1,28 +1,25 @@
-package com.foo;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-
-public class MyTest
-    extends TestCase
-{
-    private MyClass myClass = new MyClass();
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.foo;
+
+import junit.framework.TestCase;
+
+public class MyTest extends TestCase {
+    private MyClass myClass = new MyClass();
+}
diff --git a/src/it/MCOMPILER-284/src/main/java/com/foo/MyClass.java b/src/it/MCOMPILER-284/src/main/java/com/foo/MyClass.java
index 7370ac0..f646e4a 100644
--- a/src/it/MCOMPILER-284/src/main/java/com/foo/MyClass.java
+++ b/src/it/MCOMPILER-284/src/main/java/com/foo/MyClass.java
@@ -1,5 +1,3 @@
-package com.foo;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package com.foo;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,8 +16,6 @@ package com.foo;
  * specific language governing permissions and limitations
  * under the License.
  */
+package com.foo;
 
-public class MyClass
-{
-
-}
+public class MyClass {}
diff --git a/src/it/MCOMPILER-284/src/test/java/com/foo/MyTest.java b/src/it/MCOMPILER-284/src/test/java/com/foo/MyTest.java
index f152b90..072b808 100644
--- a/src/it/MCOMPILER-284/src/test/java/com/foo/MyTest.java
+++ b/src/it/MCOMPILER-284/src/test/java/com/foo/MyTest.java
@@ -1,5 +1,3 @@
-package com.foo;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package com.foo;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,11 +16,10 @@ package com.foo;
  * specific language governing permissions and limitations
  * under the License.
  */
+package com.foo;
 
 import junit.framework.TestCase;
 
-public class MyTest
-    extends TestCase
-{
+public class MyTest extends TestCase {
     private MyClass myClass = new MyClass();
 }
diff --git a/src/it/MCOMPILER-294/app/src/main/java/module-info.java b/src/it/MCOMPILER-294/app/src/main/java/module-info.java
index 3cda721..d90b8a1 100644
--- a/src/it/MCOMPILER-294/app/src/main/java/module-info.java
+++ b/src/it/MCOMPILER-294/app/src/main/java/module-info.java
@@ -1,22 +1,22 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module org.maven.test.app {
-    requires org.maven.test.lib;
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module org.maven.test.app {
+    requires org.maven.test.lib;
+}
diff --git a/src/it/MCOMPILER-294/app/src/main/java/org/maven/test/app/Main.java b/src/it/MCOMPILER-294/app/src/main/java/org/maven/test/app/Main.java
index 5d94eec..cdd399a 100644
--- a/src/it/MCOMPILER-294/app/src/main/java/org/maven/test/app/Main.java
+++ b/src/it/MCOMPILER-294/app/src/main/java/org/maven/test/app/Main.java
@@ -1,32 +1,31 @@
-package org.maven.test.app;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.maven.test.lib.Sout;
-
-public class Main {
-    
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-        Sout.println( args );
-    }
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.maven.test.app;
+
+import org.maven.test.lib.Sout;
+
+public class Main {
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        Sout.println(args);
+    }
+}
diff --git a/src/it/MCOMPILER-294/lib/src/main/java/module-info.java b/src/it/MCOMPILER-294/lib/src/main/java/module-info.java
index a218436..52414cf 100644
--- a/src/it/MCOMPILER-294/lib/src/main/java/module-info.java
+++ b/src/it/MCOMPILER-294/lib/src/main/java/module-info.java
@@ -1,22 +1,22 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module org.maven.test.lib {
-    exports org.maven.test.lib;
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module org.maven.test.lib {
+    exports org.maven.test.lib;
+}
diff --git a/src/it/MCOMPILER-294/lib/src/main/java/org/maven/test/lib/Sout.java b/src/it/MCOMPILER-294/lib/src/main/java/org/maven/test/lib/Sout.java
index 658044e..99c65f9 100644
--- a/src/it/MCOMPILER-294/lib/src/main/java/org/maven/test/lib/Sout.java
+++ b/src/it/MCOMPILER-294/lib/src/main/java/org/maven/test/lib/Sout.java
@@ -1,33 +1,31 @@
-package org.maven.test.lib;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class Sout {
-    
-    /**
-     * @param args
-     */
-    public static void println(String[] args) {
-        for ( String string : args )
-        {
-            System.out.println( args );
-        }
-    }
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.maven.test.lib;
+
+public class Sout {
+
+    /**
+     * @param args
+     */
+    public static void println(String[] args) {
+        for (String string : args) {
+            System.out.println(args);
+        }
+    }
+}
diff --git a/src/it/MCOMPILER-298/src/main/java/com/foo/ParameterClass.java b/src/it/MCOMPILER-298/src/main/java/com/foo/ParameterClass.java
index 439e1e1..44d7912 100644
--- a/src/it/MCOMPILER-298/src/main/java/com/foo/ParameterClass.java
+++ b/src/it/MCOMPILER-298/src/main/java/com/foo/ParameterClass.java
@@ -1,5 +1,3 @@
-package com.foo;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,12 +16,10 @@ package com.foo;
  * specific language governing permissions and limitations
  * under the License.
  */
+package com.foo;
 
-
-public class ParameterClass
-{
-    public void method( String parameterName )
-    {
+public class ParameterClass {
+    public void method(String parameterName) {
         // nothing
     }
 }
diff --git a/src/it/MCOMPILER-298/src/test/java/com/foo/ParameterTest.java b/src/it/MCOMPILER-298/src/test/java/com/foo/ParameterTest.java
index b552b77..42d771d 100644
--- a/src/it/MCOMPILER-298/src/test/java/com/foo/ParameterTest.java
+++ b/src/it/MCOMPILER-298/src/test/java/com/foo/ParameterTest.java
@@ -1,5 +1,3 @@
-package com.foo;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,19 +16,21 @@ package com.foo;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import static org.junit.Assert.*;
+package com.foo;
 
 import org.junit.Test;
 
+import static org.junit.Assert.*;
 
-
-public class ParameterTest
-{
+public class ParameterTest {
 
     @Test
-    public void testParameter() throws Exception
-    {
-        assertEquals( "parameterName", ParameterClass.class.getMethod( "method", String.class ).getParameters()[0].getName() );
+    public void testParameter() throws Exception {
+        assertEquals(
+                "parameterName",
+                ParameterClass.class
+                        .getMethod("method", String.class)
+                        .getParameters()[0]
+                        .getName());
     }
 }
diff --git a/src/it/MCOMPILER-321_pathexceptions/src/main/java/module-info.java b/src/it/MCOMPILER-321_pathexceptions/src/main/java/module-info.java
index 0f43b06..a57384d 100644
--- a/src/it/MCOMPILER-321_pathexceptions/src/main/java/module-info.java
+++ b/src/it/MCOMPILER-321_pathexceptions/src/main/java/module-info.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,6 +17,4 @@
  * under the License.
  */
 
-module M.N {
-    
-}
\ No newline at end of file
+module M.N {}
diff --git a/src/it/MCOMPILER-321_pathexceptions/src/test/java/test/MyTest.java b/src/it/MCOMPILER-321_pathexceptions/src/test/java/test/MyTest.java
index e2e0835..c42edd6 100644
--- a/src/it/MCOMPILER-321_pathexceptions/src/test/java/test/MyTest.java
+++ b/src/it/MCOMPILER-321_pathexceptions/src/test/java/test/MyTest.java
@@ -1,5 +1,3 @@
-package test;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package test;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +16,6 @@ package test;
  * specific language governing permissions and limitations
  * under the License.
  */
+package test;
 
-public class MyTest
-{
-}
\ No newline at end of file
+public class MyTest {}
diff --git a/src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java b/src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java
index 90a9370..d4132bb 100644
--- a/src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java
+++ b/src/it/MCOMPILER-328_multiReleaseOutput/src/main/java/MyClass.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,4 @@
  */
 package foo;
 
-public class MyClass
-{
-
-}
+public class MyClass {}
diff --git a/src/it/MCOMPILER-336_incremental-modulepath/a/src/main/java/module-info.java b/src/it/MCOMPILER-336_incremental-modulepath/a/src/main/java/module-info.java
index 234b5f9..aef91db 100644
--- a/src/it/MCOMPILER-336_incremental-modulepath/a/src/main/java/module-info.java
+++ b/src/it/MCOMPILER-336_incremental-modulepath/a/src/main/java/module-info.java
@@ -16,6 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-module test.a 
-{
-}
+module test.a {}
diff --git a/src/it/MCOMPILER-336_incremental-modulepath/b/src/main/java/module-info.java b/src/it/MCOMPILER-336_incremental-modulepath/b/src/main/java/module-info.java
index c9f16f1..f2213e3 100644
--- a/src/it/MCOMPILER-336_incremental-modulepath/b/src/main/java/module-info.java
+++ b/src/it/MCOMPILER-336_incremental-modulepath/b/src/main/java/module-info.java
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-module test.b 
-{
+module test.b {
     requires transitive test.a;
 }
diff --git a/src/it/MCOMPILER-336_incremental-modulepath/b/src/main/java/test/Foo.java b/src/it/MCOMPILER-336_incremental-modulepath/b/src/main/java/test/Foo.java
index c22b20a..0ec20eb 100644
--- a/src/it/MCOMPILER-336_incremental-modulepath/b/src/main/java/test/Foo.java
+++ b/src/it/MCOMPILER-336_incremental-modulepath/b/src/main/java/test/Foo.java
@@ -1,5 +1,3 @@
-package org.opengis.annotation;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,6 @@ package org.opengis.annotation;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.opengis.annotation;
 
-public class Foo {
-}
+public class Foo {}
diff --git a/src/it/MCOMPILER-336_incremental-modulepath/b/src/main/java/test/package-info.java b/src/it/MCOMPILER-336_incremental-modulepath/b/src/main/java/test/package-info.java
index 41a65d1..d4eae97 100644
--- a/src/it/MCOMPILER-336_incremental-modulepath/b/src/main/java/test/package-info.java
+++ b/src/it/MCOMPILER-336_incremental-modulepath/b/src/main/java/test/package-info.java
@@ -1,5 +1,3 @@
-package org.opengis.annotation;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,4 +15,5 @@ package org.opengis.annotation;
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- */
\ No newline at end of file
+ */
+package org.opengis.annotation;
diff --git a/src/it/MCOMPILER-346/src/main/java/org/jenkinsci/test/acceptance/server/PooledJenkinsController.java b/src/it/MCOMPILER-346/src/main/java/org/jenkinsci/test/acceptance/server/PooledJenkinsController.java
index f7fbf61..06706f9 100644
--- a/src/it/MCOMPILER-346/src/main/java/org/jenkinsci/test/acceptance/server/PooledJenkinsController.java
+++ b/src/it/MCOMPILER-346/src/main/java/org/jenkinsci/test/acceptance/server/PooledJenkinsController.java
@@ -1,5 +1,3 @@
-package org.jenkinsci.test.acceptance.server;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,8 +16,10 @@ package org.jenkinsci.test.acceptance.server;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.jenkinsci.test.acceptance.server;
 
 import javax.inject.Inject;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -27,23 +27,22 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.Executors;
 
-import org.jenkinsci.remoting.RoleChecker;
-import org.jenkinsci.test.acceptance.controller.IJenkinsController;
-import org.jenkinsci.test.acceptance.controller.JenkinsController;
-import org.jenkinsci.test.acceptance.controller.LocalController.LocalFactoryImpl;
-import org.jenkinsci.test.acceptance.log.LogListenable;
-import org.jenkinsci.test.acceptance.log.LogListener;
-import org.jenkinsci.test.acceptance.log.LogSplitter;
-
 import com.cloudbees.sdk.extensibility.Extension;
 import com.google.inject.Injector;
-
 import hudson.remoting.Callable;
 import hudson.remoting.Channel;
 import hudson.remoting.Channel.Mode;
 import hudson.remoting.ChannelBuilder;
 import jnr.unixsocket.UnixSocketAddress;
 import jnr.unixsocket.UnixSocketChannel;
+import org.jenkinsci.remoting.RoleChecker;
+import org.jenkinsci.test.acceptance.controller.IJenkinsController;
+import org.jenkinsci.test.acceptance.controller.JenkinsController;
+import org.jenkinsci.test.acceptance.controller.LocalController.LocalFactoryImpl;
+import org.jenkinsci.test.acceptance.log.LogListenable;
+import org.jenkinsci.test.acceptance.log.LogListener;
+import org.jenkinsci.test.acceptance.log.LogSplitter;
+
 import static java.lang.System.*;
 
 /**
@@ -76,7 +75,7 @@ public class PooledJenkinsController extends JenkinsController implements LogLis
     }
 
     private boolean connect() throws IOException {
-        if (conn != null)      return false;
+        if (conn != null) return false;
 
         System.out.println("Requesting jut instance using socket " + socket.getAbsolutePath());
         UnixSocketAddress address = new UnixSocketAddress(socket);
@@ -87,7 +86,7 @@ public class PooledJenkinsController extends JenkinsController implements LogLis
                 .build(ChannelStream.in(conn), ChannelStream.out(conn));
 
         try {
-            controller = (IJenkinsController)channel.waitForRemoteProperty("controller");
+            controller = (IJenkinsController) channel.waitForRemoteProperty("controller");
             controller.start();
             url = controller.getUrl();
 
@@ -96,7 +95,7 @@ public class PooledJenkinsController extends JenkinsController implements LogLis
             }
 
             final LogListener l = channel.export(LogListener.class, splitter);
-            channel.call(new InstallLogger(controller,l));
+            channel.call(new InstallLogger(controller, l));
 
             for (byte[] content : toUnpack) {
                 controller.populateJenkinsHome(content, false);
@@ -133,8 +132,7 @@ public class PooledJenkinsController extends JenkinsController implements LogLis
 
     @Override
     public URL getUrl() {
-        if (url==null)
-            throw new IllegalStateException("This controller has not been started");
+        if (url == null) throw new IllegalStateException("This controller has not been started");
         return url;
     }
 
@@ -146,8 +144,7 @@ public class PooledJenkinsController extends JenkinsController implements LogLis
         } catch (InterruptedException e) {
             throw new IOException(e);
         } finally {
-            if (conn !=null)
-                conn.close();
+            if (conn != null) conn.close();
             conn = null;
         }
     }
@@ -156,7 +153,7 @@ public class PooledJenkinsController extends JenkinsController implements LogLis
     public void diagnose(Throwable cause) {
         // TODO: Report jenkins log
         cause.printStackTrace(out);
-        if(getenv("INTERACTIVE") != null && getenv("INTERACTIVE").equals("true")){
+        if (getenv("INTERACTIVE") != null && getenv("INTERACTIVE").equals("true")) {
             out.println("Commencing interactive debugging. Browser session was kept open.");
             out.println("Press return to proceed.");
             try {
@@ -169,7 +166,8 @@ public class PooledJenkinsController extends JenkinsController implements LogLis
 
     @Extension
     public static class FactoryImpl extends LocalFactoryImpl {
-        @Inject Injector i;
+        @Inject
+        Injector i;
 
         @Override
         public String getId() {
@@ -204,8 +202,7 @@ public class PooledJenkinsController extends JenkinsController implements LogLis
         }
 
         @Override
-        public void checkRoles(RoleChecker checker) throws SecurityException {
-        }
+        public void checkRoles(RoleChecker checker) throws SecurityException {}
 
         private static final long serialVersionUID = 1L;
     }
diff --git a/src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java b/src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java
index 1d0ba1f..3f50a05 100644
--- a/src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java
+++ b/src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java
@@ -18,11 +18,9 @@
  */
 package foo;
 
-public class Main
-{
-    public static void main( String[] args )
-    {
+public class Main {
+    public static void main(String[] args) {
         TestService testService = new TestService();
         testService.run();
     }
-}
\ No newline at end of file
+}
diff --git a/src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java b/src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java
index 2e1d747..08e2016 100644
--- a/src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java
+++ b/src/it/MCOMPILER-349_dependencyChanged/service/src/main/java/TestService.java
@@ -18,11 +18,7 @@
  */
 package foo;
 
-public class TestService
-{
+public class TestService {
 
-    public void run()
-    {
-
-    }
-}
\ No newline at end of file
+    public void run() {}
+}
diff --git a/src/it/MCOMPILER-349_dependencyChanged/verify.groovy b/src/it/MCOMPILER-349_dependencyChanged/verify.groovy
index c218281..f09d28d 100644
--- a/src/it/MCOMPILER-349_dependencyChanged/verify.groovy
+++ b/src/it/MCOMPILER-349_dependencyChanged/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/MCOMPILER-360/main360/src/main/java/module-info.java b/src/it/MCOMPILER-360/main360/src/main/java/module-info.java
index 2ad6832..084009f 100644
--- a/src/it/MCOMPILER-360/main360/src/main/java/module-info.java
+++ b/src/it/MCOMPILER-360/main360/src/main/java/module-info.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-module org.maven.test.app {
-}
+module org.maven.test.app {}
diff --git a/src/it/MCOMPILER-366/src/main/java/module-info.java b/src/it/MCOMPILER-366/src/main/java/module-info.java
index 95e7266..543dc05 100644
--- a/src/it/MCOMPILER-366/src/main/java/module-info.java
+++ b/src/it/MCOMPILER-366/src/main/java/module-info.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-module lib 
-{
+module lib {
     requires plexus.utils;
     requires plexus.resources;
+
     exports org.maven.test;
-}
\ No newline at end of file
+}
diff --git a/src/it/MCOMPILER-366/src/main/java/org/maven/test/Main.java b/src/it/MCOMPILER-366/src/main/java/org/maven/test/Main.java
index f2c4a2f..833bee5 100644
--- a/src/it/MCOMPILER-366/src/main/java/org/maven/test/Main.java
+++ b/src/it/MCOMPILER-366/src/main/java/org/maven/test/Main.java
@@ -1,5 +1,3 @@
-package org.maven.test;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.maven.test;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,9 +16,10 @@ package org.maven.test;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.maven.test;
 
-import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.resource.ResourceManager;
+import org.codehaus.plexus.util.StringUtils;
 
 public class Main {
 
@@ -28,7 +27,7 @@ public class Main {
      * @param args
      */
     public static void main(String[] args) {
-        System.out.println( StringUtils.concatenate( args ) );
+        System.out.println(StringUtils.concatenate(args));
         ResourceManager manager = null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/it/MCOMPILER-373_mrjar/src/main/java/org/maven/bug/A.java b/src/it/MCOMPILER-373_mrjar/src/main/java/org/maven/bug/A.java
index 0330331..7360b4a 100644
--- a/src/it/MCOMPILER-373_mrjar/src/main/java/org/maven/bug/A.java
+++ b/src/it/MCOMPILER-373_mrjar/src/main/java/org/maven/bug/A.java
@@ -1,5 +1,3 @@
-package org.maven.bug;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.maven.bug;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,11 +16,10 @@ package org.maven.bug;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.maven.bug;
 
-public class A
-{
-    static int getCount()
-    {
+public class A {
+    static int getCount() {
         return 1;
     }
 }
diff --git a/src/it/MCOMPILER-373_mrjar/src/main/java/org/maven/bug/B.java b/src/it/MCOMPILER-373_mrjar/src/main/java/org/maven/bug/B.java
index e30f729..aec2993 100644
--- a/src/it/MCOMPILER-373_mrjar/src/main/java/org/maven/bug/B.java
+++ b/src/it/MCOMPILER-373_mrjar/src/main/java/org/maven/bug/B.java
@@ -1,5 +1,3 @@
-package org.maven.bug;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.maven.bug;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,11 +16,10 @@ package org.maven.bug;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.maven.bug;
 
-public class B
-{
-    static int getCount()
-    {
+public class B {
+    static int getCount() {
         return A.getCount() + 1;
     }
 }
diff --git a/src/it/MCOMPILER-373_mrjar/src/main/java11/org/maven/bug/B.java b/src/it/MCOMPILER-373_mrjar/src/main/java11/org/maven/bug/B.java
index 8963f31..1797e69 100644
--- a/src/it/MCOMPILER-373_mrjar/src/main/java11/org/maven/bug/B.java
+++ b/src/it/MCOMPILER-373_mrjar/src/main/java11/org/maven/bug/B.java
@@ -1,5 +1,3 @@
-package org.maven.bug;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.maven.bug;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,11 +16,10 @@ package org.maven.bug;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.maven.bug;
 
-public class B
-{
-    int getCount()
-    {
+public class B {
+    int getCount() {
         return A9.getCount() + 2;
     }
 }
diff --git a/src/it/MCOMPILER-373_mrjar/src/main/java9/org/maven/bug/A9.java b/src/it/MCOMPILER-373_mrjar/src/main/java9/org/maven/bug/A9.java
index 16fcc26..4b56281 100644
--- a/src/it/MCOMPILER-373_mrjar/src/main/java9/org/maven/bug/A9.java
+++ b/src/it/MCOMPILER-373_mrjar/src/main/java9/org/maven/bug/A9.java
@@ -1,5 +1,3 @@
-package org.maven.bug;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.maven.bug;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,11 +16,10 @@ package org.maven.bug;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.maven.bug;
 
-public class A9
-{
-    static int getCount()
-    {
+public class A9 {
+    static int getCount() {
         return A.getCount() + 1;
     }
 }
diff --git a/src/it/MCOMPILER-373_mrjar/src/main/java9/org/maven/bug/B.java b/src/it/MCOMPILER-373_mrjar/src/main/java9/org/maven/bug/B.java
index cfb033b..1e54a47 100644
--- a/src/it/MCOMPILER-373_mrjar/src/main/java9/org/maven/bug/B.java
+++ b/src/it/MCOMPILER-373_mrjar/src/main/java9/org/maven/bug/B.java
@@ -1,5 +1,3 @@
-package org.maven.bug;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.maven.bug;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,11 +16,10 @@ package org.maven.bug;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.maven.bug;
 
-public class B
-{
-    static int getCount()
-    {
+public class B {
+    static int getCount() {
         return A9.getCount() + 1;
     }
 }
diff --git a/src/it/MCOMPILER-379/module2/src/main/java/com/natros/mcp/Foo.java b/src/it/MCOMPILER-379/module2/src/main/java/com/natros/mcp/Foo.java
index 7e6d55c..c63e6e4 100644
--- a/src/it/MCOMPILER-379/module2/src/main/java/com/natros/mcp/Foo.java
+++ b/src/it/MCOMPILER-379/module2/src/main/java/com/natros/mcp/Foo.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,5 +18,4 @@
  */
 package com.natros.mcp;
 
-public class Foo {
-}
+public class Foo {}
diff --git a/src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java b/src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java
index 1403991..3f50a05 100644
--- a/src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java
+++ b/src/it/MCOMPILER-474_recompile-dependent-when-package/dependent-module/src/main/java/Main.java
@@ -18,10 +18,8 @@
  */
 package foo;
 
-public class Main
-{
-    public static void main( String[] args )
-    {
+public class Main {
+    public static void main(String[] args) {
         TestService testService = new TestService();
         testService.run();
     }
diff --git a/src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java b/src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java
index 4fb1ade..08e2016 100644
--- a/src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java
+++ b/src/it/MCOMPILER-474_recompile-dependent-when-package/service/src/main/java/TestService.java
@@ -18,11 +18,7 @@
  */
 package foo;
 
-public class TestService
-{
+public class TestService {
 
-    public void run()
-    {
-
-    }
+    public void run() {}
 }
diff --git a/src/it/MCOMPILER-474_recompile-dependent-when-package/verify.groovy b/src/it/MCOMPILER-474_recompile-dependent-when-package/verify.groovy
index 11789f7..e32f7a6 100644
--- a/src/it/MCOMPILER-474_recompile-dependent-when-package/verify.groovy
+++ b/src/it/MCOMPILER-474_recompile-dependent-when-package/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/MCOMPILER-481-requires-static-included/app/src/main/java/org/test/app/Main.java b/src/it/MCOMPILER-481-requires-static-included/app/src/main/java/org/test/app/Main.java
index 6debb0c..631169b 100644
--- a/src/it/MCOMPILER-481-requires-static-included/app/src/main/java/org/test/app/Main.java
+++ b/src/it/MCOMPILER-481-requires-static-included/app/src/main/java/org/test/app/Main.java
@@ -1,5 +1,3 @@
-package org.test.app;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,7 +16,6 @@ package org.test.app;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.test.app;
 
-public class Main
-{
-}
+public class Main {}
diff --git a/src/it/MCOMPILER-481-requires-static-included/app/src/test/java/org/test/app/MainTest.java b/src/it/MCOMPILER-481-requires-static-included/app/src/test/java/org/test/app/MainTest.java
index 9c220a8..216b3a9 100644
--- a/src/it/MCOMPILER-481-requires-static-included/app/src/test/java/org/test/app/MainTest.java
+++ b/src/it/MCOMPILER-481-requires-static-included/app/src/test/java/org/test/app/MainTest.java
@@ -1,5 +1,3 @@
-package org.test.app;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,16 +16,15 @@ package org.test.app;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.test.app;
 
 import org.eclipse.jetty.util.ajax.JSON;
 import org.junit.jupiter.api.Test;
 import org.test.service.JSONService;
 
-public class MainTest
-{
+public class MainTest {
     @Test
-    public void test()
-    {
+    public void test() {
         JSON json = new JSONService().json;
         System.err.println("json = " + json);
     }
diff --git a/src/it/MCOMPILER-481-requires-static-included/service/src/main/java/org/test/service/JSONService.java b/src/it/MCOMPILER-481-requires-static-included/service/src/main/java/org/test/service/JSONService.java
index 0bca3de..022fd19 100644
--- a/src/it/MCOMPILER-481-requires-static-included/service/src/main/java/org/test/service/JSONService.java
+++ b/src/it/MCOMPILER-481-requires-static-included/service/src/main/java/org/test/service/JSONService.java
@@ -1,5 +1,3 @@
-package org.test.service;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,10 +16,10 @@ package org.test.service;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.test.service;
 
 import org.eclipse.jetty.util.ajax.JSON;
 
-public class JSONService extends Service
-{
+public class JSONService extends Service {
     public final JSON json = new JSON();
 }
diff --git a/src/it/MCOMPILER-481-requires-static-included/service/src/main/java/org/test/service/Service.java b/src/it/MCOMPILER-481-requires-static-included/service/src/main/java/org/test/service/Service.java
index 69b865f..7bd21cf 100644
--- a/src/it/MCOMPILER-481-requires-static-included/service/src/main/java/org/test/service/Service.java
+++ b/src/it/MCOMPILER-481-requires-static-included/service/src/main/java/org/test/service/Service.java
@@ -1,5 +1,3 @@
-package org.test.service;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,7 +16,6 @@ package org.test.service;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.test.service;
 
-public abstract class Service
-{
-}
+public abstract class Service {}
diff --git a/src/it/MCOMPILER-485/src/main/java/dummy/HelloWorld.java b/src/it/MCOMPILER-485/src/main/java/dummy/HelloWorld.java
index cda1006..7ceb91c 100644
--- a/src/it/MCOMPILER-485/src/main/java/dummy/HelloWorld.java
+++ b/src/it/MCOMPILER-485/src/main/java/dummy/HelloWorld.java
@@ -1,5 +1,3 @@
-package dummy;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,11 +16,10 @@ package dummy;
  * specific language governing permissions and limitations
  * under the License.
  */
+package dummy;
 
-
-public class HelloWorld
-{
-   public static void main(String[] argv) {
-      System.out.println("Hello World");
-   }
+public class HelloWorld {
+    public static void main(String[] argv) {
+        System.out.println("Hello World");
+    }
 }
diff --git a/src/it/MCOMPILER-485/src/main/java/dummy/package-info.java b/src/it/MCOMPILER-485/src/main/java/dummy/package-info.java
index ed72542..9d2deff 100644
--- a/src/it/MCOMPILER-485/src/main/java/dummy/package-info.java
+++ b/src/it/MCOMPILER-485/src/main/java/dummy/package-info.java
@@ -20,4 +20,4 @@
 /**
  * This is the package javadoc
  */
-package dummy;
\ No newline at end of file
+package dummy;
diff --git a/src/it/MCOMPILER-485/verify.groovy b/src/it/MCOMPILER-485/verify.groovy
index 2384fec..d8ccdaf 100644
--- a/src/it/MCOMPILER-485/verify.groovy
+++ b/src/it/MCOMPILER-485/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/MCOMPILER-495/src/main/java/dummy/package-info.java b/src/it/MCOMPILER-495/src/main/java/dummy/package-info.java
index ed72542..9d2deff 100644
--- a/src/it/MCOMPILER-495/src/main/java/dummy/package-info.java
+++ b/src/it/MCOMPILER-495/src/main/java/dummy/package-info.java
@@ -20,4 +20,4 @@
 /**
  * This is the package javadoc
  */
-package dummy;
\ No newline at end of file
+package dummy;
diff --git a/src/it/MCOMPILER-495/verify.groovy b/src/it/MCOMPILER-495/verify.groovy
index 2384fec..d8ccdaf 100644
--- a/src/it/MCOMPILER-495/verify.groovy
+++ b/src/it/MCOMPILER-495/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/Person.java b/src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/Person.java
index e5fbf58..f07d0f3 100644
--- a/src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/Person.java
+++ b/src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/Person.java
@@ -1,5 +1,3 @@
-package dummy;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,7 +16,7 @@ package dummy;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package dummy;
 
 public class Person {
     private long id;
diff --git a/src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/foo/Person.java b/src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/foo/Person.java
index 9b56c1d..15d396d 100644
--- a/src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/foo/Person.java
+++ b/src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/foo/Person.java
@@ -1,5 +1,3 @@
-package dummy.foo;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,7 +16,7 @@ package dummy.foo;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package dummy.foo;
 
 public class Person {
     private long id;
diff --git a/src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/package-info.java b/src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/package-info.java
index ed72542..9d2deff 100644
--- a/src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/package-info.java
+++ b/src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/package-info.java
@@ -20,4 +20,4 @@
 /**
  * This is the package javadoc
  */
-package dummy;
\ No newline at end of file
+package dummy;
diff --git a/src/it/MCOMPILER-500-package-info-incr/verify.groovy b/src/it/MCOMPILER-500-package-info-incr/verify.groovy
index ecba9c2..ef41bde 100644
--- a/src/it/MCOMPILER-500-package-info-incr/verify.groovy
+++ b/src/it/MCOMPILER-500-package-info-incr/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor-dep-v1/src/main/java/mcompiler503/AnnotationProcessorDependencyV1.java b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor-dep-v1/src/main/java/mcompiler503/AnnotationProcessorDependencyV1.java
index 3df98c4..35fe82b 100644
--- a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor-dep-v1/src/main/java/mcompiler503/AnnotationProcessorDependencyV1.java
+++ b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor-dep-v1/src/main/java/mcompiler503/AnnotationProcessorDependencyV1.java
@@ -1,4 +1,3 @@
-package mcompiler503;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,7 +16,6 @@ package mcompiler503;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mcompiler503;
 
-public class AnnotationProcessorDependencyV1
-{
-}
\ No newline at end of file
+public class AnnotationProcessorDependencyV1 {}
diff --git a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor-dep-v2/src/main/java/mcompiler503/AnnotationProcessorDependencyV2.java b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor-dep-v2/src/main/java/mcompiler503/AnnotationProcessorDependencyV2.java
index 43f09f3..08c5067 100644
--- a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor-dep-v2/src/main/java/mcompiler503/AnnotationProcessorDependencyV2.java
+++ b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor-dep-v2/src/main/java/mcompiler503/AnnotationProcessorDependencyV2.java
@@ -1,4 +1,3 @@
-package mcompiler503;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,7 +16,6 @@ package mcompiler503;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mcompiler503;
 
-public class AnnotationProcessorDependencyV2
-{
-}
\ No newline at end of file
+public class AnnotationProcessorDependencyV2 {}
diff --git a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor/src/main/java/mcompiler503/SimpleAnnotationProcessor.java b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor/src/main/java/mcompiler503/SimpleAnnotationProcessor.java
index 05f205c..74c44a4 100644
--- a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor/src/main/java/mcompiler503/SimpleAnnotationProcessor.java
+++ b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor/src/main/java/mcompiler503/SimpleAnnotationProcessor.java
@@ -1,4 +1,3 @@
-package mcompiler503;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,10 +16,7 @@ package mcompiler503;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Set;
+package mcompiler503;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Filer;
@@ -37,43 +33,37 @@ import javax.tools.FileObject;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardLocation;
 
-@SupportedSourceVersion( SourceVersion.RELEASE_6 )
-@SupportedAnnotationTypes( "mcompiler503.SimpleAnnotation" )
-public class SimpleAnnotationProcessor
-    extends AbstractProcessor
-{
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Set;
+
+@SupportedSourceVersion(SourceVersion.RELEASE_6)
+@SupportedAnnotationTypes("mcompiler503.SimpleAnnotation")
+public class SimpleAnnotationProcessor extends AbstractProcessor {
 
     @Override
-    public boolean process( Set<? extends TypeElement> annotations, RoundEnvironment roundEnv )
-    {
-        if ( annotations.isEmpty() )
-        {
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        if (annotations.isEmpty()) {
             return true;
         }
 
         // assert that mcompiler503-annotation-processor-dep:2.0.0-SNAPSHOT is on the classpath
-        try
-        {
-            getClass().getClassLoader().loadClass( "mcompiler503.AnnotationProcessorDependencyV2" );
-        }
-        catch ( ClassNotFoundException expected )
-        {
-            throw new RuntimeException( "Expected mcompiler503.AnnotationProcessorDependencyV2 to be on the"
+        try {
+            getClass().getClassLoader().loadClass("mcompiler503.AnnotationProcessorDependencyV2");
+        } catch (ClassNotFoundException expected) {
+            throw new RuntimeException("Expected mcompiler503.AnnotationProcessorDependencyV2 to be on the"
                     + "processorpath, because mcompiler503-annotation-processor-dep:2.0.0-SNAPSHOT is specifically"
-                    + "configured as one the elements of the processorpath." );
+                    + "configured as one the elements of the processorpath.");
         }
 
         // assert that mcompiler503-annotation-processor-dep:1.0.0-SNAPSHOT is NOT on the classpath,
         // since it should be replaced by mcompiler503-annotation-processor-dep:2.0.0-SNAPSHOT
         // when resolving annotation processors and their dependencies
-        try
-        {
-            getClass().getClassLoader().loadClass( "mcompiler503.AnnotationProcessorDependencyV1" );
-            throw new RuntimeException( "Expected a ClassNotFoundException, because "
-                    + "mcompiler503.AnnotationProcessorDependencyV1 is not supposed to be on the processorpath." );
-        }
-        catch ( ClassNotFoundException expected )
-        {
+        try {
+            getClass().getClassLoader().loadClass("mcompiler503.AnnotationProcessorDependencyV1");
+            throw new RuntimeException("Expected a ClassNotFoundException, because "
+                    + "mcompiler503.AnnotationProcessorDependencyV1 is not supposed to be on the processorpath.");
+        } catch (ClassNotFoundException expected) {
             // expected.
         }
 
@@ -81,38 +71,35 @@ public class SimpleAnnotationProcessor
 
         Elements elementUtils = processingEnv.getElementUtils();
 
-        Set<? extends Element> elements = roundEnv.getElementsAnnotatedWith( annotations.iterator().next() );
+        Set<? extends Element> elements =
+                roundEnv.getElementsAnnotatedWith(annotations.iterator().next());
 
-        for ( Element element : elements )
-        {
+        for (Element element : elements) {
             Name name = element.getSimpleName();
 
-            PackageElement packageElement = elementUtils.getPackageOf( element );
+            PackageElement packageElement = elementUtils.getPackageOf(element);
 
-            try
-            {
+            try {
                 Name packageName = packageElement.getQualifiedName();
                 FileObject resource =
-                        filer.createResource( StandardLocation.SOURCE_OUTPUT, packageName, name + ".txt", element );
+                        filer.createResource(StandardLocation.SOURCE_OUTPUT, packageName, name + ".txt", element);
 
                 Writer writer = resource.openWriter();
-                writer.write( name.toString() );
+                writer.write(name.toString());
                 writer.close();
 
                 String className = name + "Companion";
-                JavaFileObject javaFile = filer.createSourceFile( packageName + "." + className, element );
+                JavaFileObject javaFile = filer.createSourceFile(packageName + "." + className, element);
 
                 Writer javaWriter = javaFile.openWriter();
-                javaWriter.append( "package " ).append( packageName ).append( ";\n\n" );
-                javaWriter.append( "public class " ).append( className ).append( " {\n" );
-                javaWriter.append( "    public " ).append( className ).append( "() {\n" );
-                javaWriter.append( "        System.out.println(\"Hey there!\");\n" );
-                javaWriter.append( "    }\n}\n" );
+                javaWriter.append("package ").append(packageName).append(";\n\n");
+                javaWriter.append("public class ").append(className).append(" {\n");
+                javaWriter.append("    public ").append(className).append("() {\n");
+                javaWriter.append("        System.out.println(\"Hey there!\");\n");
+                javaWriter.append("    }\n}\n");
                 javaWriter.close();
-            }
-            catch ( IOException e )
-            {
-                throw new RuntimeException( e );
+            } catch (IOException e) {
+                throw new RuntimeException(e);
             }
         }
 
diff --git a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-user/src/main/java/mcompiler503/SimpleAnnotation.java b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-user/src/main/java/mcompiler503/SimpleAnnotation.java
index 7264938..40846cd 100644
--- a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-user/src/main/java/mcompiler503/SimpleAnnotation.java
+++ b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-user/src/main/java/mcompiler503/SimpleAnnotation.java
@@ -1,4 +1,3 @@
-package mcompiler503;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,6 +16,7 @@ package mcompiler503;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mcompiler503;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,6 +25,4 @@ import java.lang.annotation.Target;
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.SOURCE)
-public @interface SimpleAnnotation
-{
-}
+public @interface SimpleAnnotation {}
diff --git a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-user/src/main/java/mcompiler503/SimpleObject.java b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-user/src/main/java/mcompiler503/SimpleObject.java
index faa913f..954d70e 100644
--- a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-user/src/main/java/mcompiler503/SimpleObject.java
+++ b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-user/src/main/java/mcompiler503/SimpleObject.java
@@ -1,4 +1,3 @@
-package mcompiler503;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,8 +16,7 @@ package mcompiler503;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mcompiler503;
 
 @SimpleAnnotation
-public class SimpleObject
-{
-}
+public class SimpleObject {}
diff --git a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-user/src/test/java/mcompiler503/SimpleTestObject.java b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-user/src/test/java/mcompiler503/SimpleTestObject.java
index 5c47d30..43640f4 100644
--- a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-user/src/test/java/mcompiler503/SimpleTestObject.java
+++ b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-user/src/test/java/mcompiler503/SimpleTestObject.java
@@ -1,4 +1,3 @@
-package mcompiler503;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,8 +16,7 @@ package mcompiler503;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mcompiler503;
 
 @SimpleAnnotation
-public class SimpleTestObject
-{
-}
+public class SimpleTestObject {}
diff --git a/src/it/MCOMPILER-512/src/main/java/dummy/Main.java b/src/it/MCOMPILER-512/src/main/java/dummy/Main.java
index 7b36fb7..09cdacc 100644
--- a/src/it/MCOMPILER-512/src/main/java/dummy/Main.java
+++ b/src/it/MCOMPILER-512/src/main/java/dummy/Main.java
@@ -1,5 +1,3 @@
-package dummy;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,15 +16,13 @@ package dummy;
  * specific language governing permissions and limitations
  * under the License.
  */
+package dummy;
 
 import javax.smartcardio.TerminalFactory;
 
-public class Main
-{
+public class Main {
 
-    public static void main(String[] args)
-    {
-        TerminalFactory tf =  TerminalFactory.getDefault();
+    public static void main(String[] args) {
+        TerminalFactory tf = TerminalFactory.getDefault();
     }
-
 }
diff --git a/src/it/MCOMPILER-512/src/test/java/dummy/Test.java b/src/it/MCOMPILER-512/src/test/java/dummy/Test.java
index a0cc02c..eb7058c 100644
--- a/src/it/MCOMPILER-512/src/test/java/dummy/Test.java
+++ b/src/it/MCOMPILER-512/src/test/java/dummy/Test.java
@@ -1,5 +1,3 @@
-package dummy;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,13 +16,12 @@ package dummy;
  * specific language governing permissions and limitations
  * under the License.
  */
+package dummy;
 
 import javax.smartcardio.TerminalFactory;
 
-public class Test
-{
-    public void test()
-    {
-        TerminalFactory tf =  TerminalFactory.getDefault();
+public class Test {
+    public void test() {
+        TerminalFactory tf = TerminalFactory.getDefault();
     }
 }
diff --git a/src/it/MCOMPILER-522-unresolvable-dependency/src/main/java/org/apache.maven.plugins.compiler.it/SimpleAnnotation.java b/src/it/MCOMPILER-522-unresolvable-dependency/src/main/java/org/apache.maven.plugins.compiler.it/SimpleAnnotation.java
index 0c79335..f84e9d0 100644
--- a/src/it/MCOMPILER-522-unresolvable-dependency/src/main/java/org/apache.maven.plugins.compiler.it/SimpleAnnotation.java
+++ b/src/it/MCOMPILER-522-unresolvable-dependency/src/main/java/org/apache.maven.plugins.compiler.it/SimpleAnnotation.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.plugins.compiler.it;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -26,7 +25,4 @@ import java.lang.annotation.Target;
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.SOURCE)
-public @interface SimpleAnnotation
-{
-
-}
+public @interface SimpleAnnotation {}
diff --git a/src/it/MCOMPILER-522-unresolvable-dependency/src/main/java/org/apache.maven.plugins.compiler.it/SimpleObject.java b/src/it/MCOMPILER-522-unresolvable-dependency/src/main/java/org/apache.maven.plugins.compiler.it/SimpleObject.java
index 5d8760e..9f50719 100644
--- a/src/it/MCOMPILER-522-unresolvable-dependency/src/main/java/org/apache.maven.plugins.compiler.it/SimpleObject.java
+++ b/src/it/MCOMPILER-522-unresolvable-dependency/src/main/java/org/apache.maven.plugins.compiler.it/SimpleObject.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,7 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.plugins.compiler.it;
 
 @SimpleAnnotation
-public class SimpleObject
-{
-
-}
+public class SimpleObject {}
diff --git a/src/it/automodules-application/src/main/java/module-info.java b/src/it/automodules-application/src/main/java/module-info.java
index 047359d..cd75a74 100644
--- a/src/it/automodules-application/src/main/java/module-info.java
+++ b/src/it/automodules-application/src/main/java/module-info.java
@@ -1,22 +1,21 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module app 
-{
-    requires plexus.utils;    
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module app {
+    requires plexus.utils;
+}
diff --git a/src/it/automodules-application/src/main/java/org/maven/test/Main.java b/src/it/automodules-application/src/main/java/org/maven/test/Main.java
index eea5036..76cd55e 100644
--- a/src/it/automodules-application/src/main/java/org/maven/test/Main.java
+++ b/src/it/automodules-application/src/main/java/org/maven/test/Main.java
@@ -1,32 +1,31 @@
-package org.maven.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.codehaus.plexus.util.StringUtils;
-
-public class Main {
-    
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-        System.out.println( StringUtils.concatenate( args ) );
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.maven.test;
+
+import org.codehaus.plexus.util.StringUtils;
+
+public class Main {
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        System.out.println(StringUtils.concatenate(args));
+    }
+}
diff --git a/src/it/automodules-library/src/main/java/module-info.java b/src/it/automodules-library/src/main/java/module-info.java
index 17205e3..ace1121 100644
--- a/src/it/automodules-library/src/main/java/module-info.java
+++ b/src/it/automodules-library/src/main/java/module-info.java
@@ -1,24 +1,23 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module lib 
-{
-    requires plexus.utils;
-    
-    exports org.maven.test;
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module lib {
+    requires plexus.utils;
+
+    exports org.maven.test;
+}
diff --git a/src/it/automodules-library/src/main/java/org/maven/test/Main.java b/src/it/automodules-library/src/main/java/org/maven/test/Main.java
index 463feac..76cd55e 100644
--- a/src/it/automodules-library/src/main/java/org/maven/test/Main.java
+++ b/src/it/automodules-library/src/main/java/org/maven/test/Main.java
@@ -1,32 +1,31 @@
-package org.maven.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.codehaus.plexus.util.StringUtils;
-
-public class Main {
-    
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-        System.out.println( StringUtils.concatenate( args ) );
-    }
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.maven.test;
+
+import org.codehaus.plexus.util.StringUtils;
+
+public class Main {
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        System.out.println(StringUtils.concatenate(args));
+    }
+}
diff --git a/src/it/automodules-manifest/src/main/java/module-info.java b/src/it/automodules-manifest/src/main/java/module-info.java
index 5bd017f..684f7e3 100644
--- a/src/it/automodules-manifest/src/main/java/module-info.java
+++ b/src/it/automodules-manifest/src/main/java/module-info.java
@@ -1,22 +1,21 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module app 
-{
-    requires com.ta3;    
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module app {
+    requires com.ta3;
+}
diff --git a/src/it/automodules-manifest/src/main/java/org/maven/test/Main.java b/src/it/automodules-manifest/src/main/java/org/maven/test/Main.java
index b81a720..642ee05 100644
--- a/src/it/automodules-manifest/src/main/java/org/maven/test/Main.java
+++ b/src/it/automodules-manifest/src/main/java/org/maven/test/Main.java
@@ -1,28 +1,25 @@
-package org.maven.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class Main 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( com.ta3.MyClass.class.getName() );
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.maven.test;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println(com.ta3.MyClass.class.getName());
+    }
+}
diff --git a/src/it/automodules-transitive-module/src/main/java/module-info.java b/src/it/automodules-transitive-module/src/main/java/module-info.java
index 17205e3..ace1121 100644
--- a/src/it/automodules-transitive-module/src/main/java/module-info.java
+++ b/src/it/automodules-transitive-module/src/main/java/module-info.java
@@ -1,24 +1,23 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module lib 
-{
-    requires plexus.utils;
-    
-    exports org.maven.test;
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module lib {
+    requires plexus.utils;
+
+    exports org.maven.test;
+}
diff --git a/src/it/automodules-transitive-module/src/main/java/org/maven/test/Main.java b/src/it/automodules-transitive-module/src/main/java/org/maven/test/Main.java
index 463feac..76cd55e 100644
--- a/src/it/automodules-transitive-module/src/main/java/org/maven/test/Main.java
+++ b/src/it/automodules-transitive-module/src/main/java/org/maven/test/Main.java
@@ -1,32 +1,31 @@
-package org.maven.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.codehaus.plexus.util.StringUtils;
-
-public class Main {
-    
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-        System.out.println( StringUtils.concatenate( args ) );
-    }
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.maven.test;
+
+import org.codehaus.plexus.util.StringUtils;
+
+public class Main {
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        System.out.println(StringUtils.concatenate(args));
+    }
+}
diff --git a/src/it/default-fork-windows/src/main/java/MyClass.java b/src/it/default-fork-windows/src/main/java/MyClass.java
index 90a9370..d4132bb 100644
--- a/src/it/default-fork-windows/src/main/java/MyClass.java
+++ b/src/it/default-fork-windows/src/main/java/MyClass.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,4 @@
  */
 package foo;
 
-public class MyClass
-{
-
-}
+public class MyClass {}
diff --git a/src/it/default-fork-windows/src/test/java/MyTest.java b/src/it/default-fork-windows/src/test/java/MyTest.java
index 33d4178..77db4f1 100644
--- a/src/it/default-fork-windows/src/test/java/MyTest.java
+++ b/src/it/default-fork-windows/src/test/java/MyTest.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,8 +20,4 @@ package foo;
 
 import junit.framework.TestCase;
 
-public class MyTest
-    extends TestCase
-{
-
-}
+public class MyTest extends TestCase {}
diff --git a/src/it/default-fork/src/main/java/MyClass.java b/src/it/default-fork/src/main/java/MyClass.java
index 90a9370..d4132bb 100644
--- a/src/it/default-fork/src/main/java/MyClass.java
+++ b/src/it/default-fork/src/main/java/MyClass.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,4 @@
  */
 package foo;
 
-public class MyClass
-{
-
-}
+public class MyClass {}
diff --git a/src/it/default-fork/src/test/java/MyTest.java b/src/it/default-fork/src/test/java/MyTest.java
index 33d4178..77db4f1 100644
--- a/src/it/default-fork/src/test/java/MyTest.java
+++ b/src/it/default-fork/src/test/java/MyTest.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,8 +20,4 @@ package foo;
 
 import junit.framework.TestCase;
 
-public class MyTest
-    extends TestCase
-{
-
-}
+public class MyTest extends TestCase {}
diff --git a/src/it/default-incremental-disable/src/main/java/foo/MyClass.java b/src/it/default-incremental-disable/src/main/java/foo/MyClass.java
index 90a9370..d4132bb 100644
--- a/src/it/default-incremental-disable/src/main/java/foo/MyClass.java
+++ b/src/it/default-incremental-disable/src/main/java/foo/MyClass.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,4 @@
  */
 package foo;
 
-public class MyClass
-{
-
-}
+public class MyClass {}
diff --git a/src/it/default-incremental-disable/src/test/java/foo/MyTest.java b/src/it/default-incremental-disable/src/test/java/foo/MyTest.java
index 33d4178..77db4f1 100644
--- a/src/it/default-incremental-disable/src/test/java/foo/MyTest.java
+++ b/src/it/default-incremental-disable/src/test/java/foo/MyTest.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,8 +20,4 @@ package foo;
 
 import junit.framework.TestCase;
 
-public class MyTest
-    extends TestCase
-{
-
-}
+public class MyTest extends TestCase {}
diff --git a/src/it/default/src/main/java/MyClass.java b/src/it/default/src/main/java/MyClass.java
index 90a9370..d4132bb 100644
--- a/src/it/default/src/main/java/MyClass.java
+++ b/src/it/default/src/main/java/MyClass.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,4 @@
  */
 package foo;
 
-public class MyClass
-{
-
-}
+public class MyClass {}
diff --git a/src/it/default/src/test/java/MyTest.java b/src/it/default/src/test/java/MyTest.java
index 33d4178..77db4f1 100644
--- a/src/it/default/src/test/java/MyTest.java
+++ b/src/it/default/src/test/java/MyTest.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,8 +20,4 @@ package foo;
 
 import junit.framework.TestCase;
 
-public class MyTest
-    extends TestCase
-{
-
-}
+public class MyTest extends TestCase {}
diff --git a/src/it/groovy-project-with-new-plexus-compiler/verify.groovy b/src/it/groovy-project-with-new-plexus-compiler/verify.groovy
index 500f7f9..4ea3c47 100644
--- a/src/it/groovy-project-with-new-plexus-compiler/verify.groovy
+++ b/src/it/groovy-project-with-new-plexus-compiler/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/Person.java b/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/Person.java
index d1ecf61..1fa3d8c 100644
--- a/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/Person.java
+++ b/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/Person.java
@@ -1,5 +1,3 @@
-package org.apache.maven.it0055;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.it0055;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,19 +16,16 @@ package org.apache.maven.it0055;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.it0055;
 
-
-public class Person
-{
+public class Person {
     private String name;
-    
-    public void setName( String name )
-    {
+
+    public void setName(String name) {
         this.name = name;
     }
-    
-    public String getName()
-    {
+
+    public String getName() {
         return name;
     }
 }
diff --git a/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/PersonTwo.java b/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/PersonTwo.java
index 7f1914b..8bb3645 100644
--- a/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/PersonTwo.java
+++ b/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/PersonTwo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.it0055;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.it0055;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,19 +16,16 @@ package org.apache.maven.it0055;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.it0055;
 
-
-public class PersonTwo
-{
+public class PersonTwo {
     private String name;
-    
-    public void setName( String name )
-    {
+
+    public void setName(String name) {
         this.name = name;
     }
-    
-    public String getName()
-    {
+
+    public String getName() {
         return name;
     }
 }
diff --git a/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTest.java b/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTest.java
index c8c40ed..f360165 100644
--- a/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTest.java
+++ b/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.it0055;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.it0055;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,19 +16,16 @@ package org.apache.maven.it0055;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.it0055;
 
 import junit.framework.TestCase;
 
-public class PersonTest
-    extends TestCase
-{
-    public void testPerson()
-    {
+public class PersonTest extends TestCase {
+    public void testPerson() {
         Person person = new Person();
-        
-        person.setName( "foo" );
-        
-        assertEquals( "foo", person.getName() );
+
+        person.setName("foo");
+
+        assertEquals("foo", person.getName());
     }
 }
diff --git a/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTwoTest.java b/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTwoTest.java
index 6a51799..a9096ee 100644
--- a/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTwoTest.java
+++ b/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTwoTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.it0055;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.it0055;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,19 +16,16 @@ package org.apache.maven.it0055;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.it0055;
 
 import junit.framework.TestCase;
 
-public class PersonTwoTest
-    extends TestCase
-{
-    public void testPerson()
-    {
+public class PersonTwoTest extends TestCase {
+    public void testPerson() {
         Person person = new Person();
-        
-        person.setName( "foo" );
-        
-        assertEquals( "foo", person.getName() );
+
+        person.setName("foo");
+
+        assertEquals("foo", person.getName());
     }
 }
diff --git a/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/App.java b/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/App.java
index 814edb9..41ebecd 100644
--- a/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/App.java
+++ b/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/App.java
@@ -1,5 +1,3 @@
-package com.mycompany.jdk16annotation;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package com.mycompany.jdk16annotation;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,16 +16,14 @@ package com.mycompany.jdk16annotation;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package com.mycompany.jdk16annotation;
 
 /**
  * Hello world!
  *
  */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
 }
diff --git a/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProvider.java b/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProvider.java
index b87cc68..a7921fd 100644
--- a/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProvider.java
+++ b/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProvider.java
@@ -1,5 +1,3 @@
-package com.mycompany.jdk16annotation;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package com.mycompany.jdk16annotation;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,19 +16,19 @@ package com.mycompany.jdk16annotation;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package com.mycompany.jdk16annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
-
 @Retention(RetentionPolicy.SOURCE)
 @Target(ElementType.TYPE)
 public @interface ServiceProvider {
     Class<?> service();
+
     int position() default Integer.MAX_VALUE;
+
     String path() default "";
 }
diff --git a/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProviderProcessor.java b/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProviderProcessor.java
index 8f39d10..f5777e9 100644
--- a/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProviderProcessor.java
+++ b/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProviderProcessor.java
@@ -1,5 +1,3 @@
-package com.mycompany.jdk16annotation;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package com.mycompany.jdk16annotation;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,33 +16,31 @@ package com.mycompany.jdk16annotation;
  * specific language governing permissions and limitations
  * under the License.
  */
+package com.mycompany.jdk16annotation;
 
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
-
 import javax.tools.Diagnostic.Kind;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 @SupportedSourceVersion(SourceVersion.RELEASE_6)
 public class ServiceProviderProcessor extends AbstractProcessor {
 
     public @Override Set<String> getSupportedAnnotationTypes() {
-        return new HashSet<String>(Arrays.asList(
-            ServiceProvider.class.getCanonicalName()
-        ));
+        return new HashSet<String>(Arrays.asList(ServiceProvider.class.getCanonicalName()));
     }
 
     /** public for ServiceLoader */
@@ -61,14 +57,18 @@ public class ServiceProviderProcessor extends AbstractProcessor {
         } else {
             return true;
         }
-
     }
 
     private void writeServices() {
         try {
-            FileObject out = processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/one",new Element[0]);
+            FileObject out = processingEnv
+                    .getFiler()
+                    .createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/one", new Element[0]);
             OutputStream os = out.openOutputStream();
-            OutputStream os2 = processingEnv.getFiler().createSourceFile("org.Milos", new Element[0]).openOutputStream();
+            OutputStream os2 = processingEnv
+                    .getFiler()
+                    .createSourceFile("org.Milos", new Element[0])
+                    .openOutputStream();
             OutputStreamWriter osr = new OutputStreamWriter(os2);
             try {
                 PrintWriter w = new PrintWriter(new OutputStreamWriter(os, "UTF-8"));
@@ -82,10 +82,8 @@ public class ServiceProviderProcessor extends AbstractProcessor {
                 os.close();
             }
 
-
         } catch (IOException x) {
             processingEnv.getMessager().printMessage(Kind.ERROR, "Failed to write to one: " + x.toString());
         }
     }
-
 }
diff --git a/src/it/jdk16-annotation/src/test/java/com/mycompany/jdk16annotation/AppTest.java b/src/it/jdk16-annotation/src/test/java/com/mycompany/jdk16annotation/AppTest.java
index 9faeebe..63bde8e 100644
--- a/src/it/jdk16-annotation/src/test/java/com/mycompany/jdk16annotation/AppTest.java
+++ b/src/it/jdk16-annotation/src/test/java/com/mycompany/jdk16annotation/AppTest.java
@@ -1,5 +1,3 @@
-package com.mycompany.jdk16annotation;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package com.mycompany.jdk16annotation;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +16,7 @@ package com.mycompany.jdk16annotation;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package com.mycompany.jdk16annotation;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -27,33 +25,28 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-@ServiceProvider(service=App.class, path="xxx", position=1)
-public class AppTest 
-    extends TestCase
-{
+@ServiceProvider(service = App.class, path = "xxx", position = 1)
+public class AppTest extends TestCase {
     /**
      * Create the test case
      *
      * @param testName name of the test case
      */
-    public AppTest( String testName )
-    {
-        super( testName );
+    public AppTest(String testName) {
+        super(testName);
     }
 
     /**
      * @return the suite of tests being tested
      */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
+    public static Test suite() {
+        return new TestSuite(AppTest.class);
     }
 
     /**
      * Rigourous Test :-)
      */
-    public void testApp()
-    {
-        assertTrue( true );
+    public void testApp() {
+        assertTrue(true);
     }
 }
diff --git a/src/it/jdk9-exportsto/bar/src/main/java/module-info.java b/src/it/jdk9-exportsto/bar/src/main/java/module-info.java
index 22d2376..5cdec55 100644
--- a/src/it/jdk9-exportsto/bar/src/main/java/module-info.java
+++ b/src/it/jdk9-exportsto/bar/src/main/java/module-info.java
@@ -1,22 +1,22 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module bar {
-  requires foo;
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module bar {
+    requires foo;
+}
diff --git a/src/it/jdk9-exportsto/foo/src/main/java/foo/Foo.java b/src/it/jdk9-exportsto/foo/src/main/java/foo/Foo.java
index 156976c..0fd6b80 100644
--- a/src/it/jdk9-exportsto/foo/src/main/java/foo/Foo.java
+++ b/src/it/jdk9-exportsto/foo/src/main/java/foo/Foo.java
@@ -1,22 +1,21 @@
-package foo;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class Foo {}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package foo;
+
+public class Foo {}
diff --git a/src/it/jdk9-exportsto/foo/src/main/java/module-info.java b/src/it/jdk9-exportsto/foo/src/main/java/module-info.java
index 17d226f..48dd578 100644
--- a/src/it/jdk9-exportsto/foo/src/main/java/module-info.java
+++ b/src/it/jdk9-exportsto/foo/src/main/java/module-info.java
@@ -1,22 +1,23 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module foo {
-  exports foo to bar;
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module foo {
+    exports foo to
+            bar;
+}
diff --git a/src/it/jpms_add-exports/src/main/java/module-info.java b/src/it/jpms_add-exports/src/main/java/module-info.java
index c48284e..cfa968a 100644
--- a/src/it/jpms_add-exports/src/main/java/module-info.java
+++ b/src/it/jpms_add-exports/src/main/java/module-info.java
@@ -1,22 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module app 
-{
-        
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module app {}
diff --git a/src/it/jpms_add-exports/src/main/java/org/maven/test/Main.java b/src/it/jpms_add-exports/src/main/java/org/maven/test/Main.java
index 51d5c4a..8fab0b2 100644
--- a/src/it/jpms_add-exports/src/main/java/org/maven/test/Main.java
+++ b/src/it/jpms_add-exports/src/main/java/org/maven/test/Main.java
@@ -1,36 +1,33 @@
-package org.maven.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class Main {
-    
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-        try {
-            Class.forName( "jdk.internal.util.Preconditions" ).newInstance();    
-        }
-        catch ( Exception e  )
-        {
-            // noop
-        }
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.maven.test;
+
+public class Main {
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        try {
+            Class.forName("jdk.internal.util.Preconditions").newInstance();
+        } catch (Exception e) {
+            // noop
+        }
+    }
+}
diff --git a/src/it/jpms_compile-main-empty-test-bar/src/test/java/bar/BarTests.java b/src/it/jpms_compile-main-empty-test-bar/src/test/java/bar/BarTests.java
index 872ca40..2316ac3 100644
--- a/src/it/jpms_compile-main-empty-test-bar/src/test/java/bar/BarTests.java
+++ b/src/it/jpms_compile-main-empty-test-bar/src/test/java/bar/BarTests.java
@@ -19,15 +19,14 @@
 package bar;
 
 import javax.script.*;
+
 import org.junit.jupiter.api.*;
 
-class BarTests
-{
+class BarTests {
     @Test
-    void scripting() throws ScriptException
-    {
+    void scripting() throws ScriptException {
         ScriptEngineManager factory = new ScriptEngineManager();
-        ScriptEngine engine = factory.getEngineByName( "JavaScript" );
-        Assertions.assertDoesNotThrow​( () -> engine.eval( "print('Hello, World')" ), "Script evaluation failed!" );
+        ScriptEngine engine = factory.getEngineByName("JavaScript");
+        Assertions.assertDoesNotThrow(() -> engine.eval("print('Hello, World')"), "Script evaluation failed!");
     }
 }
diff --git a/src/it/jpms_compile-main-empty-test-bar/src/test/java/module-info.java b/src/it/jpms_compile-main-empty-test-bar/src/test/java/module-info.java
index ed157ad..5584043 100644
--- a/src/it/jpms_compile-main-empty-test-bar/src/test/java/module-info.java
+++ b/src/it/jpms_compile-main-empty-test-bar/src/test/java/module-info.java
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-open module bar
-{
+open module bar {
     requires java.scripting;
     requires org.junit.jupiter.api;
 }
diff --git a/src/it/jpms_compile-main-foo-test-bar/src/main/java/foo/Foo.java b/src/it/jpms_compile-main-foo-test-bar/src/main/java/foo/Foo.java
index efcf822..f361b01 100644
--- a/src/it/jpms_compile-main-foo-test-bar/src/main/java/foo/Foo.java
+++ b/src/it/jpms_compile-main-foo-test-bar/src/main/java/foo/Foo.java
@@ -16,15 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package foo;
 
 import org.apache.commons.lang3.*;
 
-public class Foo
-{
-    public Foo()
-    {
-        System.out.println( StringUtils.swapCase( "fOO" ) + " created!" );
+public class Foo {
+    public Foo() {
+        System.out.println(StringUtils.swapCase("fOO") + " created!");
     }
 }
diff --git a/src/it/jpms_compile-main-foo-test-bar/src/main/java/module-info.java b/src/it/jpms_compile-main-foo-test-bar/src/main/java/module-info.java
index ec0bd80..fd24faa 100644
--- a/src/it/jpms_compile-main-foo-test-bar/src/main/java/module-info.java
+++ b/src/it/jpms_compile-main-foo-test-bar/src/main/java/module-info.java
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-module foo
-{
+module foo {
     requires org.apache.commons.lang3;
+
     exports foo;
 }
diff --git a/src/it/jpms_compile-main-foo-test-bar/src/test/java/bar/BarTests.java b/src/it/jpms_compile-main-foo-test-bar/src/test/java/bar/BarTests.java
index 25d4819..60ba285 100644
--- a/src/it/jpms_compile-main-foo-test-bar/src/test/java/bar/BarTests.java
+++ b/src/it/jpms_compile-main-foo-test-bar/src/test/java/bar/BarTests.java
@@ -21,18 +21,15 @@ package bar;
 import foo.*;
 import org.junit.jupiter.api.*;
 
-class BarTests
-{
+class BarTests {
     @Test
-    void constructor()
-    {
-        Assertions.assertNotNull( new Foo() );
+    void constructor() {
+        Assertions.assertNotNull(new Foo());
     }
 
     @Test
-    void moduleNameIsFoo()
-    {
-        Assertions.assertTrue( Foo.class.getModule().isNamed(), "Foo resides in a named module" );
-        Assertions.assertEquals( "foo", Foo.class.getModule().getName() );
+    void moduleNameIsFoo() {
+        Assertions.assertTrue(Foo.class.getModule().isNamed(), "Foo resides in a named module");
+        Assertions.assertEquals("foo", Foo.class.getModule().getName());
     }
 }
diff --git a/src/it/jpms_compile-main-foo-test-bar/src/test/java/module-info.java b/src/it/jpms_compile-main-foo-test-bar/src/test/java/module-info.java
index ed971d4..9bd6f9c 100644
--- a/src/it/jpms_compile-main-foo-test-bar/src/test/java/module-info.java
+++ b/src/it/jpms_compile-main-foo-test-bar/src/test/java/module-info.java
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-open module bar
-{
+open module bar {
     requires foo;
     requires java.scripting;
     requires org.junit.jupiter.api;
diff --git a/src/it/jpms_compile-main-foo-test-foo/src/main/java/foo/Foo.java b/src/it/jpms_compile-main-foo-test-foo/src/main/java/foo/Foo.java
index 8d00c09..5e99dc2 100644
--- a/src/it/jpms_compile-main-foo-test-foo/src/main/java/foo/Foo.java
+++ b/src/it/jpms_compile-main-foo-test-foo/src/main/java/foo/Foo.java
@@ -16,15 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package foo;
 
 import org.apache.commons.lang3.*;
 
-class Foo
-{
-    Foo()
-    {
-        System.out.println( StringUtils.swapCase( "fOO" ) + " created!" );
+class Foo {
+    Foo() {
+        System.out.println(StringUtils.swapCase("fOO") + " created!");
     }
 }
diff --git a/src/it/jpms_compile-main-foo-test-foo/src/main/java/module-info.java b/src/it/jpms_compile-main-foo-test-foo/src/main/java/module-info.java
index dbd4fea..84db0b1 100644
--- a/src/it/jpms_compile-main-foo-test-foo/src/main/java/module-info.java
+++ b/src/it/jpms_compile-main-foo-test-foo/src/main/java/module-info.java
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-module foo
-{
+module foo {
     requires org.apache.commons.lang3;
 }
diff --git a/src/it/jpms_compile-main-foo-test-foo/src/test/java/foo/FooTests.java b/src/it/jpms_compile-main-foo-test-foo/src/test/java/foo/FooTests.java
index 78d1ae1..98fb088 100644
--- a/src/it/jpms_compile-main-foo-test-foo/src/test/java/foo/FooTests.java
+++ b/src/it/jpms_compile-main-foo-test-foo/src/test/java/foo/FooTests.java
@@ -20,18 +20,15 @@ package foo;
 
 import org.junit.jupiter.api.*;
 
-class FooTests
-{
+class FooTests {
     @Test
-    void constructor()
-    {
-        Assertions.assertNotNull( new Foo() );
+    void constructor() {
+        Assertions.assertNotNull(new Foo());
     }
 
     @Test
-    void moduleNameIsFoo()
-    {
-        Assertions.assertTrue( Foo.class.getModule().isNamed(), "Foo resides in a named module" );
-        Assertions.assertEquals( "foo", Foo.class.getModule().getName() );
+    void moduleNameIsFoo() {
+        Assertions.assertTrue(Foo.class.getModule().isNamed(), "Foo resides in a named module");
+        Assertions.assertEquals("foo", Foo.class.getModule().getName());
     }
 }
diff --git a/src/it/jpms_compile-main-foo-test-foo/src/test/java/module-info.java b/src/it/jpms_compile-main-foo-test-foo/src/test/java/module-info.java
index 1196f17..38ecd13 100644
--- a/src/it/jpms_compile-main-foo-test-foo/src/test/java/module-info.java
+++ b/src/it/jpms_compile-main-foo-test-foo/src/test/java/module-info.java
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-open module foo
-{
+open module foo {
     // main
     requires org.apache.commons.lang3;
 
diff --git a/src/it/jpms_patch-module/src/main/java/module-info.java b/src/it/jpms_patch-module/src/main/java/module-info.java
index c48284e..cfa968a 100644
--- a/src/it/jpms_patch-module/src/main/java/module-info.java
+++ b/src/it/jpms_patch-module/src/main/java/module-info.java
@@ -1,22 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module app 
-{
-        
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module app {}
diff --git a/src/it/jpms_patch-module/src/main/java/org/maven/test/Main.java b/src/it/jpms_patch-module/src/main/java/org/maven/test/Main.java
index 51d5c4a..8fab0b2 100644
--- a/src/it/jpms_patch-module/src/main/java/org/maven/test/Main.java
+++ b/src/it/jpms_patch-module/src/main/java/org/maven/test/Main.java
@@ -1,36 +1,33 @@
-package org.maven.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class Main {
-    
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-        try {
-            Class.forName( "jdk.internal.util.Preconditions" ).newInstance();    
-        }
-        catch ( Exception e  )
-        {
-            // noop
-        }
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.maven.test;
+
+public class Main {
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        try {
+            Class.forName("jdk.internal.util.Preconditions").newInstance();
+        } catch (Exception e) {
+            // noop
+        }
+    }
+}
diff --git a/src/it/jpms_patch-module/src/test/java/org/maven/test/MainTest.java b/src/it/jpms_patch-module/src/test/java/org/maven/test/MainTest.java
index a6fd3af..dbcfba6 100644
--- a/src/it/jpms_patch-module/src/test/java/org/maven/test/MainTest.java
+++ b/src/it/jpms_patch-module/src/test/java/org/maven/test/MainTest.java
@@ -1,30 +1,29 @@
-package org.maven.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class MainTest {
-    
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-        Main.main( args );
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.maven.test;
+
+public class MainTest {
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        Main.main(args);
+    }
+}
diff --git a/src/it/mcompiler-106/src/main/java/MyClass.java b/src/it/mcompiler-106/src/main/java/MyClass.java
index 90a9370..d4132bb 100644
--- a/src/it/mcompiler-106/src/main/java/MyClass.java
+++ b/src/it/mcompiler-106/src/main/java/MyClass.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,4 @@
  */
 package foo;
 
-public class MyClass
-{
-
-}
+public class MyClass {}
diff --git a/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java b/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java
index 695e93d..4298c7e 100644
--- a/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java
+++ b/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java
@@ -1,5 +1,3 @@
-package org.maven.test;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.maven.test;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,12 +16,11 @@ package org.maven.test;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.maven.test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-
-
 public class Main {
     /**
      * @param args
diff --git a/src/it/mcompiler-120/verify.groovy b/src/it/mcompiler-120/verify.groovy
index c04959f..cd6ef26 100644
--- a/src/it/mcompiler-120/verify.groovy
+++ b/src/it/mcompiler-120/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/mcompiler-135/src/main/java/MyClass.java b/src/it/mcompiler-135/src/main/java/MyClass.java
index 90a9370..d4132bb 100644
--- a/src/it/mcompiler-135/src/main/java/MyClass.java
+++ b/src/it/mcompiler-135/src/main/java/MyClass.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,4 @@
  */
 package foo;
 
-public class MyClass
-{
-
-}
+public class MyClass {}
diff --git a/src/it/mcompiler-179/src/main/java/org/maven/test/MyClass.java b/src/it/mcompiler-179/src/main/java/org/maven/test/MyClass.java
index bfa8aaf..386f9fe 100644
--- a/src/it/mcompiler-179/src/main/java/org/maven/test/MyClass.java
+++ b/src/it/mcompiler-179/src/main/java/org/maven/test/MyClass.java
@@ -1,5 +1,3 @@
-package org.maven.test;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -8,9 +6,9 @@ package org.maven.test;
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +16,7 @@ package org.maven.test;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.maven.test;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/it/mcompiler-182/src/main/java/BeanA.java b/src/it/mcompiler-182/src/main/java/BeanA.java
index aa6a35e..c53e6bd 100644
--- a/src/it/mcompiler-182/src/main/java/BeanA.java
+++ b/src/it/mcompiler-182/src/main/java/BeanA.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -23,7 +23,7 @@ package foo;
  */
 public class BeanA {
 
-    private int i,y;
+    private int i, y;
 
     public int getI() {
         return i;
diff --git a/src/it/mcompiler-182/src/main/java/BeanA2.java b/src/it/mcompiler-182/src/main/java/BeanA2.java
index 4273136..076a1fc 100644
--- a/src/it/mcompiler-182/src/main/java/BeanA2.java
+++ b/src/it/mcompiler-182/src/main/java/BeanA2.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/src/it/mcompiler-182/verify.groovy b/src/it/mcompiler-182/verify.groovy
index fdff21e..40cb317 100644
--- a/src/it/mcompiler-182/verify.groovy
+++ b/src/it/mcompiler-182/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/mcompiler-21_class-remove/src/main/java/BeanA.java b/src/it/mcompiler-21_class-remove/src/main/java/BeanA.java
index aa6a35e..c53e6bd 100644
--- a/src/it/mcompiler-21_class-remove/src/main/java/BeanA.java
+++ b/src/it/mcompiler-21_class-remove/src/main/java/BeanA.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -23,7 +23,7 @@ package foo;
  */
 public class BeanA {
 
-    private int i,y;
+    private int i, y;
 
     public int getI() {
         return i;
diff --git a/src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java b/src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java
index 4273136..076a1fc 100644
--- a/src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java
+++ b/src/it/mcompiler-21_class-remove/src/main/java/BeanA2.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/src/it/mcompiler-21_class-remove/verify.groovy b/src/it/mcompiler-21_class-remove/verify.groovy
index 306622d..3e4f8d1 100644
--- a/src/it/mcompiler-21_class-remove/verify.groovy
+++ b/src/it/mcompiler-21_class-remove/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java b/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java
index aa6a35e..c53e6bd 100644
--- a/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java
+++ b/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -23,7 +23,7 @@ package foo;
  */
 public class BeanA {
 
-    private int i,y;
+    private int i, y;
 
     public int getI() {
         return i;
diff --git a/src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java b/src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java
index 4273136..076a1fc 100644
--- a/src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java
+++ b/src/it/mcompiler-21_methodname-change/src/main/java/BeanA2.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/src/it/mcompiler-21_methodname-change/verify.groovy b/src/it/mcompiler-21_methodname-change/verify.groovy
index 306622d..3e4f8d1 100644
--- a/src/it/mcompiler-21_methodname-change/verify.groovy
+++ b/src/it/mcompiler-21_methodname-change/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/multirelease-patterns/multimodule/multirelease-base/src/main/java/base/Base.java b/src/it/multirelease-patterns/multimodule/multirelease-base/src/main/java/base/Base.java
index 513f909..19ec7d8 100644
--- a/src/it/multirelease-patterns/multimodule/multirelease-base/src/main/java/base/Base.java
+++ b/src/it/multirelease-patterns/multimodule/multirelease-base/src/main/java/base/Base.java
@@ -1,5 +1,3 @@
-package base;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package base;
  * specific language governing permissions and limitations
  * under the License.
  */
+package base;
 
 public class Base {
 
diff --git a/src/it/multirelease-patterns/multimodule/multirelease-base/src/main/java/mr/A.java b/src/it/multirelease-patterns/multimodule/multirelease-base/src/main/java/mr/A.java
index 6c2eb86..0e48eee 100644
--- a/src/it/multirelease-patterns/multimodule/multirelease-base/src/main/java/mr/A.java
+++ b/src/it/multirelease-patterns/multimodule/multirelease-base/src/main/java/mr/A.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,15 +16,15 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
 import base.Base;
 
-public class A implements I 
-{
+public class A implements I {
     public static String getString() {
         return Base.get() + " -> 8";
     }
-    
+
     @Override
     public Class<?> introducedClass() {
         return java.time.LocalDateTime.class;
diff --git a/src/it/multirelease-patterns/multimodule/multirelease-base/src/main/java/mr/I.java b/src/it/multirelease-patterns/multimodule/multirelease-base/src/main/java/mr/I.java
index f9858cf..a052326 100644
--- a/src/it/multirelease-patterns/multimodule/multirelease-base/src/main/java/mr/I.java
+++ b/src/it/multirelease-patterns/multimodule/multirelease-base/src/main/java/mr/I.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,8 +16,8 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
-public interface I
-{
+public interface I {
     Class<?> introducedClass();
-}
\ No newline at end of file
+}
diff --git a/src/it/multirelease-patterns/multimodule/multirelease-base/src/test/java/mr/ATest.java b/src/it/multirelease-patterns/multimodule/multirelease-base/src/test/java/mr/ATest.java
index cca7113..c5ba719 100644
--- a/src/it/multirelease-patterns/multimodule/multirelease-base/src/test/java/mr/ATest.java
+++ b/src/it/multirelease-patterns/multimodule/multirelease-base/src/test/java/mr/ATest.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,37 +16,35 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import static org.junit.Assert.assertThat;
-import static org.junit.Assume.assumeThat;
-import static org.hamcrest.CoreMatchers.is;
+package mr;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeThat;
+
 public class ATest {
-    
-    private static final String javaVersion = System.getProperty( "java.version" );
-    
+
+    private static final String javaVersion = System.getProperty("java.version");
+
     @Test
-    public void testGet8() throws Exception
-    {
-//        assumeThat( javaVersion, is( "8" ) );
-        
-        assertThat( A.getString(),  is( "BASE -> 8" ) );
+    public void testGet8() throws Exception {
+        //        assumeThat( javaVersion, is( "8" ) );
+
+        assertThat(A.getString(), is("BASE -> 8"));
 
-        assertThat( new A().introducedClass().getName(),  is( "java.time.LocalDateTime" ) );
+        assertThat(new A().introducedClass().getName(), is("java.time.LocalDateTime"));
     }
-    
+
     @Test
-    @Ignore( "Maven module only creates Java 8 classes" )
-    public void testGet9() throws Exception
-    {
-        assumeThat( javaVersion, is( "9" ) );
+    @Ignore("Maven module only creates Java 8 classes")
+    public void testGet9() throws Exception {
+        assumeThat(javaVersion, is("9"));
 
-        assertThat( A.getString(),  is( "BASE -> 9" ) );
+        assertThat(A.getString(), is("BASE -> 9"));
 
-        assertThat( new A().introducedClass().getName(),  is( "java.lang.Module" ) );
+        assertThat(new A().introducedClass().getName(), is("java.lang.Module"));
     }
-
-} 
\ No newline at end of file
+}
diff --git a/src/it/multirelease-patterns/multimodule/multirelease-nine/src/main/java/mr/A.java b/src/it/multirelease-patterns/multimodule/multirelease-nine/src/main/java/mr/A.java
index e2b9598..5083e1c 100644
--- a/src/it/multirelease-patterns/multimodule/multirelease-nine/src/main/java/mr/A.java
+++ b/src/it/multirelease-patterns/multimodule/multirelease-nine/src/main/java/mr/A.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,17 +16,17 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import base.Base;
+package mr;
 
 import java.util.Optional;
 
-public class A implements I
-{
+import base.Base;
+
+public class A implements I {
     public static String getString() {
-        return Base.get() + " -> " + Optional.of( "9" ).get();
+        return Base.get() + " -> " + Optional.of("9").get();
     }
-    
+
     @Override
     public Class<?> introducedClass() {
         return Module.class;
diff --git a/src/it/multirelease-patterns/multimodule/multirelease-nine/src/test/java/mr/ATest.java b/src/it/multirelease-patterns/multimodule/multirelease-nine/src/test/java/mr/ATest.java
index ef26fe6..c86fc46 100644
--- a/src/it/multirelease-patterns/multimodule/multirelease-nine/src/test/java/mr/ATest.java
+++ b/src/it/multirelease-patterns/multimodule/multirelease-nine/src/test/java/mr/ATest.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,37 +16,35 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import static org.junit.Assert.assertThat;
-import static org.junit.Assume.assumeThat;
-import static org.hamcrest.CoreMatchers.is;
+package mr;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeThat;
+
 public class ATest {
-    
-    private static final String javaVersion = System.getProperty( "java.version" );
-    
+
+    private static final String javaVersion = System.getProperty("java.version");
+
     @Test
-    @Ignore( "Maven module only creates Java 9 classes" )
-    public void testGet8() throws Exception
-    {
-        assumeThat( javaVersion, is( "8" ) );
-        
-        assertThat( A.getString(),  is( "BASE -> 8" ) );
-
-        assertThat( new A().introducedClass().getName(),  is( "java.time.LocalDateTime" ) );
+    @Ignore("Maven module only creates Java 9 classes")
+    public void testGet8() throws Exception {
+        assumeThat(javaVersion, is("8"));
+
+        assertThat(A.getString(), is("BASE -> 8"));
+
+        assertThat(new A().introducedClass().getName(), is("java.time.LocalDateTime"));
     }
-    
+
     @Test
-    public void testGet9() throws Exception
-    {
-//        assumeThat( javaVersion, is( "9" ) );
+    public void testGet9() throws Exception {
+        //        assumeThat( javaVersion, is( "9" ) );
 
-        assertThat( A.getString(),  is( "BASE -> 9" ) );
+        assertThat(A.getString(), is("BASE -> 9"));
 
-        assertThat( new A().introducedClass().getName(),  is( "java.lang.Module" ) );
+        assertThat(new A().introducedClass().getName(), is("java.lang.Module"));
     }
-
-} 
\ No newline at end of file
+}
diff --git a/src/it/multirelease-patterns/multiproject/multirelease-base/src/main/java/base/Base.java b/src/it/multirelease-patterns/multiproject/multirelease-base/src/main/java/base/Base.java
index 513f909..19ec7d8 100644
--- a/src/it/multirelease-patterns/multiproject/multirelease-base/src/main/java/base/Base.java
+++ b/src/it/multirelease-patterns/multiproject/multirelease-base/src/main/java/base/Base.java
@@ -1,5 +1,3 @@
-package base;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package base;
  * specific language governing permissions and limitations
  * under the License.
  */
+package base;
 
 public class Base {
 
diff --git a/src/it/multirelease-patterns/multiproject/multirelease-base/src/main/java/mr/A.java b/src/it/multirelease-patterns/multiproject/multirelease-base/src/main/java/mr/A.java
index 6c2eb86..0e48eee 100644
--- a/src/it/multirelease-patterns/multiproject/multirelease-base/src/main/java/mr/A.java
+++ b/src/it/multirelease-patterns/multiproject/multirelease-base/src/main/java/mr/A.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,15 +16,15 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
 import base.Base;
 
-public class A implements I 
-{
+public class A implements I {
     public static String getString() {
         return Base.get() + " -> 8";
     }
-    
+
     @Override
     public Class<?> introducedClass() {
         return java.time.LocalDateTime.class;
diff --git a/src/it/multirelease-patterns/multiproject/multirelease-base/src/main/java/mr/I.java b/src/it/multirelease-patterns/multiproject/multirelease-base/src/main/java/mr/I.java
index f9858cf..a052326 100644
--- a/src/it/multirelease-patterns/multiproject/multirelease-base/src/main/java/mr/I.java
+++ b/src/it/multirelease-patterns/multiproject/multirelease-base/src/main/java/mr/I.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,8 +16,8 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
-public interface I
-{
+public interface I {
     Class<?> introducedClass();
-}
\ No newline at end of file
+}
diff --git a/src/it/multirelease-patterns/multiproject/multirelease-base/src/test/java/mr/ATest.java b/src/it/multirelease-patterns/multiproject/multirelease-base/src/test/java/mr/ATest.java
index cca7113..c5ba719 100644
--- a/src/it/multirelease-patterns/multiproject/multirelease-base/src/test/java/mr/ATest.java
+++ b/src/it/multirelease-patterns/multiproject/multirelease-base/src/test/java/mr/ATest.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,37 +16,35 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import static org.junit.Assert.assertThat;
-import static org.junit.Assume.assumeThat;
-import static org.hamcrest.CoreMatchers.is;
+package mr;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeThat;
+
 public class ATest {
-    
-    private static final String javaVersion = System.getProperty( "java.version" );
-    
+
+    private static final String javaVersion = System.getProperty("java.version");
+
     @Test
-    public void testGet8() throws Exception
-    {
-//        assumeThat( javaVersion, is( "8" ) );
-        
-        assertThat( A.getString(),  is( "BASE -> 8" ) );
+    public void testGet8() throws Exception {
+        //        assumeThat( javaVersion, is( "8" ) );
+
+        assertThat(A.getString(), is("BASE -> 8"));
 
-        assertThat( new A().introducedClass().getName(),  is( "java.time.LocalDateTime" ) );
+        assertThat(new A().introducedClass().getName(), is("java.time.LocalDateTime"));
     }
-    
+
     @Test
-    @Ignore( "Maven module only creates Java 8 classes" )
-    public void testGet9() throws Exception
-    {
-        assumeThat( javaVersion, is( "9" ) );
+    @Ignore("Maven module only creates Java 8 classes")
+    public void testGet9() throws Exception {
+        assumeThat(javaVersion, is("9"));
 
-        assertThat( A.getString(),  is( "BASE -> 9" ) );
+        assertThat(A.getString(), is("BASE -> 9"));
 
-        assertThat( new A().introducedClass().getName(),  is( "java.lang.Module" ) );
+        assertThat(new A().introducedClass().getName(), is("java.lang.Module"));
     }
-
-} 
\ No newline at end of file
+}
diff --git a/src/it/multirelease-patterns/multiproject/multirelease-nine/src/main/java/mr/A.java b/src/it/multirelease-patterns/multiproject/multirelease-nine/src/main/java/mr/A.java
index e2b9598..5083e1c 100644
--- a/src/it/multirelease-patterns/multiproject/multirelease-nine/src/main/java/mr/A.java
+++ b/src/it/multirelease-patterns/multiproject/multirelease-nine/src/main/java/mr/A.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,17 +16,17 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import base.Base;
+package mr;
 
 import java.util.Optional;
 
-public class A implements I
-{
+import base.Base;
+
+public class A implements I {
     public static String getString() {
-        return Base.get() + " -> " + Optional.of( "9" ).get();
+        return Base.get() + " -> " + Optional.of("9").get();
     }
-    
+
     @Override
     public Class<?> introducedClass() {
         return Module.class;
diff --git a/src/it/multirelease-patterns/multiproject/multirelease-nine/src/test/java/mr/ATest.java b/src/it/multirelease-patterns/multiproject/multirelease-nine/src/test/java/mr/ATest.java
index ef26fe6..c86fc46 100644
--- a/src/it/multirelease-patterns/multiproject/multirelease-nine/src/test/java/mr/ATest.java
+++ b/src/it/multirelease-patterns/multiproject/multirelease-nine/src/test/java/mr/ATest.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,37 +16,35 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import static org.junit.Assert.assertThat;
-import static org.junit.Assume.assumeThat;
-import static org.hamcrest.CoreMatchers.is;
+package mr;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeThat;
+
 public class ATest {
-    
-    private static final String javaVersion = System.getProperty( "java.version" );
-    
+
+    private static final String javaVersion = System.getProperty("java.version");
+
     @Test
-    @Ignore( "Maven module only creates Java 9 classes" )
-    public void testGet8() throws Exception
-    {
-        assumeThat( javaVersion, is( "8" ) );
-        
-        assertThat( A.getString(),  is( "BASE -> 8" ) );
-
-        assertThat( new A().introducedClass().getName(),  is( "java.time.LocalDateTime" ) );
+    @Ignore("Maven module only creates Java 9 classes")
+    public void testGet8() throws Exception {
+        assumeThat(javaVersion, is("8"));
+
+        assertThat(A.getString(), is("BASE -> 8"));
+
+        assertThat(new A().introducedClass().getName(), is("java.time.LocalDateTime"));
     }
-    
+
     @Test
-    public void testGet9() throws Exception
-    {
-//        assumeThat( javaVersion, is( "9" ) );
+    public void testGet9() throws Exception {
+        //        assumeThat( javaVersion, is( "9" ) );
 
-        assertThat( A.getString(),  is( "BASE -> 9" ) );
+        assertThat(A.getString(), is("BASE -> 9"));
 
-        assertThat( new A().introducedClass().getName(),  is( "java.lang.Module" ) );
+        assertThat(new A().introducedClass().getName(), is("java.lang.Module"));
     }
-
-} 
\ No newline at end of file
+}
diff --git a/src/it/multirelease-patterns/packaging-plugin/src/main/java-mr/9/module-info.java b/src/it/multirelease-patterns/packaging-plugin/src/main/java-mr/9/module-info.java
index 2407e6b..36f00e0 100644
--- a/src/it/multirelease-patterns/packaging-plugin/src/main/java-mr/9/module-info.java
+++ b/src/it/multirelease-patterns/packaging-plugin/src/main/java-mr/9/module-info.java
@@ -16,8 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-module example.mrjar
-{
-  exports base;
-  exports mr;
+module example.mrjar {
+    exports base;
+    exports mr;
 }
diff --git a/src/it/multirelease-patterns/packaging-plugin/src/main/java-mr/9/mr/A.java b/src/it/multirelease-patterns/packaging-plugin/src/main/java-mr/9/mr/A.java
index e2b9598..5083e1c 100644
--- a/src/it/multirelease-patterns/packaging-plugin/src/main/java-mr/9/mr/A.java
+++ b/src/it/multirelease-patterns/packaging-plugin/src/main/java-mr/9/mr/A.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,17 +16,17 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import base.Base;
+package mr;
 
 import java.util.Optional;
 
-public class A implements I
-{
+import base.Base;
+
+public class A implements I {
     public static String getString() {
-        return Base.get() + " -> " + Optional.of( "9" ).get();
+        return Base.get() + " -> " + Optional.of("9").get();
     }
-    
+
     @Override
     public Class<?> introducedClass() {
         return Module.class;
diff --git a/src/it/multirelease-patterns/packaging-plugin/src/main/java/base/Base.java b/src/it/multirelease-patterns/packaging-plugin/src/main/java/base/Base.java
index 513f909..19ec7d8 100644
--- a/src/it/multirelease-patterns/packaging-plugin/src/main/java/base/Base.java
+++ b/src/it/multirelease-patterns/packaging-plugin/src/main/java/base/Base.java
@@ -1,5 +1,3 @@
-package base;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package base;
  * specific language governing permissions and limitations
  * under the License.
  */
+package base;
 
 public class Base {
 
diff --git a/src/it/multirelease-patterns/packaging-plugin/src/main/java/mr/A.java b/src/it/multirelease-patterns/packaging-plugin/src/main/java/mr/A.java
index 6c2eb86..0e48eee 100644
--- a/src/it/multirelease-patterns/packaging-plugin/src/main/java/mr/A.java
+++ b/src/it/multirelease-patterns/packaging-plugin/src/main/java/mr/A.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,15 +16,15 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
 import base.Base;
 
-public class A implements I 
-{
+public class A implements I {
     public static String getString() {
         return Base.get() + " -> 8";
     }
-    
+
     @Override
     public Class<?> introducedClass() {
         return java.time.LocalDateTime.class;
diff --git a/src/it/multirelease-patterns/packaging-plugin/src/main/java/mr/I.java b/src/it/multirelease-patterns/packaging-plugin/src/main/java/mr/I.java
index f9858cf..a052326 100644
--- a/src/it/multirelease-patterns/packaging-plugin/src/main/java/mr/I.java
+++ b/src/it/multirelease-patterns/packaging-plugin/src/main/java/mr/I.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,8 +16,8 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
-public interface I
-{
+public interface I {
     Class<?> introducedClass();
-}
\ No newline at end of file
+}
diff --git a/src/it/multirelease-patterns/packaging-plugin/src/test/java/mr/ATest.java b/src/it/multirelease-patterns/packaging-plugin/src/test/java/mr/ATest.java
index 07a207c..510fb1c 100644
--- a/src/it/multirelease-patterns/packaging-plugin/src/test/java/mr/ATest.java
+++ b/src/it/multirelease-patterns/packaging-plugin/src/test/java/mr/ATest.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,35 +16,33 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeThat;
-import static org.hamcrest.CoreMatchers.is;
-
-import org.junit.Test;
 
 public class ATest {
-    
-    private static final String javaVersion = System.getProperty( "java.version" );
-    
+
+    private static final String javaVersion = System.getProperty("java.version");
+
     @Test
-    public void testGet8() throws Exception
-    {
-        assumeThat( javaVersion, is( "8" ) );
-        
-        assertThat( A.getString(),  is( "BASE -> 8" ) );
+    public void testGet8() throws Exception {
+        assumeThat(javaVersion, is("8"));
 
-        assertThat( new A().introducedClass().getName(),  is( "java.time.LocalDateTime" ) );
+        assertThat(A.getString(), is("BASE -> 8"));
+
+        assertThat(new A().introducedClass().getName(), is("java.time.LocalDateTime"));
     }
-    
+
     @Test
-    public void testGet9() throws Exception
-    {
-        assumeThat( javaVersion, is( "9" ) );
+    public void testGet9() throws Exception {
+        assumeThat(javaVersion, is("9"));
 
-        assertThat( A.getString(),  is( "BASE -> 9" ) );
+        assertThat(A.getString(), is("BASE -> 9"));
 
-        assertThat( new A().introducedClass().getName(),  is( "java.lang.Module" ) );
+        assertThat(new A().introducedClass().getName(), is("java.lang.Module"));
     }
-
-} 
\ No newline at end of file
+}
diff --git a/src/it/multirelease-patterns/singleproject-runtime/src/main/java/base/Base.java b/src/it/multirelease-patterns/singleproject-runtime/src/main/java/base/Base.java
index 513f909..19ec7d8 100644
--- a/src/it/multirelease-patterns/singleproject-runtime/src/main/java/base/Base.java
+++ b/src/it/multirelease-patterns/singleproject-runtime/src/main/java/base/Base.java
@@ -1,5 +1,3 @@
-package base;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package base;
  * specific language governing permissions and limitations
  * under the License.
  */
+package base;
 
 public class Base {
 
diff --git a/src/it/multirelease-patterns/singleproject-runtime/src/main/java/mr/A.java b/src/it/multirelease-patterns/singleproject-runtime/src/main/java/mr/A.java
index 6c2eb86..0e48eee 100644
--- a/src/it/multirelease-patterns/singleproject-runtime/src/main/java/mr/A.java
+++ b/src/it/multirelease-patterns/singleproject-runtime/src/main/java/mr/A.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,15 +16,15 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
 import base.Base;
 
-public class A implements I 
-{
+public class A implements I {
     public static String getString() {
         return Base.get() + " -> 8";
     }
-    
+
     @Override
     public Class<?> introducedClass() {
         return java.time.LocalDateTime.class;
diff --git a/src/it/multirelease-patterns/singleproject-runtime/src/main/java/mr/I.java b/src/it/multirelease-patterns/singleproject-runtime/src/main/java/mr/I.java
index f9858cf..a052326 100644
--- a/src/it/multirelease-patterns/singleproject-runtime/src/main/java/mr/I.java
+++ b/src/it/multirelease-patterns/singleproject-runtime/src/main/java/mr/I.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,8 +16,8 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
-public interface I
-{
+public interface I {
     Class<?> introducedClass();
-}
\ No newline at end of file
+}
diff --git a/src/it/multirelease-patterns/singleproject-runtime/src/main/java9/module-info.java b/src/it/multirelease-patterns/singleproject-runtime/src/main/java9/module-info.java
index 2407e6b..36f00e0 100644
--- a/src/it/multirelease-patterns/singleproject-runtime/src/main/java9/module-info.java
+++ b/src/it/multirelease-patterns/singleproject-runtime/src/main/java9/module-info.java
@@ -16,8 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-module example.mrjar
-{
-  exports base;
-  exports mr;
+module example.mrjar {
+    exports base;
+    exports mr;
 }
diff --git a/src/it/multirelease-patterns/singleproject-runtime/src/main/java9/mr/A.java b/src/it/multirelease-patterns/singleproject-runtime/src/main/java9/mr/A.java
index e2b9598..5083e1c 100644
--- a/src/it/multirelease-patterns/singleproject-runtime/src/main/java9/mr/A.java
+++ b/src/it/multirelease-patterns/singleproject-runtime/src/main/java9/mr/A.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,17 +16,17 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import base.Base;
+package mr;
 
 import java.util.Optional;
 
-public class A implements I
-{
+import base.Base;
+
+public class A implements I {
     public static String getString() {
-        return Base.get() + " -> " + Optional.of( "9" ).get();
+        return Base.get() + " -> " + Optional.of("9").get();
     }
-    
+
     @Override
     public Class<?> introducedClass() {
         return Module.class;
diff --git a/src/it/multirelease-patterns/singleproject-runtime/src/test/java/mr/ATest.java b/src/it/multirelease-patterns/singleproject-runtime/src/test/java/mr/ATest.java
index 07a207c..510fb1c 100644
--- a/src/it/multirelease-patterns/singleproject-runtime/src/test/java/mr/ATest.java
+++ b/src/it/multirelease-patterns/singleproject-runtime/src/test/java/mr/ATest.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,35 +16,33 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeThat;
-import static org.hamcrest.CoreMatchers.is;
-
-import org.junit.Test;
 
 public class ATest {
-    
-    private static final String javaVersion = System.getProperty( "java.version" );
-    
+
+    private static final String javaVersion = System.getProperty("java.version");
+
     @Test
-    public void testGet8() throws Exception
-    {
-        assumeThat( javaVersion, is( "8" ) );
-        
-        assertThat( A.getString(),  is( "BASE -> 8" ) );
+    public void testGet8() throws Exception {
+        assumeThat(javaVersion, is("8"));
 
-        assertThat( new A().introducedClass().getName(),  is( "java.time.LocalDateTime" ) );
+        assertThat(A.getString(), is("BASE -> 8"));
+
+        assertThat(new A().introducedClass().getName(), is("java.time.LocalDateTime"));
     }
-    
+
     @Test
-    public void testGet9() throws Exception
-    {
-        assumeThat( javaVersion, is( "9" ) );
+    public void testGet9() throws Exception {
+        assumeThat(javaVersion, is("9"));
 
-        assertThat( A.getString(),  is( "BASE -> 9" ) );
+        assertThat(A.getString(), is("BASE -> 9"));
 
-        assertThat( new A().introducedClass().getName(),  is( "java.lang.Module" ) );
+        assertThat(new A().introducedClass().getName(), is("java.lang.Module"));
     }
-
-} 
\ No newline at end of file
+}
diff --git a/src/it/multirelease-patterns/singleproject-toolchains/src/main/java/base/Base.java b/src/it/multirelease-patterns/singleproject-toolchains/src/main/java/base/Base.java
index 513f909..19ec7d8 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/src/main/java/base/Base.java
+++ b/src/it/multirelease-patterns/singleproject-toolchains/src/main/java/base/Base.java
@@ -1,5 +1,3 @@
-package base;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package base;
  * specific language governing permissions and limitations
  * under the License.
  */
+package base;
 
 public class Base {
 
diff --git a/src/it/multirelease-patterns/singleproject-toolchains/src/main/java/mr/A.java b/src/it/multirelease-patterns/singleproject-toolchains/src/main/java/mr/A.java
index 6c2eb86..0e48eee 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/src/main/java/mr/A.java
+++ b/src/it/multirelease-patterns/singleproject-toolchains/src/main/java/mr/A.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,15 +16,15 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
 import base.Base;
 
-public class A implements I 
-{
+public class A implements I {
     public static String getString() {
         return Base.get() + " -> 8";
     }
-    
+
     @Override
     public Class<?> introducedClass() {
         return java.time.LocalDateTime.class;
diff --git a/src/it/multirelease-patterns/singleproject-toolchains/src/main/java/mr/I.java b/src/it/multirelease-patterns/singleproject-toolchains/src/main/java/mr/I.java
index f9858cf..a052326 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/src/main/java/mr/I.java
+++ b/src/it/multirelease-patterns/singleproject-toolchains/src/main/java/mr/I.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,8 +16,8 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
-public interface I
-{
+public interface I {
     Class<?> introducedClass();
-}
\ No newline at end of file
+}
diff --git a/src/it/multirelease-patterns/singleproject-toolchains/src/main/java9/module-info.java b/src/it/multirelease-patterns/singleproject-toolchains/src/main/java9/module-info.java
index 2407e6b..36f00e0 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/src/main/java9/module-info.java
+++ b/src/it/multirelease-patterns/singleproject-toolchains/src/main/java9/module-info.java
@@ -16,8 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-module example.mrjar
-{
-  exports base;
-  exports mr;
+module example.mrjar {
+    exports base;
+    exports mr;
 }
diff --git a/src/it/multirelease-patterns/singleproject-toolchains/src/main/java9/mr/A.java b/src/it/multirelease-patterns/singleproject-toolchains/src/main/java9/mr/A.java
index e2b9598..5083e1c 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/src/main/java9/mr/A.java
+++ b/src/it/multirelease-patterns/singleproject-toolchains/src/main/java9/mr/A.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,17 +16,17 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import base.Base;
+package mr;
 
 import java.util.Optional;
 
-public class A implements I
-{
+import base.Base;
+
+public class A implements I {
     public static String getString() {
-        return Base.get() + " -> " + Optional.of( "9" ).get();
+        return Base.get() + " -> " + Optional.of("9").get();
     }
-    
+
     @Override
     public Class<?> introducedClass() {
         return Module.class;
diff --git a/src/it/multirelease-patterns/singleproject-toolchains/src/test/java/mr/ATest.java b/src/it/multirelease-patterns/singleproject-toolchains/src/test/java/mr/ATest.java
index 07a207c..510fb1c 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/src/test/java/mr/ATest.java
+++ b/src/it/multirelease-patterns/singleproject-toolchains/src/test/java/mr/ATest.java
@@ -1,5 +1,3 @@
-package mr;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,35 +16,33 @@ package mr;
  * specific language governing permissions and limitations
  * under the License.
  */
+package mr;
 
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeThat;
-import static org.hamcrest.CoreMatchers.is;
-
-import org.junit.Test;
 
 public class ATest {
-    
-    private static final String javaVersion = System.getProperty( "java.version" );
-    
+
+    private static final String javaVersion = System.getProperty("java.version");
+
     @Test
-    public void testGet8() throws Exception
-    {
-        assumeThat( javaVersion, is( "8" ) );
-        
-        assertThat( A.getString(),  is( "BASE -> 8" ) );
+    public void testGet8() throws Exception {
+        assumeThat(javaVersion, is("8"));
 
-        assertThat( new A().introducedClass().getName(),  is( "java.time.LocalDateTime" ) );
+        assertThat(A.getString(), is("BASE -> 8"));
+
+        assertThat(new A().introducedClass().getName(), is("java.time.LocalDateTime"));
     }
-    
+
     @Test
-    public void testGet9() throws Exception
-    {
-        assumeThat( javaVersion, is( "9" ) );
+    public void testGet9() throws Exception {
+        assumeThat(javaVersion, is("9"));
 
-        assertThat( A.getString(),  is( "BASE -> 9" ) );
+        assertThat(A.getString(), is("BASE -> 9"));
 
-        assertThat( new A().introducedClass().getName(),  is( "java.lang.Module" ) );
+        assertThat(new A().introducedClass().getName(), is("java.lang.Module"));
     }
-
-} 
\ No newline at end of file
+}
diff --git a/src/it/non-english-warnings/src/main/java/MyClass.java b/src/it/non-english-warnings/src/main/java/MyClass.java
index 62c02ee..16ecae3 100644
--- a/src/it/non-english-warnings/src/main/java/MyClass.java
+++ b/src/it/non-english-warnings/src/main/java/MyClass.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,13 +18,10 @@
  */
 package foo;
 
-public class MyClass
-{
+public class MyClass {
 
-    public static void main( String[] args )
-    {
+    public static void main(String[] args) {
         // the date constructor is deprecated and will cause a warning
-        System.out.println( new java.util.Date( 2010, 8, 29 ) );
+        System.out.println(new java.util.Date(2010, 8, 29));
     }
-
 }
diff --git a/src/it/non-english-warnings/src/test/java/MyTest.java b/src/it/non-english-warnings/src/test/java/MyTest.java
index a51de2b..b9427e9 100644
--- a/src/it/non-english-warnings/src/test/java/MyTest.java
+++ b/src/it/non-english-warnings/src/test/java/MyTest.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,13 +18,10 @@
  */
 package foo;
 
-public class MyTest
-{
+public class MyTest {
 
-    public static void main( String[] args )
-    {
+    public static void main(String[] args) {
         // the date constructor is deprecated and will cause a warning
-        System.out.println( new java.util.Date( 2010, 8, 29 ) );
+        System.out.println(new java.util.Date(2010, 8, 29));
     }
-
 }
diff --git a/src/it/non-english-warnings/verify.bsh b/src/it/non-english-warnings/verify.bsh
index 919db9d..db16270 100644
--- a/src/it/non-english-warnings/verify.bsh
+++ b/src/it/non-english-warnings/verify.bsh
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package foo;
 
 import java.io.*;
 import java.util.*;
diff --git a/src/it/setup_annotation-verify-plugin/src/main/java/org.apache.maven.plugins.compiler.it/SourcePathReadGoal.java b/src/it/setup_annotation-verify-plugin/src/main/java/org.apache.maven.plugins.compiler.it/SourcePathReadGoal.java
index 668809a..46b7d2b 100644
--- a/src/it/setup_annotation-verify-plugin/src/main/java/org.apache.maven.plugins.compiler.it/SourcePathReadGoal.java
+++ b/src/it/setup_annotation-verify-plugin/src/main/java/org.apache.maven.plugins.compiler.it/SourcePathReadGoal.java
@@ -1,4 +1,3 @@
-package org.apache.maven.plugins.compiler.it;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,25 +16,23 @@ package org.apache.maven.plugins.compiler.it;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.plugins.compiler.it;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.List;
-import java.util.StringJoiner;
 
 import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 
-@Mojo( name = "read-source", defaultPhase = LifecyclePhase.PROCESS_TEST_CLASSES )
-public class SourcePathReadGoal
-    extends AbstractMojo
-{
+@Mojo(name = "read-source", defaultPhase = LifecyclePhase.PROCESS_TEST_CLASSES)
+public class SourcePathReadGoal extends AbstractMojo {
 
     @Parameter
     protected String sourceClass;
@@ -43,62 +40,49 @@ public class SourcePathReadGoal
     @Parameter
     protected String testSourceClass;
 
-    @Parameter( defaultValue = "${project}" )
+    @Parameter(defaultValue = "${project}")
     protected MavenProject project;
 
-    @SuppressWarnings( "unchecked" )
-    public void execute()
-        throws MojoExecutionException, MojoFailureException
-    {
-        if ( sourceClass != null )
-        {
-            getLog().info( "Checking compile source roots for: '" + sourceClass + "'" );
-            assertGeneratedSourceFileFor( sourceClass, project.getCompileSourceRoots() );
+    @SuppressWarnings("unchecked")
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (sourceClass != null) {
+            getLog().info("Checking compile source roots for: '" + sourceClass + "'");
+            assertGeneratedSourceFileFor(sourceClass, project.getCompileSourceRoots());
         }
 
-        if ( testSourceClass != null )
-        {
-            getLog().info( "Checking test-compile source roots for: '" + testSourceClass + "'" );
-            assertGeneratedSourceFileFor( testSourceClass, project.getTestCompileSourceRoots() );
+        if (testSourceClass != null) {
+            getLog().info("Checking test-compile source roots for: '" + testSourceClass + "'");
+            assertGeneratedSourceFileFor(testSourceClass, project.getTestCompileSourceRoots());
         }
     }
 
-    private void assertGeneratedSourceFileFor( String sourceClass, List<String> sourceRoots )
-        throws MojoFailureException, MojoExecutionException
-    {
-        String sourceFile = sourceClass.replace( '.', '/' )
-                                       .concat( ".txt" );
+    private void assertGeneratedSourceFileFor(String sourceClass, List<String> sourceRoots)
+            throws MojoFailureException, MojoExecutionException {
+        String sourceFile = sourceClass.replace('.', '/').concat(".txt");
 
         boolean found = false;
-        for ( String root : sourceRoots )
-        {
-            File f = new File( root, sourceFile );
-            getLog().info( "Looking for: " + f );
-            if ( f.exists() )
-            {
-                try
-                {
-                    String[] nameParts = sourceClass.split( "\\." );
-                    String content = new String( Files.readAllBytes( f.toPath() ) );
-                    if ( !nameParts[nameParts.length-1].equals( content ) )
-                    {
-                        throw new MojoFailureException( "Non-matching content in: " + f + "\n  expected: '"
-                            + sourceClass + "'\n  found: '" + content + "'" );
+        for (String root : sourceRoots) {
+            File f = new File(root, sourceFile);
+            getLog().info("Looking for: " + f);
+            if (f.exists()) {
+                try {
+                    String[] nameParts = sourceClass.split("\\.");
+                    String content = new String(Files.readAllBytes(f.toPath()));
+                    if (!nameParts[nameParts.length - 1].equals(content)) {
+                        throw new MojoFailureException("Non-matching content in: " + f + "\n  expected: '" + sourceClass
+                                + "'\n  found: '" + content + "'");
                     }
                     found = true;
                     break;
-                }
-                catch ( IOException e )
-                {
-                    throw new MojoExecutionException( "Cannot read contents of: " + f, e );
+                } catch (IOException e) {
+                    throw new MojoExecutionException("Cannot read contents of: " + f, e);
                 }
             }
         }
 
-        if ( !found )
-        {
-            throw new MojoFailureException( "Cannot find generated source file: " + sourceFile + " in:\n  "
-                + String.join( "\n  ", sourceRoots ) );
+        if (!found) {
+            throw new MojoFailureException(
+                    "Cannot find generated source file: " + sourceFile + " in:\n  " + String.join("\n  ", sourceRoots));
         }
     }
 }
diff --git a/src/it/setup_jar_automodule/src/main/java/com/ta3/MyClass.java b/src/it/setup_jar_automodule/src/main/java/com/ta3/MyClass.java
index e6cbd8b..728c244 100644
--- a/src/it/setup_jar_automodule/src/main/java/com/ta3/MyClass.java
+++ b/src/it/setup_jar_automodule/src/main/java/com/ta3/MyClass.java
@@ -1,25 +1,21 @@
-package com.ta3;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class MyClass
-{
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.ta3;
+
+public class MyClass {}
diff --git a/src/it/setup_jar_module/src/main/java/com/ta2/MyClass.java b/src/it/setup_jar_module/src/main/java/com/ta2/MyClass.java
index 4309cae..5d1cc1f 100644
--- a/src/it/setup_jar_module/src/main/java/com/ta2/MyClass.java
+++ b/src/it/setup_jar_module/src/main/java/com/ta2/MyClass.java
@@ -1,25 +1,21 @@
-package com.ta2;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class MyClass
-{
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.ta2;
+
+public class MyClass {}
diff --git a/src/it/setup_jar_module/src/main/java/module-info.java b/src/it/setup_jar_module/src/main/java/module-info.java
index 8567718..11a0062 100644
--- a/src/it/setup_jar_module/src/main/java/module-info.java
+++ b/src/it/setup_jar_module/src/main/java/module-info.java
@@ -1,24 +1,22 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module ta2 {
-    
-    exports com.ta2;
-    
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module ta2 {
+    exports com.ta2;
+}
diff --git a/src/it/setup_x/setup_jar_classic/src/main/java/com/ta2/MyClass.java b/src/it/setup_x/setup_jar_classic/src/main/java/com/ta2/MyClass.java
index 4309cae..5d1cc1f 100644
--- a/src/it/setup_x/setup_jar_classic/src/main/java/com/ta2/MyClass.java
+++ b/src/it/setup_x/setup_jar_classic/src/main/java/com/ta2/MyClass.java
@@ -1,25 +1,21 @@
-package com.ta2;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class MyClass
-{
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.ta2;
+
+public class MyClass {}
diff --git a/src/it/setup_x/setup_module-transitive/src/main/java/com/ta2/plus/MyClass.java b/src/it/setup_x/setup_module-transitive/src/main/java/com/ta2/plus/MyClass.java
index ce9abfe..2ec4f19 100644
--- a/src/it/setup_x/setup_module-transitive/src/main/java/com/ta2/plus/MyClass.java
+++ b/src/it/setup_x/setup_module-transitive/src/main/java/com/ta2/plus/MyClass.java
@@ -1,25 +1,21 @@
-package com.ta2.plus;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class MyClass
-{
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.ta2.plus;
+
+public class MyClass {}
diff --git a/src/it/setup_x/setup_module-transitive/src/main/java/module-info.java b/src/it/setup_x/setup_module-transitive/src/main/java/module-info.java
index 642a635..bf7ff9d 100644
--- a/src/it/setup_x/setup_module-transitive/src/main/java/module-info.java
+++ b/src/it/setup_x/setup_module-transitive/src/main/java/module-info.java
@@ -1,24 +1,22 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module ta2.plus {
-    
-    exports com.ta2.plus;
-    
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module ta2.plus {
+    exports com.ta2.plus;
+}
diff --git a/src/it/test1/src/main/java/MyClass.java b/src/it/test1/src/main/java/MyClass.java
index 90a9370..d4132bb 100644
--- a/src/it/test1/src/main/java/MyClass.java
+++ b/src/it/test1/src/main/java/MyClass.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,4 @@
  */
 package foo;
 
-public class MyClass
-{
-
-}
+public class MyClass {}
diff --git a/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
index 03cd6af..b199e24 100644
--- a/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.compiler;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.compiler;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.plugin.compiler;
 
 import java.io.File;
 import java.io.IOException;
@@ -98,10 +97,8 @@ import org.objectweb.asm.Opcodes;
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @since 2.0
  */
-public abstract class AbstractCompilerMojo
-    extends AbstractMojo
-{
-    protected static final String PS = System.getProperty( "path.separator" );
+public abstract class AbstractCompilerMojo extends AbstractMojo {
+    protected static final String PS = System.getProperty("path.separator");
 
     private static final String INPUT_FILES_LST_FILENAME = "inputFiles.lst";
 
@@ -111,7 +108,7 @@ public abstract class AbstractCompilerMojo
 
     // Used to compare with older targets
     static final String MODULE_INFO_TARGET = "1.9";
-    
+
     // ----------------------------------------------------------------------
     // Configurables
     // ----------------------------------------------------------------------
@@ -121,48 +118,47 @@ public abstract class AbstractCompilerMojo
      *
      * @since 2.0.2
      */
-    @Parameter( property = "maven.compiler.failOnError", defaultValue = "true" )
+    @Parameter(property = "maven.compiler.failOnError", defaultValue = "true")
     private boolean failOnError = true;
-    
+
     /**
      * Indicates whether the build will continue even if there are compilation warnings.
      *
      * @since 3.6
      */
-    @Parameter( property = "maven.compiler.failOnWarning", defaultValue = "false" )
-    private boolean failOnWarning;  
+    @Parameter(property = "maven.compiler.failOnWarning", defaultValue = "false")
+    private boolean failOnWarning;
 
     /**
      * Set to <code>true</code> to include debugging information in the compiled class files.
      */
-    @Parameter( property = "maven.compiler.debug", defaultValue = "true" )
+    @Parameter(property = "maven.compiler.debug", defaultValue = "true")
     private boolean debug = true;
 
     /**
      * Set to <code>true</code> to generate metadata for reflection on method parameters.
      * @since 3.6.2
      */
-    @Parameter( property = "maven.compiler.parameters", defaultValue = "false" )
+    @Parameter(property = "maven.compiler.parameters", defaultValue = "false")
     private boolean parameters;
 
-
     /**
      * Set to <code>true</code> to Enable preview language features of the java compiler
      * @since 3.10.1
      */
-    @Parameter( property = "maven.compiler.enablePreview", defaultValue = "false" )
+    @Parameter(property = "maven.compiler.enablePreview", defaultValue = "false")
     private boolean enablePreview;
 
     /**
      * Set to <code>true</code> to show messages about what the compiler is doing.
      */
-    @Parameter( property = "maven.compiler.verbose", defaultValue = "false" )
+    @Parameter(property = "maven.compiler.verbose", defaultValue = "false")
     private boolean verbose;
 
     /**
      * Sets whether to show source locations where deprecated APIs are used.
      */
-    @Parameter( property = "maven.compiler.showDeprecation", defaultValue = "false" )
+    @Parameter(property = "maven.compiler.showDeprecation", defaultValue = "false")
     private boolean showDeprecation;
 
     /**
@@ -170,13 +166,13 @@ public abstract class AbstractCompilerMojo
      * @deprecated This property is a no-op in {@code javac}.
      */
     @Deprecated
-    @Parameter( property = "maven.compiler.optimize", defaultValue = "false" )
+    @Parameter(property = "maven.compiler.optimize", defaultValue = "false")
     private boolean optimize;
 
     /**
      * Set to <code>false</code> to disable warnings during compilation.
      */
-    @Parameter( property = "maven.compiler.showWarnings", defaultValue = "true" )
+    @Parameter(property = "maven.compiler.showWarnings", defaultValue = "true")
     private boolean showWarnings;
 
     /**
@@ -187,7 +183,7 @@ public abstract class AbstractCompilerMojo
      * <p>Since 3.9.0 the default value has changed from 1.6 to 1.7</p>
      * <p>Since 3.11.0 the default value has changed from 1.7 to 1.8</p>
      */
-    @Parameter( property = "maven.compiler.source", defaultValue = DEFAULT_SOURCE )
+    @Parameter(property = "maven.compiler.source", defaultValue = DEFAULT_SOURCE)
     protected String source;
 
     /**
@@ -198,50 +194,50 @@ public abstract class AbstractCompilerMojo
      * <p>Since 3.9.0 the default value has changed from 1.6 to 1.7</p>
      * <p>Since 3.11.0 the default value has changed from 1.7 to 1.8</p>
      */
-    @Parameter( property = "maven.compiler.target", defaultValue = DEFAULT_TARGET )
+    @Parameter(property = "maven.compiler.target", defaultValue = DEFAULT_TARGET)
     protected String target;
 
     /**
      * The -release argument for the Java compiler, supported since Java9
-     * 
+     *
      * @since 3.6
      */
-    @Parameter( property = "maven.compiler.release" )
+    @Parameter(property = "maven.compiler.release")
     protected String release;
-    
+
     /**
      * The -encoding argument for the Java compiler.
      *
      * @since 2.1
      */
-    @Parameter( property = "encoding", defaultValue = "${project.build.sourceEncoding}" )
+    @Parameter(property = "encoding", defaultValue = "${project.build.sourceEncoding}")
     private String encoding;
 
     /**
      * Sets the granularity in milliseconds of the last modification
      * date for testing whether a source needs recompilation.
      */
-    @Parameter( property = "lastModGranularityMs", defaultValue = "0" )
+    @Parameter(property = "lastModGranularityMs", defaultValue = "0")
     private int staleMillis;
 
     /**
      * The compiler id of the compiler to use. See this
      * <a href="non-javac-compilers.html">guide</a> for more information.
      */
-    @Parameter( property = "maven.compiler.compilerId", defaultValue = "javac" )
+    @Parameter(property = "maven.compiler.compilerId", defaultValue = "javac")
     private String compilerId;
 
     /**
      * Version of the compiler to use, ex. "1.3", "1.5", if {@link #fork} is set to <code>true</code>.
      */
-    @Parameter( property = "maven.compiler.compilerVersion" )
+    @Parameter(property = "maven.compiler.compilerVersion")
     private String compilerVersion;
 
     /**
      * Allows running the compiler in a separate process.
      * If <code>false</code> it uses the built in compiler, while if <code>true</code> it will use an executable.
      */
-    @Parameter( property = "maven.compiler.fork", defaultValue = "false" )
+    @Parameter(property = "maven.compiler.fork", defaultValue = "false")
     private boolean fork;
 
     /**
@@ -250,7 +246,7 @@ public abstract class AbstractCompilerMojo
      *
      * @since 2.0.1
      */
-    @Parameter( property = "maven.compiler.meminitial" )
+    @Parameter(property = "maven.compiler.meminitial")
     private String meminitial;
 
     /**
@@ -259,13 +255,13 @@ public abstract class AbstractCompilerMojo
      *
      * @since 2.0.1
      */
-    @Parameter( property = "maven.compiler.maxmem" )
+    @Parameter(property = "maven.compiler.maxmem")
     private String maxmem;
 
     /**
      * Sets the executable of the compiler to use when {@link #fork} is <code>true</code>.
      */
-    @Parameter( property = "maven.compiler.executable" )
+    @Parameter(property = "maven.compiler.executable")
     private String executable;
 
     /**
@@ -408,7 +404,7 @@ public abstract class AbstractCompilerMojo
      *
      * @since 2.1
      */
-    @Parameter( property = "maven.compiler.debuglevel" )
+    @Parameter(property = "maven.compiler.debuglevel")
     private String debuglevel;
 
     /**
@@ -416,7 +412,7 @@ public abstract class AbstractCompilerMojo
      *
      * @since 3.10.2
      */
-    @Parameter( property = "maven.compiler.implicit" )
+    @Parameter(property = "maven.compiler.implicit")
     private String implicit;
 
     /**
@@ -433,7 +429,7 @@ public abstract class AbstractCompilerMojo
      * </p>
      * (see <a href="https://maven.apache.org/guides/mini/guide-using-toolchains.html"> Guide to Toolchains</a> for more
      * info)
-     * 
+     *
      * <pre>
      * &lt;configuration&gt;
      *   &lt;jdkToolchain&gt;
@@ -451,7 +447,7 @@ public abstract class AbstractCompilerMojo
      * &lt;/configuration&gt;
      * </pre>
      * <strong>note:</strong> requires at least Maven 3.3.1
-     * 
+     *
      * @since 3.6
      */
     @Parameter
@@ -464,13 +460,13 @@ public abstract class AbstractCompilerMojo
     /**
      * The directory to run the compiler from if fork is true.
      */
-    @Parameter( defaultValue = "${basedir}", required = true, readonly = true )
+    @Parameter(defaultValue = "${basedir}", required = true, readonly = true)
     private File basedir;
 
     /**
      * The target directory of the compiler if fork is true.
      */
-    @Parameter( defaultValue = "${project.build.directory}", required = true, readonly = true )
+    @Parameter(defaultValue = "${project.build.directory}", required = true, readonly = true)
     private File buildDirectory;
 
     /**
@@ -482,14 +478,14 @@ public abstract class AbstractCompilerMojo
     /**
      * The current build session instance. This is used for toolchain manager API calls.
      */
-    @Parameter( defaultValue = "${session}", readonly = true, required = true )
+    @Parameter(defaultValue = "${session}", readonly = true, required = true)
     private MavenSession session;
 
     /**
      * The current project instance. This is used for propagating generated-sources paths as compile/testCompile source
      * roots.
      */
-    @Parameter( defaultValue = "${project}", readonly = true, required = true )
+    @Parameter(defaultValue = "${project}", readonly = true, required = true)
     private MavenProject project;
 
     /**
@@ -505,13 +501,13 @@ public abstract class AbstractCompilerMojo
      *
      * @since 2.5
      */
-    @Parameter( defaultValue = "${reuseCreated}", property = "maven.compiler.compilerReuseStrategy" )
+    @Parameter(defaultValue = "${reuseCreated}", property = "maven.compiler.compilerReuseStrategy")
     private String compilerReuseStrategy = "reuseCreated";
 
     /**
      * @since 2.5
      */
-    @Parameter( defaultValue = "false", property = "maven.compiler.skipMultiThreadWarning" )
+    @Parameter(defaultValue = "false", property = "maven.compiler.skipMultiThreadWarning")
     private boolean skipMultiThreadWarning;
 
     /**
@@ -520,13 +516,13 @@ public abstract class AbstractCompilerMojo
      *
      * @since 3.0
      */
-    @Parameter( defaultValue = "false", property = "maven.compiler.forceJavacCompilerUse" )
+    @Parameter(defaultValue = "false", property = "maven.compiler.forceJavacCompilerUse")
     private boolean forceJavacCompilerUse;
 
     /**
      * @since 3.0 needed for storing the status for the incremental build support.
      */
-    @Parameter( defaultValue = "${mojoExecution}", readonly = true, required = true )
+    @Parameter(defaultValue = "${mojoExecution}", readonly = true, required = true)
     private MojoExecution mojoExecution;
 
     /**
@@ -554,7 +550,7 @@ public abstract class AbstractCompilerMojo
      *
      * @since 3.1
      */
-    @Parameter( defaultValue = "true", property = "maven.compiler.useIncrementalCompilation" )
+    @Parameter(defaultValue = "true", property = "maven.compiler.useIncrementalCompilation")
     private boolean useIncrementalCompilation = true;
 
     /**
@@ -566,10 +562,10 @@ public abstract class AbstractCompilerMojo
      *
      * @since 3.10
      */
-    @Parameter( defaultValue = "true", property = "maven.compiler.createMissingPackageInfoClass" )
+    @Parameter(defaultValue = "true", property = "maven.compiler.createMissingPackageInfoClass")
     private boolean createMissingPackageInfoClass = true;
 
-    @Parameter( defaultValue = "false", property = "maven.compiler.showCompilationChanges" )
+    @Parameter(defaultValue = "false", property = "maven.compiler.showCompilationChanges")
     private boolean showCompilationChanges = false;
     /**
      * Resolves the artifacts needed.
@@ -583,9 +579,9 @@ public abstract class AbstractCompilerMojo
     @Component
     private ArtifactHandlerManager artifactHandlerManager;
 
-    protected abstract SourceInclusionScanner getSourceInclusionScanner( int staleMillis );
+    protected abstract SourceInclusionScanner getSourceInclusionScanner(int staleMillis);
 
-    protected abstract SourceInclusionScanner getSourceInclusionScanner( String inputFileEnding );
+    protected abstract SourceInclusionScanner getSourceInclusionScanner(String inputFileEnding);
 
     protected abstract List<String> getClasspathElements();
 
@@ -594,8 +590,8 @@ public abstract class AbstractCompilerMojo
     protected abstract Map<String, JavaModuleDescriptor> getPathElements();
 
     protected abstract List<String> getCompileSourceRoots();
-    
-    protected abstract void preparePaths( Set<File> sourceFiles );
+
+    protected abstract void preparePaths(Set<File> sourceFiles);
 
     protected abstract File getOutputDirectory();
 
@@ -613,17 +609,14 @@ public abstract class AbstractCompilerMojo
 
     protected abstract String getDebugFileName();
 
-    protected final MavenProject getProject()
-    {
+    protected final MavenProject getProject() {
         return project;
     }
 
     private boolean targetOrReleaseSet;
 
     @Override
-    public void execute()
-        throws MojoExecutionException, CompilationFailureException
-    {
+    public void execute() throws MojoExecutionException, CompilationFailureException {
         // ----------------------------------------------------------------------
         // Look up the compiler. This is done before other code than can
         // cause the mojo to return before the lookup is done possibly resulting
@@ -632,57 +625,50 @@ public abstract class AbstractCompilerMojo
 
         Compiler compiler;
 
-        getLog().debug( "Using compiler '" + compilerId + "'." );
+        getLog().debug("Using compiler '" + compilerId + "'.");
 
-        try
-        {
-            compiler = compilerManager.getCompiler( compilerId );
-        }
-        catch ( NoSuchCompilerException e )
-        {
-            throw new MojoExecutionException( "No such compiler '" + e.getCompilerId() + "'." );
+        try {
+            compiler = compilerManager.getCompiler(compilerId);
+        } catch (NoSuchCompilerException e) {
+            throw new MojoExecutionException("No such compiler '" + e.getCompilerId() + "'.");
         }
 
-        //-----------toolchains start here ----------------------------------
-        //use the compilerId as identifier for toolchains as well.
+        // -----------toolchains start here ----------------------------------
+        // use the compilerId as identifier for toolchains as well.
         Toolchain tc = getToolchain();
-        if ( tc != null )
-        {
-            getLog().info( "Toolchain in maven-compiler-plugin: " + tc );
-            if ( executable != null )
-            {
-                getLog().warn( "Toolchains are ignored, 'executable' parameter is set to " + executable );
-            }
-            else
-            {
+        if (tc != null) {
+            getLog().info("Toolchain in maven-compiler-plugin: " + tc);
+            if (executable != null) {
+                getLog().warn("Toolchains are ignored, 'executable' parameter is set to " + executable);
+            } else {
                 fork = true;
-                //TODO somehow shaky dependency between compilerId and tool executable.
-                executable = tc.findTool( compilerId );
+                // TODO somehow shaky dependency between compilerId and tool executable.
+                executable = tc.findTool(compilerId);
... 4959 lines suppressed ...