diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGeneratorMojo.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGeneratorMojo.java
index c72eb0a..7b914bc 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGeneratorMojo.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGeneratorMojo.java
@@ -37,7 +37,7 @@
 public class LexerGeneratorMojo extends AbstractMojo {
     /**
      * parameter injected from pom.xml
-     * 
+     *
      * @parameter
      * @required
      */
@@ -45,7 +45,7 @@
 
     /**
      * parameter injected from pom.xml
-     * 
+     *
      * @parameter
      * @required
      */
@@ -93,4 +93,4 @@
         return fileData.toString();
     }
 
-}
\ No newline at end of file
+}
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/Lexer.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/Lexer.java
index a113864..60e6e89 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/Lexer.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/Lexer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package [PACKAGE]; 
+package [PACKAGE];
 
 import java.io.IOException;
 import [PACKAGE].[LEXER_NAME]Exception;
@@ -28,18 +28,18 @@
 
     // Human representation of tokens. Useful for debug.
     // Is possible to convert a TOKEN_CONSTANT in its image through
-    // [LEXER_NAME].tokenKindToString(TOKEN_CONSTANT); 
+    // [LEXER_NAME].tokenKindToString(TOKEN_CONSTANT);
     private static final String[] tokenImage = {
             "<EOF>", "<AUX_NOT_FOUND>" [TOKENS_IMAGES]
           };
-    
+
     private static final char EOF_CHAR = 4;
     protected java.io.Reader inputStream;
     protected int column;
     protected int line;
     protected boolean prevCharIsCR;
     protected boolean prevCharIsLF;
-    protected boolean containsEscapes; 
+    protected boolean containsEscapes;
     protected char[] buffer;
     protected int bufsize;
     protected int bufpos;
@@ -56,12 +56,12 @@
 
 // ================================================================================
 //  Main method. Return a TOKEN_CONSTANT
-// ================================================================================            
-            
+// ================================================================================
+
     public int next() throws [LEXER_NAME]Exception, IOException {
         char currentChar = buffer[bufpos];
         while (currentChar == ' ' || currentChar=='\t' || currentChar == '\n' || currentChar=='\r')
-            currentChar = readNextChar(); 
+            currentChar = readNextChar();
         tokenBegin = bufpos;
         containsEscapes = false;
         if (currentChar==EOF_CHAR) return TOKEN_EOF;
@@ -124,21 +124,21 @@
             return new String(buffer, tokenBegin, bufsize - tokenBegin) +
                                   new String(buffer, 0, bufpos);
     }
-    
+
     public int getColumn() {
         return column;
     }
-    
+
     public int getLine() {
         return line;
     }
-    
+
     public boolean containsEscapes() {
         return containsEscapes;
     }
 
     public static String tokenKindToString(int token) {
-        return tokenImage[token]; 
+        return tokenImage[token];
     }
 
     public void done(){
@@ -147,8 +147,8 @@
 
 // ================================================================================
 //  Parse error management
-// ================================================================================    
-    
+// ================================================================================
+
     protected int parseError(int ... tokens) throws [LEXER_NAME]Exception {
         StringBuilder message = new StringBuilder();
         message.append("Parse error at (").append(line).append(", ").append(column).append(")");
@@ -160,10 +160,10 @@
         }
         throw new [LEXER_NAME]Exception(message.toString());
     }
-    
+
     protected void updateLineColumn(char c){
         column++;
-    
+
         if (prevCharIsLF)
         {
             prevCharIsLF = false;
@@ -181,17 +181,17 @@
                 line += (column = 1);
             }
         }
-        
+
         if (c=='\r') {
             prevCharIsCR = true;
         } else if(c == '\n') {
             prevCharIsLF = true;
         }
     }
-    
+
 // ================================================================================
 //  Read data, buffer management. It uses a circular (and expandable) buffer
-// ================================================================================    
+// ================================================================================
 
     protected char readNextChar() throws IOException {
         if (++bufpos >= endOf_USED_Buffer)
@@ -202,13 +202,13 @@
     }
 
     protected boolean fillBuff() throws IOException {
-        if (endOf_UNUSED_Buffer == endOf_USED_Buffer) // If no more unused buffer space 
+        if (endOf_UNUSED_Buffer == endOf_USED_Buffer) // If no more unused buffer space
         {
           if (endOf_UNUSED_Buffer == bufsize)         // -- If the previous unused space was
           {                                           // -- at the end of the buffer
             if (tokenBegin > maxUnusedBufferSize)     // -- -- If the first N bytes before
             {                                         //       the current token are enough
-              bufpos = endOf_USED_Buffer = 0;         // -- -- -- setup buffer to use that fragment 
+              bufpos = endOf_USED_Buffer = 0;         // -- -- -- setup buffer to use that fragment
               endOf_UNUSED_Buffer = tokenBegin;
             }
             else if (tokenBegin < 0)                  // -- -- If no token yet
@@ -220,9 +220,9 @@
             endOf_UNUSED_Buffer = bufsize;            // -- set endOf_UNUSED_Buffer to the end of the buffer
           else if ((tokenBegin - endOf_UNUSED_Buffer) < maxUnusedBufferSize)
           {                                           // If between endOf_UNUSED_Buffer and the token
-            ExpandBuff(true);                         // there is NOT enough space expand the buffer                          
+            ExpandBuff(true);                         // there is NOT enough space expand the buffer
           }                                           // reorganizing it
-          else 
+          else
             endOf_UNUSED_Buffer = tokenBegin;         // Otherwise there is enough space at the start
         }                                             // so we set the buffer to use that fragment
         int i;
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/LexerException.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/LexerException.java
index 8b37bae..9030eb2 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/LexerException.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/LexerException.java
@@ -19,11 +19,11 @@
 package [PACKAGE];
 
 public class [LEXER_NAME]Exception extends Exception {
-    
+
     public [LEXER_NAME]Exception(String message) {
         super(message);
     }
-    
+
     private static final long serialVersionUID = 1L;
 
 }
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java
index be792e4..a6d0267 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java
@@ -34,18 +34,18 @@
     static  String rule2_action     = "myaction2";
     static  String rule2_name       = "myrule2";
     static  String rule2_match      = "matchCheck2("+rule_name+")";
-    
+
     static public Rule createRule(final String name){
         return new Rule(){
             String rule_name        = name;
             String rule_action      = "myaction";
             String rule_match       = "matchCheck("+rule_name+")";
-            
+
             @Override
             public Rule clone(){
                 return Fixtures.createRule(name+"_clone");
             }
-            
+
             @Override
             public String javaAction() {
                 return rule_action;
@@ -55,21 +55,21 @@
             public String javaMatch(String action) {
                 return rule_match+"{"+action+"}";
             }
-            
+
             @Override
             public String toString(){
                 return rule_name;
             }
-            
-        }; 
+
+        };
     }
-    
+
     static Rule rule = new Rule(){
-        
+
         public Rule clone(){
             return null;
         }
-        
+
         @Override
         public String javaAction() {
             return rule_action;
@@ -79,20 +79,20 @@
         public String javaMatch(String action) {
             return rule_match+"{"+action+"}";
         }
-        
+
         @Override
         public String toString(){
             return rule_name;
         }
-        
-    }; 
+
+    };
 
     static Rule rule2 = new Rule(){
 
         public Rule clone(){
             return null;
         }
-        
+
         @Override
         public String javaAction() {
             return rule2_action;
@@ -102,17 +102,17 @@
         public String javaMatch(String act) {
             return rule2_match+"{"+act+"}";
         }
-        
+
         @Override
         public String toString(){
             return rule2_name;
         }
-        
+
     };
-    
+
     static RuleChar ruleA = new RuleChar('a');
     static RuleChar ruleB = new RuleChar('b');
     static RuleChar ruleC = new RuleChar('c');
     static String ruleABC_action = "currentChar = readNextChar();";
-    
+
 }
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java
index 28812e8..dee1255 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java
@@ -44,7 +44,7 @@
                      +"}"
                      +token_parseerror , node.toJava());
     }
-    
+
     @Test
     public void NodeSwitchCase() {
         LexerNode node = new LexerNode();
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java
index 9957776..206e69b 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java
@@ -49,7 +49,7 @@
         node.append(node2);
         assertEquals("Arule_clone! ", node.toString());
     }
-    
+
     @Test
     public void AppendedNodesAreCloned() throws Exception {
         LexerNode node = new LexerNode();
@@ -61,7 +61,7 @@
         node.append(node2);
         // TODO
         // assertEquals("A! B_clone! ", node.toString());
-        
+
         LexerNode node3 = new LexerNode();
         node3.append(createRule("C"));
         node3.append(createRule("D"));
@@ -95,5 +95,5 @@
         // TODO
         // assertEquals(" ( A_clone! A_clone!  || A_clone!  ) ", node.toString());
   }
-    
+
 }
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java
index fb2bdba..e532cf8 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java
@@ -25,7 +25,7 @@
 import org.apache.asterix.lexergenerator.LexerNode;
 import static org.apache.asterix.lexergenerator.Fixtures.*;
 
-public class LexerNodeAppendRuleTest {    
+public class LexerNodeAppendRuleTest {
     @Test
     public void SingleNode() {
         LexerNode node = new LexerNode();
@@ -62,4 +62,4 @@
                         +token_parseerror
                      +"}"+token_parseerror, node.toJava());
     }
-}
\ No newline at end of file
+}
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java
index 624af344..677d12e 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java
@@ -34,8 +34,8 @@
 import org.apache.asterix.lexergenerator.rules.RulePartial;
 
 public class LexerNodeAuxFunctionsTest {
-    String expectedDifferentReturn = "return TOKEN_AUX_NOT_FOUND;\n"; 
-    
+    String expectedDifferentReturn = "return TOKEN_AUX_NOT_FOUND;\n";
+
     @Test
     public void NodeRuleRuleNodeNode() {
         LexerNode node = new LexerNode();
@@ -53,7 +53,7 @@
                      +"}"
                      +expectedDifferentReturn , node.toJavaAuxFunction());
     }
-    
+
     @Test
     public void NodeSwitchCase() {
         LexerNode node = new LexerNode();
@@ -88,7 +88,7 @@
         expectedNeededAuxFunctions.add("token1");
         expectedNeededAuxFunctions.add("token2");
         assertEquals(expectedNeededAuxFunctions, node.neededAuxFunctions());
-    }    
+    }
 
     @Test(expected=Exception.class)
     public void NodeExpandFirstActionError() throws Exception {
@@ -107,7 +107,7 @@
             assertEquals("Cannot find a token used as part of another definition, missing token: token1", e.getMessage());
             throw e;
         }
-    } 
+    }
 
     public void NodeExpandFirstAction() throws Exception {
         LexerNode node = new LexerNode();