From 1f20bd997890646f098e404878bf3eb972d75bea Mon Sep 17 00:00:00 2001
From: Alan Kyffin <alan.kyffin@stfc.ac.uk>
Date: Wed, 30 Oct 2024 17:11:29 +0000
Subject: [PATCH] Update component versions and dev config for icat.server 6.1+

---
 roles/dev_common/templates/settings.xml.j2 | 3 ++-
 roles/icat_lucene/defaults/main.yml        | 2 +-
 roles/icat_server/defaults/main.yml        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/dev_common/templates/settings.xml.j2 b/roles/dev_common/templates/settings.xml.j2
index f6b96aa..32b7166 100644
--- a/roles/dev_common/templates/settings.xml.j2
+++ b/roles/dev_common/templates/settings.xml.j2
@@ -7,7 +7,8 @@
          <properties>
              <serverUrl>{{ icat_url }}</serverUrl>
              {% if lucene_url is defined and lucene_url %}
-             <luceneUrl>{{ lucene_url }}</luceneUrl>
+             <searchEngine>LUCENE</searchEngine>
+             <searchUrls>{{ lucene_url }}</searchUrls>
              {% endif %}
              <javax.net.ssl.trustStore>{{ payara_domain_dir }}/config/cacerts.jks</javax.net.ssl.trustStore>
              <containerHome>{{ payara_dir }}</containerHome>
diff --git a/roles/icat_lucene/defaults/main.yml b/roles/icat_lucene/defaults/main.yml
index a31759a..b67cf1d 100644
--- a/roles/icat_lucene/defaults/main.yml
+++ b/roles/icat_lucene/defaults/main.yml
@@ -1,4 +1,4 @@
 ---
 
-icat_lucene_version: '2.0.2'
+icat_lucene_version: '3.0.0-SNAPSHOT'
 icat_lucene_data_dir: 'data/lucene'
diff --git a/roles/icat_server/defaults/main.yml b/roles/icat_server/defaults/main.yml
index c787c59..47ab070 100644
--- a/roles/icat_server/defaults/main.yml
+++ b/roles/icat_server/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 
-icat_server_version: '6.0.1'
+icat_server_version: '6.1.0-SNAPSHOT'
 icat_server_rootUserNames: "{% if ansible_local.local.instantiations.authn_simple is defined and ansible_local.local.instantiations.authn_simple == 'true' %}simple/root {% endif %}{% if ansible_local.local.instantiations.authn_db is defined and ansible_local.local.instantiations.authn_db == 'true' %}db/root {% endif %}"
 icat_server_maxEntities: "10000"
 icat_server_authn_list: "{% if ansible_local.local.instantiations.authn_simple is defined and ansible_local.local.instantiations.authn_simple == 'true' %}simple {% endif %}{% if ansible_local.local.instantiations.authn_db is defined and ansible_local.local.instantiations.authn_db == 'true' %}db {% endif %}{% if ansible_local.local.instantiations.authn_anon is defined and ansible_local.local.instantiations.authn_anon == 'true' %}anon {% endif %}{% if ansible_local.local.instantiations.authn_ldap is defined and ansible_local.local.instantiations.authn_ldap == 'true' %}ldap {% endif %}{% if ansible_local.local.instantiations.authn_ip_clf is defined and ansible_local.local.instantiations.authn_ip_clf == 'true' %}ip_clf {% endif %}{% if ansible_local.local.instantiations.authn_uows_clf is defined and ansible_local.local.instantiations.authn_uows_clf == 'true' %}uows_clf {% endif %}"