Merge pull request #38 from kitconcept/fix-solr-9-configuration

Change configuration to solr v9

Author: reekitconcept

docker-compose.yml

@@ -4,6 +4,8 @@ services:
       context: solr/
     ports:
       - 8983:8983
+    environment:
+      SOLR_OPTS: "-Dsolr.config.lib.enabled=true"
     command:
       - solr-precreate
       - plone

solr/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM solr:8
+FROM solr:9
 
 LABEL maintainer="kitconcept, GmbH <info@kitconcept.com>" \
       org.label-schema.name="ghcr.io/kitconcept/solr" \

solr/etc/conf/solrconfig.xml

@@ -12,31 +12,21 @@
   <schemaFactory class="ClassicIndexSchemaFactory" />
 
   <!-- TIKA START -->
-  <!-- Load Data Import Handler and Apache Tika (extraction) libraries -->
-  <lib dir="${solr.install.dir:../../../..}/dist/"
-       regex="solr-dataimporthandler-.*\.jar"
+  <lib dir="${solr.install.dir:../../../..}/modules/extraction/lib"
+       regex=".*\.jar"
   />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib"
+  <lib dir="${solr.install.dir:../../../..}/modules/clustering/lib/"
        regex=".*\.jar"
   />
-  <lib dir="${solr.install.dir:../../../..}/dist/"
-       regex="solr-cell-\d.*\.jar"
-  />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/"
+  <lib dir="${solr.install.dir:../../../..}/modules/langid/lib/"
        regex=".*\.jar"
   />
-  <lib dir="${solr.install.dir:../../../..}/dist/"
-       regex="solr-langid-\d.*\.jar"
-  />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib"
+  <lib dir="${solr.install.dir:../../../..}/modules/ltr/lib/"
        regex=".*\.jar"
   />
-  <lib dir="${solr.install.dir:../../../..}/dist/"
-       regex="solr-velocity-\d.*\.jar"
-  />
 
   <!-- Request Dispatcher
        This section contains instructions for how the SolrDispatchFilter

src/kitconcept/solr/profiles/default/registry/kitconcept.solr.interfaces.IKitconceptSolrSettings.xml

@@ -28,8 +28,8 @@
       ],
       "highlightingFields": [
       {"field": "content", "prop": "highlighting"},
-      {"field": "title", "prop": "highlighting_title"},
-      {"field": "description", "prop": "highlighting_description"}
+      {"field": "Title", "prop": "highlighting_title"},
+      {"field": "Description", "prop": "highlighting_description"}
       ],
       "searchTabs": [
       {

tox.ini

@@ -132,6 +132,22 @@ extras =
     test
 
 
+[testenv:devtest]
+# It's not possible to parametrize pytest with a given pattern
+# via the "test" target, because all the tests are ALREADY added,
+# so all tests would run regardless of what I want.
+description = run the tests, pytest parametrized
+use_develop = true
+skip_install = false
+constrain_package_deps = false
+set_env =
+    ROBOT_BROWSER=headlesschrome
+commands =
+    pytest --disable-warnings {posargs}
+extras =
+    test
+
+
 [testenv:coverage]
 description = get a test coverage report
 use_develop = true