diff --git a/README.md b/README.md index 1fd309c..6953ede 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ # Maven ansible role -Changes related to new https://galaxy.ansible.com (Nov.2023) --------- -Out of my control, with the import of `v3.9.7` role name has changed (from `tecris.maven` to `tecris.ansible-maven`) as https://galaxy.ansible.com reincarnated - Installation ------------ @@ -16,7 +12,7 @@ Example Playbook ``` - hosts: all roles: - - { role: tecris.ansible-maven, maven_major: 3, maven_version: 3.9.7, maven_home_parent_directory: /opt } + - { role: tecris.ansible-maven, maven_major: 3, maven_version: 3.9.8, maven_home_parent_directory: /opt } ``` Role Variables @@ -27,9 +23,9 @@ Role Variables |*Variable* | *Default Value* |*Description* | | --- | --- | --- | | maven_major | 3 | MAJOR [version](http://semver.org/) | -| maven_version | 3.9.7 | Version number| +| maven_version | 3.9.8 | Version number| | maven_home_parent_directory | /opt | MAVEN_HOME parent directory| -| maven_download_url |http://www.apache.org/dist/maven/maven-3/3.9.7/binaries/apache-maven-3.9.7-bin.tar.gz| If using mirror/proxy (see [ansible.builtin.get_url](https://docs.ansible.com/ansible/latest/collections/ansible/builtin/get_url_module.html)) | +| maven_download_url |http://www.apache.org/dist/maven/maven-3/3.9.8/binaries/apache-maven-3.9.8-bin.tar.gz| If using mirror/proxy (see [ansible.builtin.get_url](https://docs.ansible.com/ansible/latest/collections/ansible/builtin/get_url_module.html)) | |maven_download_username||see [url_username](https://docs.ansible.com/ansible/latest/collections/ansible/builtin/get_url_module.html#parameter-url_username) parameter| |maven_download_password||see [url_password](https://docs.ansible.com/ansible/latest/collections/ansible/builtin/get_url_module.html#parameter-url_password) parameter| diff --git a/defaults/main.yml b/defaults/main.yml index c591348..fcc2475 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,7 @@ --- # defaults file for apache-maven maven_major: 3 -maven_version: 3.9.7 +maven_version: 3.9.8 maven_home_parent_directory: /opt maven_file_name: apache-maven-{{ maven_version }}-bin.tar.gz maven_download_url: 'http://dlcdn.apache.org/maven/maven-{{ maven_major }}/{{ maven_version }}/binaries/{{ maven_file_name }}' diff --git a/dockerfiles/Dockerfile.debian_jdk.12 b/dockerfiles/Dockerfile.debian_jdk.12 index 9282a17..24a17a8 100644 --- a/dockerfiles/Dockerfile.debian_jdk.12 +++ b/dockerfiles/Dockerfile.debian_jdk.12 @@ -1,5 +1,5 @@ ARG TAG -FROM org.tecris/debian_11-systemd:${TAG} +FROM org.tecris/debian_12-systemd:${TAG} ARG jdk_version diff --git a/molecule/resources/tests/test_common.py b/molecule/resources/tests/test_common.py index 57bd49d..5398609 100644 --- a/molecule/resources/tests/test_common.py +++ b/molecule/resources/tests/test_common.py @@ -22,7 +22,7 @@ def test_maven_path(self): self.assertEqual(f.group, "root", msg="maven profile file, incorrect group") self.assertEqual(f.mode, 0o644, msg="maven profile file, incorrect mode") - self.assertTrue(f.contains("M2_HOME=/opt/apache-maven-3.9.7")) + self.assertTrue(f.contains("M2_HOME=/opt/apache-maven-3.9.8")) self.assertTrue( f.contains("PATH=$PATH:$M2_HOME/bin")) @@ -32,4 +32,4 @@ def test_maven_installed(self): self.assertTrue(cmd.succeeded) # https://maven.apache.org/install.html - self.assertEqual(self.host.check_output(". /etc/profile.d/java.sh && . /etc/profile.d/maven.sh && mvn --version | grep Apache"), 'Apache Maven 3.9.7 (8b094c9513efc1b9ce2d952b3b9c8eaedaf8cbf0)') + self.assertEqual(self.host.check_output(". /etc/profile.d/java.sh && . /etc/profile.d/maven.sh && mvn --version | grep Apache"), 'Apache Maven 3.9.8 (36645f6c9b5079805ea5009217e36f2cffd34256)')