Switch to new javacc maven plugin:

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

3 files changed, 8 insertions, 11 deletions

diff --git a/searchlib/pom.xml b/searchlib/pom.xml
index 108a17e3638..f3785881265 100644
--- a/searchlib/pom.xml
+++ b/searchlib/pom.xml
@@ -84,18 +84,15 @@
         </configuration>
       </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/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/FeatureList.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/FeatureList.java
index 85c7731a298..8b5a1fbf687 100755
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/FeatureList.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/FeatureList.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.rankingexpression;
 import com.google.common.annotations.Beta;
 import com.yahoo.searchlib.rankingexpression.parser.ParseException;
 import com.yahoo.searchlib.rankingexpression.parser.RankingExpressionParser;
-import com.yahoo.searchlib.rankingexpression.parser.TokenMgrError;
+import com.yahoo.searchlib.rankingexpression.parser.TokenMgrException;
 import com.yahoo.searchlib.rankingexpression.rule.ReferenceNode;
 
 import java.io.*;
@@ -65,7 +65,7 @@ public class FeatureList implements Iterable<ReferenceNode> {
         try {
             lst = new RankingExpressionParser(reader).featureList();
         }
-        catch (TokenMgrError e) {
+        catch (TokenMgrException e) {
             ParseException t = new ParseException();
             throw (ParseException)t.initCause(e);
         }
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java
index 34445a31ac3..ed82ba20fbe 100755
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java
@@ -5,7 +5,7 @@ import com.yahoo.searchlib.rankingexpression.evaluation.Context;
 import com.yahoo.searchlib.rankingexpression.evaluation.Value;
 import com.yahoo.searchlib.rankingexpression.parser.ParseException;
 import com.yahoo.searchlib.rankingexpression.parser.RankingExpressionParser;
-import com.yahoo.searchlib.rankingexpression.parser.TokenMgrError;
+import com.yahoo.searchlib.rankingexpression.parser.TokenMgrException;
 import com.yahoo.searchlib.rankingexpression.rule.ExpressionNode;
 import com.yahoo.searchlib.rankingexpression.rule.SerializationContext;
 import com.yahoo.tensor.TensorType;
@@ -177,7 +177,7 @@ public class RankingExpression implements Serializable {
         try {
             return new RankingExpressionParser(reader).rankingExpression();
         }
-        catch (TokenMgrError e) {
+        catch (TokenMgrException e) {
             throw new ParseException(e.getMessage());
         }
     }