Merge branch 'adopt_openjdk' into 'master'

Adopt openjdk

See merge request ics-ansible-galaxy/ics-ans-role-java!1

README.md

@@ -8,8 +8,8 @@ It can also install Oracle JDK 8 in parallel (default is always openjdk) and mav
 ## Role Variables
 
 ```yaml
-java_openjdk_version: "13.0.1"
-java_openjdk_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/openjdk-{{ java_openjdk_version }}_linux-x64_bin.tar.gz"
+java_openjdk_version: "13.0.1+9"
+java_openjdk_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/OpenJDK{{ java_openjdk_version | regex_replace('^(\\d+).*', '\\1') }}U-jdk_x64_linux_hotspot_{{ java_openjdk_version | regex_replace('\\+', '_') }}.tar.gz"
 java_openjfx_version: "13.0.1"
 java_openjfx_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/openjfx-{{ java_openjfx_version }}_linux-x64_bin-sdk.zip"
 

defaults/main.yml

 ---
-java_openjdk_version: "13.0.1"
-java_openjdk_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/openjdk-{{ java_openjdk_version }}_linux-x64_bin.tar.gz"
+java_openjdk_version: "13.0.1+9"
+java_openjdk_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/OpenJDK{{ java_openjdk_version | regex_replace('^(\\d+).*', '\\1') }}U-jdk_x64_linux_hotspot_{{ java_openjdk_version | regex_replace('\\+', '_') }}.tar.gz"
 java_openjfx_version: "13.0.1"
 java_openjfx_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/openjfx-{{ java_openjfx_version }}_linux-x64_bin-sdk.zip"
 

molecule/default/tests/test_default.py

@@ -6,7 +6,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 ).get_hosts("all")
 
 
-JAVA_VERSION = "13.0.1"
+JAVA_VERSION = "13.0.1+9"
 JAVA_HOME = "/opt/java/jdk-{}".format(JAVA_VERSION)
 JAVAFX_VERSION = "13.0.1"
 PATH_TO_FX = "/opt/java/javafx-sdk-{}/lib".format(JAVAFX_VERSION)
@@ -19,7 +19,7 @@ def test_java_version(host):
     if host.ansible.get_variables()["inventory_hostname"] == "ics-ans-role-java-and-oracle-jdk8":
         assert 'java version "1.8.0_{}"'.format(ORACLE_JDK8_VERSION) in cmd.stdout
     else:
-        assert 'openjdk version "{}"'.format(JAVA_VERSION) in cmd.stdout
+        assert 'build {}'.format(JAVA_VERSION) in cmd.stdout
 
 
 def test_java_home(host):