Switch to new javacc maven plugin:

- config model
- document
- documentapi
- indexinglanguage.
- searchlib

4 files changed, 10 insertions, 13 deletions

diff --git a/document/pom.xml b/document/pom.xml
index 10f71218422..9357e87bb76 100644
--- a/document/pom.xml
+++ b/document/pom.xml
@@ -112,18 +112,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>javacc-maven-plugin</artifactId>
+                <groupId>com.helger.maven</groupId>
+                <artifactId>ph-javacc-maven-plugin</artifactId>
+                <version>4.0.3</version>
                 <executions>
                     <execution>
-                        <id>javacc</id>
+                        <phase>generate-sources</phase>
                         <goals>
                             <goal>javacc</goal>
                         </goals>
-                        <configuration>
-                            <lookAhead>1</lookAhead>
-                            <isStatic>false</isStatic>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/document/src/main/java/com/yahoo/document/select/BucketSelector.java b/document/src/main/java/com/yahoo/document/select/BucketSelector.java
index a3dfed98378..41a0d9fd87b 100644
--- a/document/src/main/java/com/yahoo/document/select/BucketSelector.java
+++ b/document/src/main/java/com/yahoo/document/select/BucketSelector.java
@@ -5,7 +5,7 @@ import com.yahoo.document.BucketIdFactory;
 import com.yahoo.document.select.parser.ParseException;
 import com.yahoo.document.select.parser.SelectInput;
 import com.yahoo.document.select.parser.SelectParser;
-import com.yahoo.document.select.parser.TokenMgrError;
+import com.yahoo.document.select.parser.TokenMgrException;
 import com.yahoo.document.select.simple.SelectionParser;
 
 /**
@@ -53,7 +53,7 @@ public class BucketSelector {
                 SelectParser parser = new SelectParser(new SelectInput(selector));
                 return parser.expression().getBucketSet(factory);
              }
-        } catch (TokenMgrError e) {
+        } catch (TokenMgrException e) {
             ParseException t = new ParseException();
             throw (ParseException) t.initCause(e);
         } catch (RuntimeException e) {
diff --git a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
index 270b70b92d3..7f5b92ea233 100644
--- a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
+++ b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
@@ -5,7 +5,7 @@ import com.yahoo.document.DocumentOperation;
 import com.yahoo.document.select.parser.ParseException;
 import com.yahoo.document.select.parser.SelectInput;
 import com.yahoo.document.select.parser.SelectParser;
-import com.yahoo.document.select.parser.TokenMgrError;
+import com.yahoo.document.select.parser.TokenMgrException;
 import com.yahoo.document.select.rule.ExpressionNode;
 
 /**
@@ -32,7 +32,7 @@ public class DocumentSelector {
         try {
             SelectParser parser = new SelectParser(input);
             expression = parser.expression();
-        } catch (TokenMgrError e) {
+        } catch (TokenMgrException e) {
             ParseException t = new ParseException("Tokenization error parsing document selector '" + selector + "'");
             throw (ParseException)t.initCause(e);
         } catch (RuntimeException | ParseException e) {
diff --git a/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java b/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java
index 54f3870fdfd..1764079e897 100644
--- a/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java
+++ b/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java
@@ -5,7 +5,7 @@ import com.yahoo.document.*;
 import com.yahoo.document.datatypes.*;
 import com.yahoo.document.select.convert.SelectionExpressionConverter;
 import com.yahoo.document.select.parser.ParseException;
-import com.yahoo.document.select.parser.TokenMgrError;
+import com.yahoo.document.select.parser.TokenMgrException;
 import com.yahoo.yolean.Exceptions;
 import org.junit.Before;
 import org.junit.Test;
@@ -817,7 +817,7 @@ public class DocumentSelectorTestCase {
         }
         catch (ParseException e) {
             Throwable t = e;
-            if (t.getCause() instanceof TokenMgrError) {
+            if (t.getCause() instanceof TokenMgrException) {
                 t = t.getCause();
             }
             assertEquals(expectedError, Exceptions.toMessageString(t).substring(0, expectedError.length()));