diff --git a/pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyLanguage.java b/pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyLanguage.java
index f3dfa4c6ed..5fca5f9346 100644
--- a/pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyLanguage.java
+++ b/pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyLanguage.java
@@ -1,6 +1,7 @@
 /**
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
+
 package net.sourceforge.pmd.cpd;
 
 /**
diff --git a/pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyTokenizer.java b/pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyTokenizer.java
index ed706483cf..34eec4ef87 100644
--- a/pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyTokenizer.java
+++ b/pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyTokenizer.java
@@ -1,15 +1,17 @@
 /**
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
+
 package net.sourceforge.pmd.cpd;
 
 import org.apache.commons.io.IOUtils;
 import org.codehaus.groovy.antlr.parser.GroovyLexer;
 
+import net.sourceforge.pmd.lang.ast.TokenMgrError;
+
 import groovyjarjarantlr.Token;
 import groovyjarjarantlr.TokenStream;
 import groovyjarjarantlr.TokenStreamException;
-import net.sourceforge.pmd.lang.ast.TokenMgrError;
 
 /**
  * The Grooovy Tokenizer
@@ -22,23 +24,23 @@ public class GroovyTokenizer implements Tokenizer {
 
         GroovyLexer lexer = new GroovyLexer(IOUtils.toInputStream(buffer.toString()));
         TokenStream tokenStream = lexer.plumb();
-        
+
         try {
             Token token = tokenStream.nextToken();
 
             while (token.getType() != Token.EOF_TYPE) {
-                TokenEntry tokenEntry =
-                        new TokenEntry(token.getText(), sourceCode.getFileName(), token.getLine());
+                TokenEntry tokenEntry = new TokenEntry(token.getText(), sourceCode.getFileName(), token.getLine());
 
                 tokenEntries.add(tokenEntry);
                 token = tokenStream.nextToken();
             }
         } catch (TokenStreamException err) {
-            // Wrap exceptions of the Groovy tokenizer in a TokenMgrError, so they are correctly handled
-            // when CPD is executed with the '--skipLexicalErrors' command line option
-            throw new TokenMgrError(
-                    "Lexical error in file " + sourceCode.getFileName() + " at line " +
-                    lexer.getLine() + ", column " + lexer.getColumn() + ".  Encountered: " + err.getMessage(),
+            // Wrap exceptions of the Groovy tokenizer in a TokenMgrError, so
+            // they are correctly handled
+            // when CPD is executed with the '--skipLexicalErrors' command line
+            // option
+            throw new TokenMgrError("Lexical error in file " + sourceCode.getFileName() + " at line " + lexer.getLine()
+                    + ", column " + lexer.getColumn() + ".  Encountered: " + err.getMessage(),
                     TokenMgrError.LEXICAL_ERROR);
         } finally {
             tokenEntries.add(TokenEntry.getEOF());
diff --git a/pmd-groovy/src/main/java/net/sourceforge/pmd/lang/groovy/GroovyLanguageModule.java b/pmd-groovy/src/main/java/net/sourceforge/pmd/lang/groovy/GroovyLanguageModule.java
index de5ce1311c..95ddc5870b 100644
--- a/pmd-groovy/src/main/java/net/sourceforge/pmd/lang/groovy/GroovyLanguageModule.java
+++ b/pmd-groovy/src/main/java/net/sourceforge/pmd/lang/groovy/GroovyLanguageModule.java
@@ -1,6 +1,7 @@
 /**
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
+
 package net.sourceforge.pmd.lang.groovy;
 
 import net.sourceforge.pmd.lang.BaseLanguageModule;
diff --git a/pmd-groovy/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java b/pmd-groovy/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java
index 8d48fcfd38..48b1486ac4 100644
--- a/pmd-groovy/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java
+++ b/pmd-groovy/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java
@@ -1,17 +1,18 @@
 /**
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
+
 package net.sourceforge.pmd;
 
 import java.util.Arrays;
 import java.util.Collection;
 
+import org.junit.runners.Parameterized.Parameters;
+
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.groovy.GroovyLanguageModule;
 
-import org.junit.runners.Parameterized.Parameters;
-
 public class LanguageVersionTest extends AbstractLanguageVersionTest {
 
     public LanguageVersionTest(String name, String terseName, String version, LanguageVersion expected) {
@@ -21,7 +22,12 @@ public class LanguageVersionTest extends AbstractLanguageVersionTest {
     @Parameters
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][] {
-                { GroovyLanguageModule.NAME, GroovyLanguageModule.TERSE_NAME, "", LanguageRegistry.getLanguage(GroovyLanguageModule.NAME).getDefaultVersion() }
-            });
+            {
+                GroovyLanguageModule.NAME,
+                GroovyLanguageModule.TERSE_NAME,
+                "",
+                LanguageRegistry.getLanguage(GroovyLanguageModule.NAME).getDefaultVersion(),
+            },
+        });
     }
 }
diff --git a/pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java b/pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java
index 28db9abeb8..8c4e840354 100644
--- a/pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java
+++ b/pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java
@@ -1,16 +1,16 @@
 /**
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
+
 package net.sourceforge.pmd.cpd;
 
 import java.io.IOException;
 
-import net.sourceforge.pmd.testframework.AbstractTokenizerTest;
-
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.Test;
 
+import net.sourceforge.pmd.testframework.AbstractTokenizerTest;
 
 public class GroovyTokenizerTest extends AbstractTokenizerTest {
 
@@ -25,8 +25,8 @@ public class GroovyTokenizerTest extends AbstractTokenizerTest {
 
     @Override
     public String getSampleCode() throws IOException {
-         return IOUtils.toString(GroovyTokenizer.class.getResourceAsStream(FILENAME));
-     }
+        return IOUtils.toString(GroovyTokenizer.class.getResourceAsStream(FILENAME));
+    }
 
     @Test
     public void tokenizeTest() throws IOException {
@@ -34,4 +34,3 @@ public class GroovyTokenizerTest extends AbstractTokenizerTest {
         super.tokenizeTest();
     }
 }
-