From d2ece93c12237459901928e163a0127f82b94235 Mon Sep 17 00:00:00 2001
From: Helmut Wolf <helmut.wolf@world-direct.at>
Date: Tue, 14 May 2024 20:28:14 +0200
Subject: [PATCH] #222 Migrate to middleware_automation.common.maven_artifact

---
 requirements.txt                         | 2 +-
 requirements.yml                         | 2 +-
 roles/keycloak_quarkus/README.md         | 7 +++----
 roles/keycloak_quarkus/tasks/install.yml | 6 +++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a91d12a..5de7845 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,4 +4,4 @@
 # pip install -r requirements.txt
 #
 netaddr
-lxml # for community.general.maven_artifact
\ No newline at end of file
+lxml # for middleware_automation.common.maven_artifact
\ No newline at end of file
diff --git a/requirements.yml b/requirements.yml
index 10150ad..06e5714 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,5 +1,5 @@
 ---
 collections:
   - name: middleware_automation.common
+    version: ">=1.2.1"
   - name: ansible.posix
-  - name: community.general # for `maven_artifact`
diff --git a/roles/keycloak_quarkus/README.md b/roles/keycloak_quarkus/README.md
index 28f81aa..3e4ce6d 100644
--- a/roles/keycloak_quarkus/README.md
+++ b/roles/keycloak_quarkus/README.md
@@ -21,7 +21,6 @@ The roles depends on:
 
 * [middleware_automation.common](https://github.com/ansible-middleware/common)
 * [ansible-posix](https://docs.ansible.com/ansible/latest/collections/ansible/posix/index.html)
-* [community.general](https://docs.ansible.com/ansible/latest/collections/community/general/index.html)
 
 To install all the dependencies via galaxy:
 
@@ -180,9 +179,9 @@ Role Defaults
 
 Providers support different sources:
 
-* `url`: http download for SPIs not requiring authentication
-* `maven`: maven download for SPIs hosted publicly on Apache Maven Central or private Maven repositories like Github Maven requiring authentication
-* `local_path`: static SPIs to be uploaded
+* `url`: http download for providers not requiring authentication
+* `maven`: maven download for providers hosted publicly on Apache Maven Central or private Maven repositories like Github Maven requiring authentication
+* `local_path`: static providers to be uploaded
 
 Provider definition:
 
diff --git a/roles/keycloak_quarkus/tasks/install.yml b/roles/keycloak_quarkus/tasks/install.yml
index 6c8b31d..ced4191 100644
--- a/roles/keycloak_quarkus/tasks/install.yml
+++ b/roles/keycloak_quarkus/tasks/install.yml
@@ -229,7 +229,7 @@
 
 # this requires the `lxml` package to be installed; we redirect this step to localhost such that we do need to install it on the remote hosts
 - name: "Download custom providers to localhost using maven"
-  community.general.maven_artifact:
+  middleware_automation.common.maven_artifact:
     repository_url: "{{ item.maven.repository_url }}"
     group_id: "{{ item.maven.group_id }}"
     artifact_id: "{{ item.maven.artifact_id }}"
@@ -244,7 +244,7 @@
   no_log: "{{ item.maven.password is defined and item.maven.password | length > 0 | default(false) }}"
   notify: "{{ ['rebuild keycloak config', 'restart keycloak'] if not item.restart is defined or not item.restart else [] }}"
 
-- name: "Upload local maven SPIs"
+- name: "Upload local maven providers"
   ansible.builtin.copy:
     src: "{{ local_path.stat.path }}/{{ item.id }}.jar"
     dest: "{{ keycloak.home }}/providers/{{ item.id }}.jar"
@@ -256,7 +256,7 @@
   when: item.maven is defined
   no_log: "{{ item.maven.password is defined and item.maven.password | length > 0 | default(false) }}"
 
-- name: "Upload local SPIs"
+- name: "Upload local providers"
   ansible.builtin.copy:
     src: "{{ item.local_path}}"
     dest: "{{ keycloak.home }}/providers/{{ item.id }}.jar"