Revert "version in def files are deprecated"

23 files changed, 23 insertions, 0 deletions

diff --git a/container-search/src/main/resources/configdefinitions/documentdb-info.def b/container-search/src/main/resources/configdefinitions/documentdb-info.def
index 76096b4a6f7..af010f1c161 100644
--- a/container-search/src/main/resources/configdefinitions/documentdb-info.def
+++ b/container-search/src/main/resources/configdefinitions/documentdb-info.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=2
 namespace=prelude.fastsearch
 
 ## The name of the search definition that this document database info applies to
diff --git a/container-search/src/main/resources/configdefinitions/emulation.def b/container-search/src/main/resources/configdefinitions/emulation.def
index 70d2d4954a4..26dedb77b69 100644
--- a/container-search/src/main/resources/configdefinitions/emulation.def
+++ b/container-search/src/main/resources/configdefinitions/emulation.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=2
 namespace=prelude
 
 ## Keep emulating old (4.2, 5.0, early 5.1) string type fields for structured data
diff --git a/container-search/src/main/resources/configdefinitions/federation.def b/container-search/src/main/resources/configdefinitions/federation.def
index 36eb5d4b4c8..da9846d5246 100644
--- a/container-search/src/main/resources/configdefinitions/federation.def
+++ b/container-search/src/main/resources/configdefinitions/federation.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=7
 namespace=search.federation
 
 target[].id string
diff --git a/container-search/src/main/resources/configdefinitions/fs4.def b/container-search/src/main/resources/configdefinitions/fs4.def
index d0c68540071..a4af65bef02 100644
--- a/container-search/src/main/resources/configdefinitions/fs4.def
+++ b/container-search/src/main/resources/configdefinitions/fs4.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=1
 namespace=container.search
 
 ##Number of listener threads
diff --git a/container-search/src/main/resources/configdefinitions/index-info.def b/container-search/src/main/resources/configdefinitions/index-info.def
index f3b905d4d0a..c329b0de1cc 100644
--- a/container-search/src/main/resources/configdefinitions/index-info.def
+++ b/container-search/src/main/resources/configdefinitions/index-info.def
@@ -1,5 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 ## Commands per search definition to be applied to query terms per index before searching
+version=2
 namespace=search.config
 
 ## The name of the search definition this index info applies to
diff --git a/container-search/src/main/resources/configdefinitions/lowercasing.def b/container-search/src/main/resources/configdefinitions/lowercasing.def
index b656c451e11..521b7624660 100644
--- a/container-search/src/main/resources/configdefinitions/lowercasing.def
+++ b/container-search/src/main/resources/configdefinitions/lowercasing.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=1
 namespace=search.querytransform
 
 transform_weighted_sets bool default=true
diff --git a/container-search/src/main/resources/configdefinitions/measure-qps.def b/container-search/src/main/resources/configdefinitions/measure-qps.def
index c8b38b9db6e..b146002cab5 100644
--- a/container-search/src/main/resources/configdefinitions/measure-qps.def
+++ b/container-search/src/main/resources/configdefinitions/measure-qps.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=2
 namespace=search.statistics
 
 ## Configure measurements of peak QPS rates.
diff --git a/container-search/src/main/resources/configdefinitions/page-templates.def b/container-search/src/main/resources/configdefinitions/page-templates.def
index 31ec7644d18..e69bc9c223c 100644
--- a/container-search/src/main/resources/configdefinitions/page-templates.def
+++ b/container-search/src/main/resources/configdefinitions/page-templates.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=1
 namespace=search.pagetemplates
 
 # The xml content of a page template
diff --git a/container-search/src/main/resources/configdefinitions/provider.def b/container-search/src/main/resources/configdefinitions/provider.def
index 79b09913b49..6b23d47427d 100644
--- a/container-search/src/main/resources/configdefinitions/provider.def
+++ b/container-search/src/main/resources/configdefinitions/provider.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=16
 namespace=search.federation
 
 node[].host string
diff --git a/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def b/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def
index ba2b6ed7802..eb7183bff40 100644
--- a/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def
+++ b/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def
@@ -1,6 +1,7 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 # TODO: Not in use - remove on Vespa 7
 
+version=4
 namespace=search.cache
 
 # size of the region (in MB). Cache size (in qr-binary-cache.cfg) 
diff --git a/container-search/src/main/resources/configdefinitions/qr-binary-cache.def b/container-search/src/main/resources/configdefinitions/qr-binary-cache.def
index 917832e86fe..0df80d7e520 100644
--- a/container-search/src/main/resources/configdefinitions/qr-binary-cache.def
+++ b/container-search/src/main/resources/configdefinitions/qr-binary-cache.def
@@ -1,6 +1,7 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 # TODO: Not in use - remove on Vespa 7
 
+version=3
 namespace=search.cache
 
 # Size of a block in cache. A block is the smallest unit that would
diff --git a/container-search/src/main/resources/configdefinitions/qr-monitor.def b/container-search/src/main/resources/configdefinitions/qr-monitor.def
index 2c4ff3c6167..931e62049d2 100644
--- a/container-search/src/main/resources/configdefinitions/qr-monitor.def
+++ b/container-search/src/main/resources/configdefinitions/qr-monitor.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=4
 namespace=prelude.cluster
 
 ## The number of milliseconds to attempt to complete a request before
diff --git a/container-search/src/main/resources/configdefinitions/qr-quotetable.def b/container-search/src/main/resources/configdefinitions/qr-quotetable.def
index 40979ad2a35..e387d9dc732 100644
--- a/container-search/src/main/resources/configdefinitions/qr-quotetable.def
+++ b/container-search/src/main/resources/configdefinitions/qr-quotetable.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=1
 namespace=prelude.searcher
 
 ## The ordinal number of the character to quote in UNICODE.
diff --git a/container-search/src/main/resources/configdefinitions/query-profiles.def b/container-search/src/main/resources/configdefinitions/query-profiles.def
index 20fcbda0d72..75b3f122b0a 100644
--- a/container-search/src/main/resources/configdefinitions/query-profiles.def
+++ b/container-search/src/main/resources/configdefinitions/query-profiles.def
@@ -2,6 +2,7 @@
 # Query profiles and their types - a query profile is a nested composite of query parameters with an id
 # A set of query parameters can be fetched from a query profile rather than being
 # submitted explicitly.
+version=4
 namespace=search.query.profile.config
 
 # The id of this query profile. The id has the form name(:version)?
diff --git a/container-search/src/main/resources/configdefinitions/resolvers.def b/container-search/src/main/resources/configdefinitions/resolvers.def
index 6003fdf81f1..87b7a8b84df 100644
--- a/container-search/src/main/resources/configdefinitions/resolvers.def
+++ b/container-search/src/main/resources/configdefinitions/resolvers.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=2
 namespace=search.pagetemplates
 
 ## A list of resolver components used by com.yahoo.search.PageTemplateSearcher
diff --git a/container-search/src/main/resources/configdefinitions/rewrites.def b/container-search/src/main/resources/configdefinitions/rewrites.def
index ecca422342a..0179057029f 100644
--- a/container-search/src/main/resources/configdefinitions/rewrites.def
+++ b/container-search/src/main/resources/configdefinitions/rewrites.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=2
 namespace=search.query.rewrite
 
 fsaDict[].name string
diff --git a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def b/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def
index a34e08a1c82..1c489f39ed9 100644
--- a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def
+++ b/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=1
 namespace=search.handler
 
 rendererId string
diff --git a/container-search/src/main/resources/configdefinitions/searchchain-forward.def b/container-search/src/main/resources/configdefinitions/searchchain-forward.def
index 0e86490e120..dd66acb2e57 100644
--- a/container-search/src/main/resources/configdefinitions/searchchain-forward.def
+++ b/container-search/src/main/resources/configdefinitions/searchchain-forward.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=2
 namespace=search.federation
 
 ## A searcher forwarding the incoming query to a single search chain and
diff --git a/container-search/src/main/resources/configdefinitions/semantic-rules.def b/container-search/src/main/resources/configdefinitions/semantic-rules.def
index 5ac0cca7ff6..4212e20fcc1 100644
--- a/container-search/src/main/resources/configdefinitions/semantic-rules.def
+++ b/container-search/src/main/resources/configdefinitions/semantic-rules.def
@@ -1,5 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 # Semantic production rules
+version=2
 namespace=prelude.semantics
 
 # Whether we should use these rule bases in pre-Vespa 2.2 compatibility mode
diff --git a/container-search/src/main/resources/configdefinitions/strict-contracts.def b/container-search/src/main/resources/configdefinitions/strict-contracts.def
index f9dd788c054..f7af59792ae 100644
--- a/container-search/src/main/resources/configdefinitions/strict-contracts.def
+++ b/container-search/src/main/resources/configdefinitions/strict-contracts.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=2
 namespace=search.federation
 
 ## A config to control whether to activate strict adherence to public contracts
diff --git a/container-search/src/main/resources/configdefinitions/timing-searcher.def b/container-search/src/main/resources/configdefinitions/timing-searcher.def
index 7c2b698bdb0..254d7c5b5bb 100644
--- a/container-search/src/main/resources/configdefinitions/timing-searcher.def
+++ b/container-search/src/main/resources/configdefinitions/timing-searcher.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=1
 namespace=search.statistics
 
 timer[].name string
diff --git a/container-search/src/test/vespa-configdef/int.def b/container-search/src/test/vespa-configdef/int.def
index b526a956b5c..895a5e0de68 100644
--- a/container-search/src/test/vespa-configdef/int.def
+++ b/container-search/src/test/vespa-configdef/int.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=1
 
 namespace=config.search
 
diff --git a/container-search/src/test/vespa-configdef/string.def b/container-search/src/test/vespa-configdef/string.def
index 4b39de61e0a..c3ee208f633 100644
--- a/container-search/src/test/vespa-configdef/string.def
+++ b/container-search/src/test/vespa-configdef/string.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=1
 
 namespace=config.search