diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml
index e62915fba..9c0e14e62 100644
--- a/.github/workflows/lighthouse.yml
+++ b/.github/workflows/lighthouse.yml
@@ -19,7 +19,7 @@ jobs:
ports:
- 5432:5432
solr:
- image: solr:8.6
+ image: solr:9.2
ports:
- 8983:8983
steps:
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 847b57ac1..d92b1ada1 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -30,7 +30,7 @@ jobs:
ports:
- 5432:5432
solr:
- image: solr:8.6
+ image: solr:9.2
ports:
- 8983:8983
steps:
@@ -43,7 +43,7 @@ jobs:
docker cp solr_conf ${{ job.services.solr.id }}:/opt/solr/server/solr/configsets/geniza
docker exec --user root ${{ job.services.solr.id }} /bin/bash -c "chown -R solr:solr /opt/solr/server/solr/configsets/geniza"
- - name: Copy solr configsets to solr home directory (Solr 8 specific)
+ - name: Copy solr configsets to solr home directory
run: "docker exec -d ${{ job.services.solr.id }} cp -r /opt/solr/server/solr/configsets /var/solr/data"
# Python version to use is stored in the .python-version file, which is the
diff --git a/.github/workflows/visual_tests.yml b/.github/workflows/visual_tests.yml
index 5df186846..1fbe115af 100644
--- a/.github/workflows/visual_tests.yml
+++ b/.github/workflows/visual_tests.yml
@@ -53,7 +53,7 @@ jobs:
ports:
- 5432:5432
solr:
- image: solr:8.6
+ image: solr:9.2
ports:
- 8983:8983
steps:
diff --git a/DEPLOYNOTES.md b/DEPLOYNOTES.md
index 2f948ff6a..16cb70d27 100644
--- a/DEPLOYNOTES.md
+++ b/DEPLOYNOTES.md
@@ -1,5 +1,10 @@
# Deploy Notes
+## 4.15
+
+- The minimum required Solr version has been bumped to 9.2. Please upgrade to this version,
+ update Solr configset, and then reindex all content with `python manage.py index`.
+
## 4.14
- Seleucid calendar conversion is now implemented, so automatic conversion should be applied
diff --git a/README.rst b/README.rst
index 45b51a7b2..855d9608b 100644
--- a/README.rst
+++ b/README.rst
@@ -6,7 +6,7 @@ Princeton Geniza Project
Python/Django web application for a version 4.x of the `Princeton Geniza Project
`_.
-Python 3.9 / Django 3.2 / Node 16 / Postgresql / Solr 8.6
+Python 3.9 / Django 3.2 / Node 16 / Postgresql / Solr 9.2
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.7347726.svg
:target: https://doi.org/10.5281/zenodo.7347726
diff --git a/requirements/prod.txt b/requirements/prod.txt
index 1ddaabb47..e412bc0fb 100644
--- a/requirements/prod.txt
+++ b/requirements/prod.txt
@@ -13,7 +13,9 @@ django-modeltranslation==0.17.5
django-admin-sortable2
python-dateutil>=2.8
django-tabular-export
-parasolr>=0.9
+# NOTE: Once parasolr 0.10 is released, stop pulling it from git
+git+https://github.com/Princeton-CDH/parasolr@develop
+# parasolr>=0.9
django-gfklookupwidget
django-adminlogentries
django-autocomplete-light>=3.9.4
diff --git a/solr_conf/conf/managed-schema b/solr_conf/conf/managed-schema
index 2eb643294..309858e7e 100644
--- a/solr_conf/conf/managed-schema
+++ b/solr_conf/conf/managed-schema
@@ -107,7 +107,7 @@
-
+
diff --git a/solr_conf/conf/params.json b/solr_conf/conf/params.json
index b129c5a42..e8c51c011 100644
--- a/solr_conf/conf/params.json
+++ b/solr_conf/conf/params.json
@@ -11,12 +11,6 @@
"facet": "on",
"facet.mincount": "1",
"": { "v": 0 }
- },
- "velocity": {
- "wt": "velocity",
- "v.template": "browse",
- "v.layout": "layout",
- "": { "v": 0 }
}
}
}
diff --git a/solr_conf/conf/solrconfig.xml b/solr_conf/conf/solrconfig.xml
index ba639ab4e..a672ef153 100644
--- a/solr_conf/conf/solrconfig.xml
+++ b/solr_conf/conf/solrconfig.xml
@@ -36,7 +36,7 @@
affect both how text is indexed and queried.
-->
- 7.0.0
+ 9.2.0
-
-
+
-
-
+
-
-
+
-
-
-
-
-
+
+
+
+
+
+
-
@@ -430,11 +414,8 @@
Caches results of searches - ordered lists of document ids
(DocList) based on a query, a sort, and the range of documents requested.
- Additional supported parameter by LRUCache:
- maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
- to occupy
-->
-
@@ -445,14 +426,14 @@
document). Since Lucene internal document ids are transient,
this cache will not be autowarmed.
-->
-
@@ -893,7 +874,7 @@
(SearchHandler) can be registered multiple times with different
names (and different init parameters)
-->
-
+
explicit
@@ -1414,17 +1395,12 @@
-
- ${velocity.template.base.dir:}
- ${velocity.solr.resource.loader.enabled:true}
- ${velocity.params.resource.loader.enabled:false}
-
-
+
5