From b15b3b59df0af51735d5deb270b2e95c7d98353d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 20 Jan 2024 20:48:17 -0600
Subject: [PATCH] Compatibility fix for Ansible, plus bump 9.x to 9.4.1.

---
 README.md                  | 2 +-
 roles/setup/meta/main.yml  | 2 +-
 roles/setup/tasks/main.yml | 2 +-
 vars/9.x.yml               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c5100fa..bcf8727 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This project is composed of three main parts:
 
 Currently maintained versions include:
 
-  - `9.x`, `9.2.1`, `latest`: Apache Solr 9.x
+  - `9.x`, `9.4.1`, `latest`: Apache Solr 9.x
   - `8.x`, `8.11.2`: Apache Solr 8.x
   - `7.x`, `7.7.3`: Apache Solr 7.x
 
diff --git a/roles/setup/meta/main.yml b/roles/setup/meta/main.yml
index c65dbf8..8a8258b 100644
--- a/roles/setup/meta/main.yml
+++ b/roles/setup/meta/main.yml
@@ -5,7 +5,7 @@ galaxy_info:
 
   license: MIT
 
-  min_ansible_version: 2.2
+  min_ansible_version: 2.10
   min_ansible_container_version: 0.9.2
 
   platforms:
diff --git a/roles/setup/tasks/main.yml b/roles/setup/tasks/main.yml
index 8b047d2..302a2c2 100644
--- a/roles/setup/tasks/main.yml
+++ b/roles/setup/tasks/main.yml
@@ -5,7 +5,7 @@
 - name: Ensure ps is installed.
   apt: name=procps state=present
 
-- include: install-5-prep.yml
+- include_tasks: install-5-prep.yml
   when:
     - solr_version is version_compare('6.0.0', '<')
     - solr_version is version_compare('4.99.99', '>')
diff --git a/vars/9.x.yml b/vars/9.x.yml
index 5f377bf..7aba49f 100644
--- a/vars/9.x.yml
+++ b/vars/9.x.yml
@@ -4,7 +4,7 @@ java_packages:
 
 solr_remove_cruft: true
 
-solr_version: "9.4.0"
+solr_version: "9.4.1"
 # TODO: See https://github.com/geerlingguy/ansible-role-solr/issues/132
 solr_cores: ~