summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2021-06-25 18:35:36 +0200
committerGitHub <noreply@github.com>2021-06-25 18:35:36 +0200
commitb5a6980e0d88c55aed11d7a5db7cf60d32e1c771 (patch)
tree4f3af2c99368bb5d4aaff9eb4aca0aff3dc69235
parent1205086cc02b08471467170ad6620eeaa03ca2d5 (diff)
parent7e77f09c3ee3cfbb7fc1f4359f83b7f28ad7ffba (diff)
Merge pull request #18416 from vespa-engine/use-SimpleLinguistics
Use simple linguistics
-rw-r--r--application/src/test/app-packages/athenz-in-deployment-xml/services.xml4
-rw-r--r--application/src/test/app-packages/searcher-app/services.xml3
-rw-r--r--application/src/test/app-packages/withcontent/services.xml2
3 files changed, 9 insertions, 0 deletions
diff --git a/application/src/test/app-packages/athenz-in-deployment-xml/services.xml b/application/src/test/app-packages/athenz-in-deployment-xml/services.xml
index b7962bcbcc9..a70b41a5417 100644
--- a/application/src/test/app-packages/athenz-in-deployment-xml/services.xml
+++ b/application/src/test/app-packages/athenz-in-deployment-xml/services.xml
@@ -1,5 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<container version='1.0'>
+ <!-- Avoid using DefaultLinguisticsProvider -->
+ <component id="com.yahoo.language.simple.SimpleLinguistics" />
+
<search/>
+ <accesslog type="disabled" />
</container>
diff --git a/application/src/test/app-packages/searcher-app/services.xml b/application/src/test/app-packages/searcher-app/services.xml
index 5b9f4265b5a..8f0abe40e5b 100644
--- a/application/src/test/app-packages/searcher-app/services.xml
+++ b/application/src/test/app-packages/searcher-app/services.xml
@@ -1,6 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<container version='1.0'>
+ <!-- Avoid using DefaultLinguisticsProvider -->
+ <component id="com.yahoo.language.simple.SimpleLinguistics" />
+
<search>
<chain id="default">
<searcher id='com.yahoo.vespatest.ExtraHitSearcher' bundle='com.yahoo.vespatest.ExtraHitSearcher:1.2'>
diff --git a/application/src/test/app-packages/withcontent/services.xml b/application/src/test/app-packages/withcontent/services.xml
index 4338579b49a..7b3216a697f 100644
--- a/application/src/test/app-packages/withcontent/services.xml
+++ b/application/src/test/app-packages/withcontent/services.xml
@@ -3,6 +3,8 @@
<services>
<container version="1.0">
+ <!-- Avoid using DefaultLinguisticsProvider -->
+ <component id="com.yahoo.language.simple.SimpleLinguistics" />
<search>
<chain id="default" inherits="vespa"/>