diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6d5c6575..98f8c522 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -89,7 +89,6 @@ jobs:
engine: 'solr'
config: 'phpunit-integration-solr.xml'
solr_version: '8.11.2'
- solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
solr_cores: 'collection1'
core_setup: 'single'
- php: '8.1'
@@ -97,21 +96,18 @@ jobs:
engine: 'solr'
config: 'phpunit-integration-solr.xml'
solr_version: '8.11.2'
- solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
core_setup: 'dedicated'
- php: '8.1'
coverage: 'integration'
engine: 'solr'
config: 'phpunit-integration-solr.xml'
solr_version: '8.11.2'
- solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
core_setup: 'shared'
- php: '8.1'
coverage: 'integration'
engine: 'solr'
config: 'phpunit-integration-solr.xml'
solr_version: '8.11.2'
- solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
solr_cloud: 'yes'
core_setup: 'cloud'
@@ -120,7 +116,6 @@ jobs:
engine: 'solr'
config: 'phpunit-core-integration-legacy-solr.xml'
solr_version: '8.11.2'
- solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
solr_cores: 'collection1'
core_setup: 'single'
regression: 'regression'
@@ -129,7 +124,6 @@ jobs:
engine: 'solr'
config: 'phpunit-core-integration-legacy-solr.xml'
solr_version: '8.11.2'
- solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
core_setup: 'dedicated'
regression: 'regression'
- php: '8.1'
@@ -137,7 +131,6 @@ jobs:
engine: 'solr'
config: 'phpunit-core-integration-legacy-solr.xml'
solr_version: '8.11.2'
- solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
core_setup: 'shared'
regression: 'regression'
- php: '8.1'
@@ -145,7 +138,6 @@ jobs:
engine: 'solr'
config: 'phpunit-core-integration-legacy-solr.xml'
solr_version: '8.11.2'
- solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
solr_cloud: 'yes'
core_setup: 'cloud'
regression: 'regression'
diff --git a/bin/init_solr.sh b/bin/init_solr.sh
index 7099aea9..1715f647 100755
--- a/bin/init_solr.sh
+++ b/bin/init_solr.sh
@@ -1,8 +1,11 @@
#!/usr/bin/env bash
+SOLR_VERSION=${SOLR_VERSION:-'8.11.2'}
+SOLR_VERSION_SHORT=${SOLR_VERSION%.*}
+
default_config_files[1]='vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml'
default_config_files[2]='vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml'
-default_config_files[3]='tests/lib/Resources/config/search/solr/7.7/solrconfig.xml'
+default_config_files[3]="tests/lib/Resources/config/search/solr/${SOLR_VERSION_SHORT}/solrconfig.xml"
default_config_files[4]='tests/lib/Resources/config/search/solr/custom-fields-types.xml'
default_cores[0]='core0'
@@ -17,7 +20,6 @@ default_shards=('shard0')
SOLR_PORT=${SOLR_PORT:-8983}
SOLR_DIR=${SOLR_DIR:-'__solr'}
-SOLR_VERSION=${SOLR_VERSION:-'7.7.3'}
SOLR_INSTALL_DIR="${SOLR_DIR}/${SOLR_VERSION}"
SOLR_DEBUG=${SOLR_DEBUG:-false}
SOLR_HOME=${SOLR_HOME:-'ezcloud'}
diff --git a/tests/lib/Resources/config/search/solr/8.6/solrconfig.xml b/tests/lib/Resources/config/search/solr/8.6/solrconfig.xml
deleted file mode 100644
index d53da908..00000000
--- a/tests/lib/Resources/config/search/solr/8.6/solrconfig.xml
+++ /dev/null
@@ -1,1243 +0,0 @@
-
-
-
-
-
-
-
-
- 8.6.0
-
-
-
-
-
-
-
-
-
-
- ${solr.data.dir:}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${solr.lock.type:native}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${solr.ulog.dir:}
- ${solr.ulog.numVersionBuckets:65536}
-
-
-
-
- ${solr.autoCommit.maxTime:15000}
- false
-
-
-
-
-
- ${solr.autoSoftCommit.maxTime:-1}
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${solr.max.booleanClauses:1024}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
- 20
-
-
- 200
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- explicit
- 10
- default
- on
- true
- 10
- 5
- 5
- true
- true
- 10
- 5
-
-
-
-
- spellcheck
-
-
-
-
-
-
-
-
-
-
-
-
-
- explicit
- json
- true
-
-
-
-
-
- _text_
-
-
-
-
-
-
-
-
- text_general
-
-
-
-
-
- default
-
- solr.IndexBasedSpellChecker
-
- spellcheck
-
-
-
- true
-
- ./spellchecker
-
- 0.7
-
-
-
-
-
-
-
-
-
-
- .0001
-
-
-
-
-
-
-
-
-
-
- default
- on
- true
- 10
- 5
- 5
- true
- true
- 10
- 5
-
-
- spellcheck
-
-
-
-
-
-
-
-
-
- true
- false
-
-
- terms
-
-
-
-
-
-
-
-
-
-
- 100
-
-
-
-
-
-
-
- 70
-
- 0.5
-
- [-\w ,/\n\"']{20,200}
-
-
-
-
-
-
- ]]>
- ]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ,,
- ,,
- ,,
- ,,
- ,]]>
- ]]>
-
-
-
-
-
- 10
- .,!?
-
-
-
-
-
-
- WORD
-
-
- en
- US
-
-
-
-
-
-
-
-
-
-
-
- [^\w-\.]
- _
-
-
-
-
-
-
- yyyy-MM-dd['T'[HH:mm[:ss[.SSS]][z
- yyyy-MM-dd['T'[HH:mm[:ss[,SSS]][z
- yyyy-MM-dd HH:mm[:ss[.SSS]][z
- yyyy-MM-dd HH:mm[:ss[,SSS]][z
- [EEE, ]dd MMM yyyy HH:mm[:ss] z
- EEEE, dd-MMM-yy HH:mm:ss z
- EEE MMM ppd HH:mm:ss [z ]yyyy
-
-
-
-
- java.lang.String
- text_general
-
- *_str
- 256
-
-
- true
-
-
- java.lang.Boolean
- booleans
-
-
- java.util.Date
- pdates
-
-
- java.lang.Long
- java.lang.Integer
- plongs
-
-
- java.lang.Number
- pdoubles
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain; charset=UTF-8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/lib/Resources/config/search/solr/solrconfig.xml b/tests/lib/Resources/config/search/solr/solrconfig.xml
deleted file mode 100644
index 4b2ecbd4..00000000
--- a/tests/lib/Resources/config/search/solr/solrconfig.xml
+++ /dev/null
@@ -1,1364 +0,0 @@
-
-
-
-
-
-
-
-
- 7.7.3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${solr.data.dir:}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${solr.lock.type:native}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${solr.ulog.dir:}
- ${solr.ulog.numVersionBuckets:65536}
-
-
-
-
- ${solr.autoCommit.maxTime:15000}
- false
-
-
-
-
-
- ${solr.autoSoftCommit.maxTime:-1}
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${solr.max.booleanClauses:1024}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
- 20
-
-
- 200
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- explicit
- 10
- default
- on
- true
- 10
- 5
- 5
- true
- true
- 10
- 5
-
-
-
-
- spellcheck
-
-
-
-
-
-
-
-
-
-
-
-
-
- explicit
- json
- true
-
-
-
-
-
-
-
- explicit
-
-
-
-
-
- _text_
-
-
-
-
-
-
- true
- ignored_
- _text_
-
-
-
-
-
-
-
-
- text_general
-
-
-
-
-
- default
-
- solr.IndexBasedSpellChecker
-
- spellcheck
-
- org.apache.lucene.search.spell.LevensteinDistance
-
- true
-
- ./spellchecker
-
- 0.7
-
-
-
-
-
-
-
-
-
-
- .0001
-
-
-
-
-
-
-
-
-
-
- default
- on
- true
- 10
- 5
- 5
- true
- true
- 10
- 5
-
-
- spellcheck
-
-
-
-
-
-
-
-
-
- true
-
-
- tvComponent
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
- terms
-
-
-
-
-
-
-
- string
-
-
-
-
-
- explicit
-
-
- elevator
-
-
-
-
-
-
-
-
-
-
- 100
-
-
-
-
-
-
-
- 70
-
- 0.5
-
- [-\w ,/\n\"']{20,200}
-
-
-
-
-
-
- ]]>
- ]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ,,
- ,,
- ,,
- ,,
- ,]]>
- ]]>
-
-
-
-
-
- 10
- .,!?
-
-
-
-
-
-
- WORD
-
-
- en
- US
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain; charset=UTF-8
-
-
-
-
- 5
-
-
-
-
-
-
-
-
-
-
-
-
-
-