diff --git a/.ddev/docker-compose.solr.yaml b/.ddev/docker-compose.solr.yaml
index 2c6c3266d6ad491c21a3d77927761cd6b698b4d8..03f0dafd4f751302f067e7fcdc7ad6e63e787867 100644
--- a/.ddev/docker-compose.solr.yaml
+++ b/.ddev/docker-compose.solr.yaml
@@ -14,10 +14,6 @@ services:
- HTTP_EXPOSE=8983
volumes:
- "./solr:/var/solr"
- - "./solr/mycores/t3o:/var/solr/data/cores/t3o"
- - "./solr/solr.xml:/var/solr/data/solr.xml"
- - "./solr/zoo.cfg:/var/solr/data/zoo.cfg"
- - "./solr/log4j2.xml:/var/solr/log4j2.xml"
web:
links:
- solr:$DDEV_HOSTNAME
diff --git a/.ddev/solr/.gitignore b/.ddev/solr/.gitignore
deleted file mode 100644
index 8b19e70a795cdde586f0634144df7e4926dd602a..0000000000000000000000000000000000000000
--- a/.ddev/solr/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-mycores/t3o/data
\ No newline at end of file
diff --git a/.ddev/solr/log4j2.xml b/.ddev/solr/log4j2.xml
deleted file mode 100644
index e9aad1481a04244054a87dfeac4cb9e10b3acb56..0000000000000000000000000000000000000000
--- a/.ddev/solr/log4j2.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.}
- %m%notEmpty{ =>%ex{short}}}{10240}%n
-
-
-
-
-
-
-
- %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.}
- %m%notEmpty{ =>%ex{short}}}{10240}%n
-
-
-
-
-
-
-
-
-
-
-
-
- %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.}
- %m%notEmpty{ =>%ex{short}}}{10240}%n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.ddev/solr/mycores/t3o/conf/_schema_analysis_stopwords_english.json b/.ddev/solr/mycores/t3o/conf/_schema_analysis_stopwords_english.json
deleted file mode 100644
index ab37f400e293b82748555675d560cc54a2b1dd83..0000000000000000000000000000000000000000
--- a/.ddev/solr/mycores/t3o/conf/_schema_analysis_stopwords_english.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "initArgs":{"ignoreCase":false},
- "managedList":[]}
\ No newline at end of file
diff --git a/.ddev/solr/mycores/t3o/conf/admin-extra.html b/.ddev/solr/mycores/t3o/conf/admin-extra.html
deleted file mode 100644
index b68131ad98f0e1a55f6d85e415d4a0ef82310dae..0000000000000000000000000000000000000000
--- a/.ddev/solr/mycores/t3o/conf/admin-extra.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
diff --git a/.ddev/solr/mycores/t3o/conf/currency.xml b/.ddev/solr/mycores/t3o/conf/currency.xml
deleted file mode 100644
index 4d77aebd0acfc8260b31edfac68b9d127a3792fc..0000000000000000000000000000000000000000
--- a/.ddev/solr/mycores/t3o/conf/currency.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.ddev/solr/mycores/t3o/conf/elevate.xml b/.ddev/solr/mycores/t3o/conf/elevate.xml
deleted file mode 100644
index 7630ebe20fb91d4a6564785d01884d577a2fdc20..0000000000000000000000000000000000000000
--- a/.ddev/solr/mycores/t3o/conf/elevate.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.ddev/solr/mycores/t3o/conf/english/_schema_analysis_stopwords_english.json b/.ddev/solr/mycores/t3o/conf/english/_schema_analysis_stopwords_english.json
deleted file mode 100644
index ffc7fbdc93521dbfef1a2b4c30e67e75b4a199e2..0000000000000000000000000000000000000000
--- a/.ddev/solr/mycores/t3o/conf/english/_schema_analysis_stopwords_english.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
- "initArgs": {
- "ignoreCase": true
- },
- "initializedOn": "2014-04-29T23:08:58.000Z",
- "managedList": [
- "i",
- "me",
- "my",
- "myself",
- "we",
- "us",
- "our",
- "ours",
- "ourselves",
- "you",
- "your",
- "yours",
- "yourself",
- "yourselves",
- "he",
- "him",
- "his",
- "himself",
- "she",
- "her",
- "hers",
- "herself",
- "it",
- "its",
- "itself",
- "they",
- "them",
- "their",
- "theirs",
- "themselves",
- "what",
- "which",
- "who",
- "whom",
- "this",
- "that",
- "these",
- "those",
- "am",
- "is",
- "are",
- "was",
- "were",
- "be",
- "been",
- "being",
- "have",
- "has",
- "had",
- "having",
- "do",
- "does",
- "did",
- "doing",
- "would",
- "should",
- "could",
- "ought",
- "i'm",
- "you're",
- "he's",
- "she's",
- "it's",
- "we're",
- "they're",
- "i've",
- "you've",
- "we've",
- "they've",
- "i'd",
- "you'd",
- "he'd",
- "she'd",
- "we'd",
- "they'd",
- "i'll",
- "you'll",
- "he'll",
- "she'll",
- "we'll",
- "they'll",
- "isn't",
- "aren't",
- "wasn't",
- "weren't",
- "hasn't",
- "haven't",
- "hadn't",
- "doesn't",
- "don't",
- "didn't",
- "won't",
- "wouldn't",
- "shan't",
- "shouldn't",
- "can't",
- "cannot",
- "couldn't",
- "mustn't",
- "let's",
- "that's",
- "who's",
- "what's",
- "here's",
- "there's",
- "when's",
- "where's",
- "why's",
- "how's",
- "an",
- "the",
- "and",
- "but",
- "if",
- "or",
- "because",
- "as",
- "until",
- "while",
- "of",
- "at",
- "by",
- "for",
- "with",
- "about",
- "against",
- "between",
- "into",
- "through",
- "during",
- "before",
- "after",
- "above",
- "below",
- "to",
- "from",
- "up",
- "down",
- "in",
- "out",
- "on",
- "off",
- "over",
- "under",
- "again",
- "further",
- "then",
- "once",
- "here",
- "there",
- "when",
- "where",
- "why",
- "how",
- "all",
- "any",
- "both",
- "each",
- "few",
- "more",
- "most",
- "other",
- "some",
- "such",
- "no",
- "nor",
- "not",
- "only",
- "own",
- "same",
- "so",
- "than",
- "too",
- "very"
- ]
-}
\ No newline at end of file
diff --git a/.ddev/solr/mycores/t3o/conf/english/protwords.txt b/.ddev/solr/mycores/t3o/conf/english/protwords.txt
deleted file mode 100644
index 391c6f81cec84ccc48e5547343d9fe3159e55753..0000000000000000000000000000000000000000
--- a/.ddev/solr/mycores/t3o/conf/english/protwords.txt
+++ /dev/null
@@ -1 +0,0 @@
-TYPO3
\ No newline at end of file
diff --git a/.ddev/solr/mycores/t3o/conf/english/schema.xml b/.ddev/solr/mycores/t3o/conf/english/schema.xml
deleted file mode 100644
index a7c91d93e1a661a68dc8439abef8b52fc2df6297..0000000000000000000000000000000000000000
--- a/.ddev/solr/mycores/t3o/conf/english/schema.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-
-
-
-
-
- id
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.ddev/solr/mycores/t3o/conf/english/synonyms.txt b/.ddev/solr/mycores/t3o/conf/english/synonyms.txt
deleted file mode 100644
index 3057a583b463a25708c97983160a363c6a58f728..0000000000000000000000000000000000000000
--- a/.ddev/solr/mycores/t3o/conf/english/synonyms.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-aaa => aaaa
-bbb => bbbb1 bbbb2
-ccc => cccc1,cccc2
-a\=>a => b\=>b
-a\,a => b\,b
-fooaaa,baraaa,bazaaa
-
-# Some synonym groups specific to this example
-GB,gib,gigabyte,gigabytes
-MB,mib,megabyte,megabytes
-Television, Televisions, TV, TVs
-#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming
-#after us won't split it into two words.
-
-# Synonym mappings can be used for spelling correction too
-pixima => pixma
-
diff --git a/.ddev/solr/mycores/t3o/conf/general_schema_fields.xml b/.ddev/solr/mycores/t3o/conf/general_schema_fields.xml
deleted file mode 100644
index e8a73135dce9bc849aaf5dae14daa4077e1b0e77..0000000000000000000000000000000000000000
--- a/.ddev/solr/mycores/t3o/conf/general_schema_fields.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.ddev/solr/mycores/t3o/conf/general_schema_types.xml b/.ddev/solr/mycores/t3o/conf/general_schema_types.xml
deleted file mode 100644
index c1bd8a94fa47a368538e368d154788a1abf66184..0000000000000000000000000000000000000000
--- a/.ddev/solr/mycores/t3o/conf/general_schema_types.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.ddev/solr/mycores/t3o/conf/solrconfig.xml b/.ddev/solr/mycores/t3o/conf/solrconfig.xml
deleted file mode 100644
index f0adf883be00bb992c36ab75111995a0528cc964..0000000000000000000000000000000000000000
--- a/.ddev/solr/mycores/t3o/conf/solrconfig.xml
+++ /dev/null
@@ -1,524 +0,0 @@
-
-
- 8.2.0
-
- ${solr.abortOnConfigurationError:true}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- native
- true
- true
-
-
-
-
-
-
- ${solr.data.dir:}
-
-
-
- 100
- 3600000
- true
-
-
-
-
- 1000
-
-
-
-
-
- 1024
-
-
-
-
-
-
-
- true
-
- 50
-
- 200
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
- 5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- edismax
- explicit
- content^40.0 title^5.0 keywords^2.0 tagsH1^5.0 tagsH2H3^3.0 tagsH4H5H6^2.0 tagsInline^1.0
- content^2.0
- content
- 15
-
- 2<-35%
- true
-
- title,content
- 3
- true
- true
-
- content
- 200
-
- false
- false
- false
- 1
- default
- wordbreak
-
- json
- true
-
-
-
- spellcheck
- elevator
-
-
-
-
-
-
- true
- json
- true
-
-
-
-
-
-
- explicit
-
-
- velocity
-
- browse
- layout
- Solritas
-
- content
- edismax
- *:*
- 10
- *,score
- content^0.5 title^1.2 keywords^2.0
- content,title,keywords
- 3
-
- content^40.0 title^5.0 keywords^2.0 tagsH1^5.0 tagsH2H3^3.0 tagsH4H5H6^2.0 tagsInline^1.0
-
- on
- type
- site
- author
- keywords
- fileMimeType
- appKey
- 1
-
- true
- true
-
-
- on
- title content
- html
- <b>
- </b>
-
-
- spellcheck
-
-
-
-
-
-
- content
- content^0.5 title^1.2 keywords^2.0
- content,title,keywords
- 1
- 1
- 3
- 15
- 20
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
- termsComponent
-
-
-
-
-
-
- explicit
-
-
- elevator
-
-
-
-
-
- solrpingquery
-
-
- all
- id
-
-
-
-
-
-
- explicit
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- default
- true
-
- name
- id
-
- features
-
- true
-
-
-
- false
-
-
- clusteringComponent
-
-
-
-
-
-
-
- default
- org.carrot2.clustering.lingo.LingoClusteringAlgorithm
- 20
-
-
-
- stc
- org.carrot2.clustering.stc.STCClusteringAlgorithm
-
-
-
-
-
- textSpell
-
-
- default
- spell
- solr.DirectSolrSpellChecker
- internal
- 0.5
- 2
- 1
- 5
- 3
- 0.01
-
-
-
-
- wordbreak
- solr.WordBreakSolrSpellChecker
- spell
-
-
-
-
-
-
-
-
- string
- elevate.xml
- true
-
-
-
-
-
-
-
-
-
- 100
-
-
-
-
-
-
- 70
- 0.5
- [-\w ,/\n\"']{20,200}
-
-
-
-
-
-
- ]]>
- ]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ,,
- ,,
- ,,
- ,,
- ,
- ]]>
-
- ]]>
-
-
-
-
-
-
-
- 60
- endtime
-
-
-
-
-
-
-
-
-
-
-
- 5
-
-
-
-
-
-
-
-
-
- html
-
-
-
-
-
- *:*
-
-
-
diff --git a/.ddev/solr/mycores/t3o/core.properties b/.ddev/solr/mycores/t3o/core.properties
deleted file mode 100644
index 2b050c12f1ab8f6b9708fdfc889091b75626c1b4..0000000000000000000000000000000000000000
--- a/.ddev/solr/mycores/t3o/core.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Written by CorePropertiesLocator
-#Wed Jan 25 21:01:15 UTC 2017
-name=t3o
-config=solrconfig.xml
-schema=english/schema.xml
-dataDir=data
diff --git a/.ddev/solr/mycores/t3o/typo3lib/solr-typo3-plugin-4.0.0.jar b/.ddev/solr/mycores/t3o/typo3lib/solr-typo3-plugin-4.0.0.jar
deleted file mode 100644
index a476fded1d1314624948a27959afabbf0fbf454e..0000000000000000000000000000000000000000
Binary files a/.ddev/solr/mycores/t3o/typo3lib/solr-typo3-plugin-4.0.0.jar and /dev/null differ
diff --git a/.ddev/solr/solr.xml b/.ddev/solr/solr.xml
deleted file mode 100644
index 4cdfd6706d7df20a1439ed34342d670e0074b4f1..0000000000000000000000000000000000000000
--- a/.ddev/solr/solr.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- ${host:}
- ${jetty.port:8983}
- ${hostContext:solr}
- ${zkClientTimeout:15000}
- ${genericCoreNodeNames:true}
-
-
-
- ${socketTimeout:0}
- ${connTimeout:0}
-
-
\ No newline at end of file
diff --git a/.ddev/solr/zoo.cfg b/.ddev/solr/zoo.cfg
deleted file mode 100644
index 952240fca511c6de034d2eff9c7e98dc0d3adfb0..0000000000000000000000000000000000000000
--- a/.ddev/solr/zoo.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-# The number of milliseconds of each tick
-tickTime=2000
-# The number of ticks that the initial
-# synchronization phase can take
-initLimit=10
-# The number of ticks that can pass between
-# sending a request and getting an acknowledgement
-syncLimit=5
-
-# the directory where the snapshot is stored.
-# dataDir=/opt/zookeeper/data
-# NOTE: Solr defaults the dataDir to /zoo_data
-
-# the port at which the clients will connect
-# clientPort=2181
-# NOTE: Solr sets this based on zkRun / zkHost params
-
-# the maximum number of client connections.
-# increase this if you need to handle more clients
-#maxClientCnxns=60
-#
-# Be sure to read the maintenance section of the
-# administrator guide before turning on autopurge.
-#
-# http://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_maintenance
-#
-# The number of snapshots to retain in dataDir
-#autopurge.snapRetainCount=3
-# Purge task interval in hours
-# Set to "0" to disable auto purge feature
-#autopurge.purgeInterval=1
\ No newline at end of file
diff --git a/extensions/ter_fe2/composer.json b/extensions/ter_fe2/composer.json
index c6965e6ff80737aab45d557939ed6a845121ba6c..93159597af33f8ea224e1da963f537c055306777 100644
--- a/extensions/ter_fe2/composer.json
+++ b/extensions/ter_fe2/composer.json
@@ -18,9 +18,10 @@
"issues": "https://git-t3o.typo3.org/t3o/ter/issues"
},
"license": "GPL-2.0+",
+ "version": "0.4.0",
"require": {
"typo3/cms-core": "^8.7 || ^9.5",
- "apache-solr-for-typo3/solr": "^9.0"
+ "apache-solr-for-typo3/solr": "^10.0"
},
"autoload": {
"psr-4": {