diff options
author | gjoranv <gv@oath.com> | 2018-08-27 14:22:09 +0200 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2018-08-27 14:55:17 +0200 |
commit | e6264beb644bfc534b1ea0f0945b6eb0c3cc1a16 (patch) | |
tree | 580f57b10ee5a8d82dcaad90fb80c2313a617417 /indexinglanguage | |
parent | 074f695b044eec2663fec0d314b423eb12254ade (diff) |
Switch to new javacc maven plugin:
- config model
- document
- documentapi
- indexinglanguage.
- searchlib
Diffstat (limited to 'indexinglanguage')
-rw-r--r-- | indexinglanguage/pom.xml | 11 | ||||
-rw-r--r-- | indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java | 4 |
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()); } } |