diff --git a/README.md b/README.md index 3df3cd8..fbcd9b4 100644 --- a/README.md +++ b/README.md @@ -107,6 +107,11 @@ The following versions of Maven are supported without any additional configuration (for other versions follow the Advanced Configuration instructions): +* `4.0.0-beta-3` +* `3.9.8` +* `3.9.7` +* `3.9.6` +* `3.9.5` * `3.9.4` * `3.9.3` * `3.9.2` @@ -141,7 +146,7 @@ variable below: ```yaml # SHA256 sum for the redistributable package (i.e. apache-maven-{{ maven_version }}-bin.tar.gz) -maven_redis_sha256sum: '6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82' +maven_redis_checksum: '6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82' ``` Example Playbooks diff --git a/tasks/main.yml b/tasks/main.yml index c0d99a2..f5f21df 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,15 +1,17 @@ # code: language=ansible --- - name: Load version vars - with_first_found: - - '../vars/versions/{{ maven_version }}.yml' + ansible.builtin.include_vars: "{{ __current_item }}" + with_items: - ../vars/versions/default.yml - ansible.builtin.include_vars: '{{ item }}' + - '../vars/versions/{{ maven_version }}.yml' + loop_control: + loop_var: "__current_item" - name: Assert version vars ansible.builtin.assert: that: - - "maven_redis_sha256sum not in (None, '')" + - "maven_redis_checksum not in (None, '')" - name: Install which (yum, dnf, zypper) become: true @@ -28,7 +30,7 @@ ansible.builtin.get_url: url: '{{ maven_mirror }}/{{ maven_redis_filename }}' dest: '{{ maven_download_dir }}/{{ maven_redis_filename }}' - checksum: 'sha256:{{ maven_redis_sha256sum }}' + checksum: '{{ maven_algo_checksum }}:{{ maven_redis_checksum }}' force: false use_proxy: '{{ maven_use_proxy }}' validate_certs: '{{ maven_validate_certs }}' diff --git a/vars/versions/3.1.1.yml b/vars/versions/3.1.1.yml index 7b3e367..3396b2a 100644 --- a/vars/versions/3.1.1.yml +++ b/vars/versions/3.1.1.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b' +maven_redis_checksum: '077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b' diff --git a/vars/versions/3.2.5.yml b/vars/versions/3.2.5.yml index ccf3bac..78af5e5 100644 --- a/vars/versions/3.2.5.yml +++ b/vars/versions/3.2.5.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '8c190264bdf591ff9f1268dc0ad940a2726f9e958e367716a09b8aaa7e74a755' +maven_redis_checksum: '8c190264bdf591ff9f1268dc0ad940a2726f9e958e367716a09b8aaa7e74a755' diff --git a/vars/versions/3.3.9.yml b/vars/versions/3.3.9.yml index 30d9a97..9b226e5 100644 --- a/vars/versions/3.3.9.yml +++ b/vars/versions/3.3.9.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82' +maven_redis_checksum: '6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82' diff --git a/vars/versions/3.5.0.yml b/vars/versions/3.5.0.yml index 40b7a3e..d7a8ac4 100644 --- a/vars/versions/3.5.0.yml +++ b/vars/versions/3.5.0.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: 'beb91419245395bd69a4a6edad5ca3ec1a8b64e41457672dc687c173a495f034' +maven_redis_checksum: 'beb91419245395bd69a4a6edad5ca3ec1a8b64e41457672dc687c173a495f034' diff --git a/vars/versions/3.5.2.yml b/vars/versions/3.5.2.yml index add700b..b886313 100644 --- a/vars/versions/3.5.2.yml +++ b/vars/versions/3.5.2.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '707b1f6e390a65bde4af4cdaf2a24d45fc19a6ded00fff02e91626e3e42ceaff' +maven_redis_checksum: '707b1f6e390a65bde4af4cdaf2a24d45fc19a6ded00fff02e91626e3e42ceaff' diff --git a/vars/versions/3.5.3.yml b/vars/versions/3.5.3.yml index 06ae714..f1b807c 100644 --- a/vars/versions/3.5.3.yml +++ b/vars/versions/3.5.3.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: 'b52956373fab1dd4277926507ab189fb797b3bc51a2a267a193c931fffad8408' +maven_redis_checksum: 'b52956373fab1dd4277926507ab189fb797b3bc51a2a267a193c931fffad8408' diff --git a/vars/versions/3.5.4.yml b/vars/versions/3.5.4.yml index 9789ae2..db6cb05 100644 --- a/vars/versions/3.5.4.yml +++ b/vars/versions/3.5.4.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: 'ce50b1c91364cb77efe3776f756a6d92b76d9038b0a0782f7d53acf1e997a14d' +maven_redis_checksum: 'ce50b1c91364cb77efe3776f756a6d92b76d9038b0a0782f7d53acf1e997a14d' diff --git a/vars/versions/3.6.0.yml b/vars/versions/3.6.0.yml index 3bd608c..816a6b0 100644 --- a/vars/versions/3.6.0.yml +++ b/vars/versions/3.6.0.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '6a1b346af36a1f1a491c1c1a141667c5de69b42e6611d3687df26868bc0f4637' +maven_redis_checksum: '6a1b346af36a1f1a491c1c1a141667c5de69b42e6611d3687df26868bc0f4637' diff --git a/vars/versions/3.6.1.yml b/vars/versions/3.6.1.yml index ea8eced..3e146a6 100644 --- a/vars/versions/3.6.1.yml +++ b/vars/versions/3.6.1.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '2528c35a99c30f8940cc599ba15d34359d58bec57af58c1075519b8cd33b69e7' +maven_redis_checksum: '2528c35a99c30f8940cc599ba15d34359d58bec57af58c1075519b8cd33b69e7' diff --git a/vars/versions/3.6.2.yml b/vars/versions/3.6.2.yml index a19165d..b50230b 100644 --- a/vars/versions/3.6.2.yml +++ b/vars/versions/3.6.2.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '3fbc92d1961482d6fbd57fbf3dd6d27a4de70778528ee3fb44aa7d27eb32dfdc' +maven_redis_checksum: '3fbc92d1961482d6fbd57fbf3dd6d27a4de70778528ee3fb44aa7d27eb32dfdc' diff --git a/vars/versions/3.6.3.yml b/vars/versions/3.6.3.yml index 62b78f0..b9851a4 100644 --- a/vars/versions/3.6.3.yml +++ b/vars/versions/3.6.3.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '26ad91d751b3a9a53087aefa743f4e16a17741d3915b219cf74112bf87a438c5' +maven_redis_checksum: '26ad91d751b3a9a53087aefa743f4e16a17741d3915b219cf74112bf87a438c5' diff --git a/vars/versions/3.8.1.yml b/vars/versions/3.8.1.yml index fbd07fa..3cdeb58 100644 --- a/vars/versions/3.8.1.yml +++ b/vars/versions/3.8.1.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: 'b98a1905eb554d07427b2e5509ff09bd53e2f1dd7a0afa38384968b113abef02' +maven_redis_checksum: 'b98a1905eb554d07427b2e5509ff09bd53e2f1dd7a0afa38384968b113abef02' diff --git a/vars/versions/3.8.2.yml b/vars/versions/3.8.2.yml index 3d67171..f86f1fa 100644 --- a/vars/versions/3.8.2.yml +++ b/vars/versions/3.8.2.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '8dae10b09feb7b8e4c079fc39a11f3296ab630fd9bc44ecea0fb288cec7770f7' +maven_redis_checksum: '8dae10b09feb7b8e4c079fc39a11f3296ab630fd9bc44ecea0fb288cec7770f7' diff --git a/vars/versions/3.8.3.yml b/vars/versions/3.8.3.yml index 965b1ef..b43e593 100644 --- a/vars/versions/3.8.3.yml +++ b/vars/versions/3.8.3.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '0f1597d11085b8fe93d84652a18c6deea71ece9fabba45a02cf6600c7758fd5b' +maven_redis_checksum: '0f1597d11085b8fe93d84652a18c6deea71ece9fabba45a02cf6600c7758fd5b' diff --git a/vars/versions/3.8.4.yml b/vars/versions/3.8.4.yml index 6ee48aa..fe3464a 100644 --- a/vars/versions/3.8.4.yml +++ b/vars/versions/3.8.4.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '2cdc9c519427bb20fdc25bef5a9063b790e4abd930e7b14b4e9f4863d6f9f13c' +maven_redis_checksum: '2cdc9c519427bb20fdc25bef5a9063b790e4abd930e7b14b4e9f4863d6f9f13c' diff --git a/vars/versions/3.8.5.yml b/vars/versions/3.8.5.yml index f5fc85d..11c44f5 100644 --- a/vars/versions/3.8.5.yml +++ b/vars/versions/3.8.5.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '88e30700f32a3f60e0d28d0f12a3525d29b7c20c72d130153df5b5d6d890c673' +maven_redis_checksum: '88e30700f32a3f60e0d28d0f12a3525d29b7c20c72d130153df5b5d6d890c673' diff --git a/vars/versions/3.8.6.yml b/vars/versions/3.8.6.yml index dfef187..3261eb3 100644 --- a/vars/versions/3.8.6.yml +++ b/vars/versions/3.8.6.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: 'c7047a48deb626abf26f71ab3643d296db9b1e67f1faa7d988637deac876b5a9' +maven_redis_checksum: 'c7047a48deb626abf26f71ab3643d296db9b1e67f1faa7d988637deac876b5a9' diff --git a/vars/versions/3.8.7.yml b/vars/versions/3.8.7.yml index 041ddd1..1ed6eb5 100644 --- a/vars/versions/3.8.7.yml +++ b/vars/versions/3.8.7.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '628b49352130d1d25d5519b1c724f0efe58b86bad55f37a694ca8f73f11e3604' +maven_redis_checksum: '628b49352130d1d25d5519b1c724f0efe58b86bad55f37a694ca8f73f11e3604' diff --git a/vars/versions/3.8.8.yml b/vars/versions/3.8.8.yml index aa80d31..d56df4e 100644 --- a/vars/versions/3.8.8.yml +++ b/vars/versions/3.8.8.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '17811e108701af5985bf5167abbd47c06e92c6c6bd1c13a1a1c095c9b4ecc32a' +maven_redis_checksum: '17811e108701af5985bf5167abbd47c06e92c6c6bd1c13a1a1c095c9b4ecc32a' diff --git a/vars/versions/3.9.0.yml b/vars/versions/3.9.0.yml index f4e2d0e..55bbeed 100644 --- a/vars/versions/3.9.0.yml +++ b/vars/versions/3.9.0.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: 'b118e624ec6f7abd8fc49e6cb23f134dbbab1119d88718fc09d798d33756dd72' +maven_redis_checksum: 'b118e624ec6f7abd8fc49e6cb23f134dbbab1119d88718fc09d798d33756dd72' diff --git a/vars/versions/3.9.1.yml b/vars/versions/3.9.1.yml index fd338c8..e387598 100644 --- a/vars/versions/3.9.1.yml +++ b/vars/versions/3.9.1.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: '0869a4f71238e3eeec21051d062cfd915d34abe905c9bfebf94cd34578db0be7' +maven_redis_checksum: '0869a4f71238e3eeec21051d062cfd915d34abe905c9bfebf94cd34578db0be7' diff --git a/vars/versions/3.9.3.yml b/vars/versions/3.9.3.yml index 84dc211..67f83d6 100644 --- a/vars/versions/3.9.3.yml +++ b/vars/versions/3.9.3.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: 'e1e13ac0c42f3b64d900c57ffc652ecef682b8255d7d354efbbb4f62519da4f1' +maven_redis_checksum: 'e1e13ac0c42f3b64d900c57ffc652ecef682b8255d7d354efbbb4f62519da4f1' diff --git a/vars/versions/3.9.4.yml b/vars/versions/3.9.4.yml index 89dabed..e1b0a72 100644 --- a/vars/versions/3.9.4.yml +++ b/vars/versions/3.9.4.yml @@ -1,3 +1,3 @@ --- # SHA256 sum for the redistributable package -maven_redis_sha256sum: 'ff66b70c830a38d331d44f6c25a37b582471def9a161c93902bac7bea3098319' +maven_redis_checksum: 'ff66b70c830a38d331d44f6c25a37b582471def9a161c93902bac7bea3098319' diff --git a/vars/versions/3.9.5.yml b/vars/versions/3.9.5.yml new file mode 100644 index 0000000..0d4a854 --- /dev/null +++ b/vars/versions/3.9.5.yml @@ -0,0 +1,4 @@ +--- +# SHA512 sum for the redistributable package +maven_redis_checksum: '4810523ba025104106567d8a15a8aa19db35068c8c8be19e30b219a1d7e83bcab96124bf86dc424b1cd3c5edba25d69ec0b31751c136f88975d15406cab3842b' +maven_algo_checksum: 'sha512' diff --git a/vars/versions/3.9.6.yml b/vars/versions/3.9.6.yml new file mode 100644 index 0000000..6a367b0 --- /dev/null +++ b/vars/versions/3.9.6.yml @@ -0,0 +1,4 @@ +--- +# SHA512 sum for the redistributable package +maven_redis_checksum: '706f01b20dec0305a822ab614d51f32b07ee11d0218175e55450242e49d2156386483b506b3a4e8a03ac8611bae96395fd5eec15f50d3013d5deed6d1ee18224' +maven_algo_checksum: 'sha512' diff --git a/vars/versions/3.9.7.yml b/vars/versions/3.9.7.yml new file mode 100644 index 0000000..0fc1519 --- /dev/null +++ b/vars/versions/3.9.7.yml @@ -0,0 +1,4 @@ +--- +# SHA512 sum for the redistributable package +maven_redis_checksum: 'f64913f89756264f2686e241f3f4486eca5d0dfdbb97077b0efc389cad376053824d58caa35c39648453ca58639f85335f9be9c8f217bfdb0c2d5ff2a9428fac' +maven_algo_checksum: 'sha512' diff --git a/vars/versions/3.9.8.yml b/vars/versions/3.9.8.yml new file mode 100644 index 0000000..336a102 --- /dev/null +++ b/vars/versions/3.9.8.yml @@ -0,0 +1,4 @@ +--- +# SHA512 sum for the redistributable package +maven_redis_checksum: '7d171def9b85846bf757a2cec94b7529371068a0670df14682447224e57983528e97a6d1b850327e4ca02b139abaab7fcb93c4315119e6f0ffb3f0cbc0d0b9a2' +maven_algo_checksum: 'sha512' diff --git a/vars/versions/4.0.0-beta-3.yml b/vars/versions/4.0.0-beta-3.yml new file mode 100644 index 0000000..7f3f79a --- /dev/null +++ b/vars/versions/4.0.0-beta-3.yml @@ -0,0 +1,4 @@ +--- +# SHA512 sum for the redistributable package +maven_redis_checksum: '9df71ce42689e1942c9f134b91f93e29be29b521d898c25015dd4edf45249ea4a20000623bbffba7bb585e223e563fa6292241dda7b9034b9822bdfcb29bb269' +maven_algo_checksum: 'sha512' diff --git a/vars/versions/default.yml b/vars/versions/default.yml index 492bb96..475ef0c 100644 --- a/vars/versions/default.yml +++ b/vars/versions/default.yml @@ -1,2 +1,3 @@ --- -# No default varaiable values for this project +# Legacy checksum ansible-role-maven +maven_algo_checksum: 'sha256'