From f3ab706b1ee791030506e9ef392b88fc011d82e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Leybaert?= <benoit.leybaert@imio.be>
Date: Tue, 8 Oct 2024 14:50:49 +0200
Subject: [PATCH 1/2] feat(solr): change cfg for solr local config

---
 buildout.cfg      | 2 +-
 solr.cfg          | 4 ++--
 versions-base.cfg | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/buildout.cfg b/buildout.cfg
index fb21192..f5458ec 100755
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -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
diff --git a/solr.cfg b/solr.cfg
index e57fb32..97ee160 100644
--- a/solr.cfg
+++ b/solr.cfg
@@ -44,6 +44,6 @@ 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
diff --git a/versions-base.cfg b/versions-base.cfg
index d754909..e93dfd2 100644
--- a/versions-base.cfg
+++ b/versions-base.cfg
@@ -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

From 52cf22f693fed2b975809c29e0657cbff91d1f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Dubois?= <remi.dubois@imio.be>
Date: Wed, 9 Oct 2024 09:26:43 +0200
Subject: [PATCH 2/2] feat: comment varenv for local tests

---
 solr.cfg | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/solr.cfg b/solr.cfg
index 97ee160..c628a12 100644
--- a/solr.cfg
+++ b/solr.cfg
@@ -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
@@ -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
@@ -38,8 +38,8 @@ 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}