Skip to content

IULRDC-73: DataCORE - migrate solr 6 core to solr 9 #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rdlebeau wants to merge 2 commits into
base: main
Choose a base branch
from
Open

IULRDC-73: DataCORE - migrate solr 6 core to solr 9 #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66f39f8
IULRDC-73: DataCORE - migrate solr 6 core to solr 9
rdlebeau Jun 5, 2026
b2861c3
IULRDC-73 DataCORE - removing solr.LatLonType
rdlebeau Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ jobs:
- image: ghcr.io/samvera/fcrepo4:4.7.5
environment:
CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
- image: solr:7
- image: solr:9
command: bin/solr -cloud -noprompt -f -p 8985

environment:
- SOLR_MODULES=analysis-extras,extraction
# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
Expand Down Expand Up @@ -116,8 +117,7 @@ jobs:
cd solr/config
zip -1 -r solr_hyrax_config.zip ./*
curl -H "Content-type:application/octet-stream" --data-binary @solr_hyrax_config.zip "http://localhost:8985/solr/admin/configs?action=UPLOAD&name=hyrax"
curl -H 'Content-type: application/json' http://localhost:8985/v2/collections/ -d '{create: {name: hydra-test, config: hyrax, numShards: 1}}'

curl "http://localhost:8985/solr/admin/collections?action=CREATE&name=hydra-test&numShards=1&collection.configName=hyrax"
- run:
name: Run rspec in parallel
command: |
Expand Down
17 changes: 3 additions & 14 deletions solr/config/schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
that avoids logging every request
-->

<schema name="Hydra Demo Index" version="1.5">
<schema name="Hydra Demo Index" version="1.7">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="1.4" is Solr's version number for the schema syntax and semantics. It should
Expand Down Expand Up @@ -80,7 +80,7 @@
<fieldType name="date" class="solr.TrieDateField" precisionStep="0" positionIncrementGap="0"/>
<!-- A Trie based date field for faster date range queries and date faceting. -->
<fieldType name="tdate" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>

<fieldType name="dateRange" class="solr.DateRangeField" omitNorms="true" omitTermFreqAndPositions="true"/>

<!-- This point type indexes the coordinates as separate fields (subFields)
If subFieldType is defined, it references a type, and a dynamic field
Expand All @@ -94,10 +94,7 @@
users normally should not need to know about them.
-->
<fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>

<!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
<fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>


<!-- An alternative geospatial field type new to Solr 4. It supports multiValued and polygon shapes.
For more information about this and other Spatial fields new to Solr 4, see:
http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
Expand Down Expand Up @@ -312,14 +309,6 @@
<!-- Type used to index the lat and lon components for the "location" FieldType -->
<dynamicField name="*_coordinate" type="tdouble" indexed="true" stored="false" />

<!-- location (_ll...) -->
<dynamicField name="*_lli" type="location" stored="false" indexed="true" multiValued="false"/>
<dynamicField name="*_llim" type="location" stored="false" indexed="true" multiValued="true"/>
<dynamicField name="*_lls" type="location" stored="true" indexed="false" multiValued="false"/>
<dynamicField name="*_llsm" type="location" stored="true" indexed="false" multiValued="true"/>
<dynamicField name="*_llsi" type="location" stored="true" indexed="true" multiValued="false"/>
<dynamicField name="*_llsim" type="location" stored="true" indexed="true" multiValued="true"/>

<dynamicField name="*suggest" type="textSuggest" indexed="true" stored="false" multiValued="true" />

<!-- you must define copyField source and dest fields explicity or schemaBrowser doesn't work -->
Expand Down
7 changes: 1 addition & 6 deletions solr/config/solrconfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,8 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
<luceneMatchVersion>5.0.0</luceneMatchVersion>
<luceneMatchVersion>9.10.0</luceneMatchVersion>

<lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
<lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
<lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />

<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
</directoryFactory>
Expand Down