diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b94694d..472ed13 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -18,6 +18,7 @@ "ghcr.io/devcontainers-contrib/features/jfrog-cli-npm:1": {}, "ghcr.io/devcontainers/features/python:1": {} }, + "postCreateCommand": "mkdir -p /home/vscode/.ansible/plugins/ && cp -r plugins/* /home/vscode/.ansible/plugins/ && pip install -r requirements.txt", "overrideFeatureInstallOrder": [ "ghcr.io/devcontainers/features/common-utils", diff --git a/galaxy.yml b/galaxy.yml index 8c84677..23c0af6 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -11,7 +11,7 @@ name: spm_middleware # The version of the collection. Must be compatible with semantic versioning # Please note. version also exists in /github/workflows/release.yml and will need to be update also -version: 1.5.7 +version: 1.5.8 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/molecule/__liberty/converge.yml b/molecule/__liberty/converge.yml index 09a8626..e87cf8b 100644 --- a/molecule/__liberty/converge.yml +++ b/molecule/__liberty/converge.yml @@ -6,7 +6,7 @@ - merative.spm_middleware vars: - liberty_version: "23.0.0.12" + liberty_version: "24.0.0.3" download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers" download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"} diff --git a/molecule/__liberty17/converge.yml b/molecule/__liberty17/converge.yml index ac8ed73..8dcb928 100644 --- a/molecule/__liberty17/converge.yml +++ b/molecule/__liberty17/converge.yml @@ -6,7 +6,7 @@ - merative.spm_middleware vars: - liberty_version: "23.0.0.12-JDK17" + liberty_version: "24.0.0.3-JDK17" download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers" download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"} diff --git a/molecule/__liberty21/converge.yml b/molecule/__liberty21/converge.yml index 02fbad8..c92d1c5 100644 --- a/molecule/__liberty21/converge.yml +++ b/molecule/__liberty21/converge.yml @@ -6,7 +6,7 @@ - merative.spm_middleware vars: - liberty_version: "23.0.0.12-JDK21" + liberty_version: "24.0.0.3-JDK21" download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers" download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"} diff --git a/roles/liberty/defaults/main.yml b/roles/liberty/defaults/main.yml index bef010b..b3d34c8 100644 --- a/roles/liberty/defaults/main.yml +++ b/roles/liberty/defaults/main.yml @@ -3,7 +3,7 @@ iim_install_path: /opt/IBM/InstallationManager liberty_install_path: /opt/IBM/WebSphere/Liberty -liberty_version: 23.0.0.12 +liberty_version: 24.0.0.3 jdk_version: 8.0 diff --git a/roles/liberty/vars/v24.0.0.3-JDK17.yml b/roles/liberty/vars/v24.0.0.3-JDK17.yml new file mode 100644 index 0000000..c75441f --- /dev/null +++ b/roles/liberty/vars/v24.0.0.3-JDK17.yml @@ -0,0 +1,8 @@ +--- +liberty_fp_path: WLP/24.0.0.3-WS-LIBERTY-ND-FP.zip +liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip +liberty_pid: 24.0.3.20240311_1901 +jdk_version: 17.0 + +liberty_java_zip_path: Java/IBM/ibm-semeru-certified-jdk_x64_linux_17.0.10.0-installmgr.zip +liberty_java_pid: com.ibm.java.jdk.v17_17.0.10000.20240208_1032 diff --git a/roles/liberty/vars/v24.0.0.3-JDK21.yml b/roles/liberty/vars/v24.0.0.3-JDK21.yml new file mode 100644 index 0000000..858d30c --- /dev/null +++ b/roles/liberty/vars/v24.0.0.3-JDK21.yml @@ -0,0 +1,7 @@ +--- +liberty_fp_path: WLP/24.0.0.3-WS-LIBERTY-ND-FP.zip +liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip +liberty_pid: 24.0.3.20240311_1901 +jdk_version: 21.0 +jdk_installation_way: unzip +liberty_java_zip_path: Java/IBM/ibm-semeru-open-jdk_x64_linux_21.0.2_13_openj9-0.43.0.tar.gz diff --git a/roles/liberty/vars/v24.0.0.3.yml b/roles/liberty/vars/v24.0.0.3.yml new file mode 100644 index 0000000..51dd3b2 --- /dev/null +++ b/roles/liberty/vars/v24.0.0.3.yml @@ -0,0 +1,7 @@ +--- +liberty_fp_path: WLP/24.0.0.3-WS-LIBERTY-ND-FP.zip +liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip +liberty_pid: 24.0.3.20240311_1901 + +liberty_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.15-linux-x64-installmgr.zip +liberty_java_pid: com.ibm.java.jdk.v8_8.0.8015.20231031_0036