Switch to new javacc maven plugin:

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

2 files changed, 6 insertions, 9 deletions

diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml
index f0aba8d9476..5b234c4695f 100644
--- a/indexinglanguage/pom.xml
+++ b/indexinglanguage/pom.xml
@@ -87,18 +87,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/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java
index ed8b0918bf3..0bc82535ad8 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.indexinglanguage.expressions.StatementExpression;
 import com.yahoo.vespa.indexinglanguage.parser.CharStream;
 import com.yahoo.vespa.indexinglanguage.parser.IndexingParser;
 import com.yahoo.vespa.indexinglanguage.parser.ParseException;
-import com.yahoo.vespa.indexinglanguage.parser.TokenMgrError;
+import com.yahoo.vespa.indexinglanguage.parser.TokenMgrException;
 
 /**
  * @author Simon Thoresen Hult
@@ -43,7 +43,7 @@ public final class ScriptParser {
                 try {
                     return parser.statement();
                 }
-                catch (TokenMgrError e) {
+                catch (TokenMgrException e) {
                     throw new ParseException(e.getMessage());
                 }
             }