diff options
| author | Geir Storli <geirstorli@yahoo.no> | 2019-01-21 16:06:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 16:06:53 +0100 |
| commit | 8372a883c5a5fa100f88fc9b80824359b5bb70cd (patch) | |
| tree | 660ce3ef61f060b33bd97eac1185715606b8e2bd /indexinglanguage | |
| parent | 3722c1cdd91fce30d1c2538b2a8749d9321e194b (diff) | |
| parent | eb0b1134a66507e3bd8f09793c22cd824d01dff5 (diff) | |
Merge pull request #8198 from vespa-engine/7
7 MERGEOK
Diffstat (limited to 'indexinglanguage')
4 files changed, 5 insertions, 5 deletions
diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index 00b3413ae1f..74c2f701a67 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>indexinglanguage</artifactId> <packaging>jar</packaging> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <name>indexinglanguage</name> <description>Interpreter for the Indexing Language</description> <dependencies> diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java index fddbd211e27..50dd7611bb0 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java @@ -179,7 +179,7 @@ public abstract class Expression extends Selectable { /** Creates an expression with simple lingustics for testing */ @SuppressWarnings("deprecation") public static Expression fromString(String expression) throws ParseException { - return fromString(expression, new SimpleLinguistics(false)); + return fromString(expression, new SimpleLinguistics()); } public static Expression fromString(String expression, Linguistics linguistics) throws ParseException { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java index 7addca75d2f..320c47103aa 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java @@ -91,7 +91,7 @@ public final class ScriptExpression extends ExpressionList<StatementExpression> /** Creates an expression with simple lingustics for testing */ @SuppressWarnings("deprecation") public static ScriptExpression fromString(String expression) throws ParseException { - return fromString(expression, new SimpleLinguistics(false)); + return fromString(expression, new SimpleLinguistics()); } public static ScriptExpression fromString(String expression, Linguistics linguistics) throws ParseException { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java index 16d069d84ec..cf1e808946d 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java @@ -92,7 +92,7 @@ public final class StatementExpression extends ExpressionList<Expression> { /** Creates an expression with simple lingustics for testing */ @SuppressWarnings("deprecation") public static StatementExpression fromString(String expression) throws ParseException { - return fromString(expression, new SimpleLinguistics(false)); + return fromString(expression, new SimpleLinguistics()); } public static StatementExpression fromString(String expression, Linguistics linguistics) throws ParseException { |