Skip to content

DMS-954 solr upgrade #15

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

DMS-954 solr upgrade #15

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
f3ab706
feat(solr): change cfg for solr local config
bleybaert Oct 8, 2024
52cf22f
feat: comment varenv for local tests
remdub Oct 9, 2024
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
2 changes: 1 addition & 1 deletion buildout.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Add the config name you want to use in the extends attribute: dev.cfg, prod.cfg, ...
extends =
buildout-main.cfg
# solr.cfg
solr.cfg
# ldap.cfg
# rest.cfg
# no-amqp.cfg
Expand Down
18 changes: 9 additions & 9 deletions solr.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Genshi = 0.7.1
collective.indexing = 2.1
collective.js.showmore = 1.0a4
collective.recipe.solrinstance = 5.3.3
collective.solr = 8.4.2
;collective.solr = 8.4.2
gocept.download = 0.9.5
hexagonit.recipe.download = 1.7.1
kitconcept.recipe.solr = 1.0.0a5
Expand All @@ -26,10 +26,10 @@ eggs+=
collective.solr
collective.indexing

environment-vars +=
COLLECTIVE_SOLR_HOST ${port:solr-host}
COLLECTIVE_SOLR_PORT ${port:solr-port}
COLLECTIVE_SOLR_BASE ${port:solr-base}
# environment-vars +=
# COLLECTIVE_SOLR_HOST ${port:solr-host}
# COLLECTIVE_SOLR_PORT ${port:solr-port}
# COLLECTIVE_SOLR_BASE ${port:solr-base}

[core-prop]
recipe = collective.recipe.template
Expand All @@ -38,12 +38,12 @@ output = solr/core.properties

[solr]
recipe = kitconcept.recipe.solr
src = http://archive.apache.org/dist/lucene/solr/8.11.1/solr-8.11.1.tgz
;src = https://archive.apache.org/dist/solr/solr/9.6.0/solr-9.6.0.tgz
;src = http://archive.apache.org/dist/lucene/solr/8.11.1/solr-8.11.1.tgz
src = https://archive.apache.org/dist/solr/solr/9.6.0/solr-9.6.0.tgz
solr-config = solr
port = ${port:solr-port}

[sources]
collective.solr = git ${remotes:collective}/collective.solr.git pushurl=${remotes:collective_push}/collective.solr.git branch=8.x.x-upgrade-4-improvments
;collective.solr = git ${remotes:imio}/collective.solr.git pushurl=${remotes:imio_push}/collective.solr.git branch=DMS-954
;collective.solr = git ${remotes:collective}/collective.solr.git pushurl=${remotes:collective_push}/collective.solr.git branch=8.x.x-upgrade-4-improvments
collective.solr = git ${remotes:imio}/collective.solr.git pushurl=${remotes:imio_push}/collective.solr.git branch=DMS-954
collective.indexing = git ${remotes:sge}/collective.indexing.git pushurl=${remotes:sge_push}/collective.indexing.git
6 changes: 4 additions & 2 deletions versions-base.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,10 @@ imio.annex = 2.24
collective.iconifiedcategory = 0.68
collective.js.datatables = 4.1.2
# max version for py2 is 7.x
# plone.restapi = 7.9.0 not working with collective.solr 7.0, ok with 8.
plone.restapi = 4.1.4
# for solr cluster
plone.restapi = 7.9.0
# just in case
# plone.restapi = 4.1.4
# all under are dependencies of plone.restapi
attrs = 21.2.0
configparser = 4.0.2
Expand Down
Loading