Merge pull request #212 from idealista/features/#210

WIP #210 - Migrate to Adoptium temurin

Author: sorobon

.travis.yml

@@ -1,4 +1,4 @@
-dist: bionic
+dist: jammy
 language: python
 python: 3.9
 sudo: required
@@ -14,19 +14,31 @@ env:
   - secure: Iw1sHxmjqF6LPywwMPqbogZ47ZnSWPEDq8k71iqKfao0mDtLMUcmF2yIMLC0MQg1akaBKeHBS4MBQVBaGJDz++rgByzVpHwM0S0ZwUiO2ffVQE4uI+JSEMc1R34/5QPkYsg0FSIDVsCZZ9VnRLKh3GnVHlUljwwfVX5UX0g8RDEHxgdYSGGdAt8iUlQ3/YPSkvuKuNPWHtXCM0tkRYByUVUugSwUuo3rolYVv/S8AcrDf9qhHNkrp4zglC31wurq3M0yjmwHnShl+bLj2lV+QAenmFfjAZWlZ3DxARnSWSlFHMT3PGGWHYpFr2BN/na9ZQqmbWcR8k8XKFv6O205M+Zqao1zvzEpWVZBBiBJwYEVekQk1CzpVQ73sitYLHnmPNK5+W4939dNCkKocNhDf/bJTtaU/JlA64418N4hdjBsXTRfhzAILYJ0ba6a8Qnh5Xeuu3EZlRx6JepYEzy5dJel11MgDNVvaC8r9plCYtfo2ew1OH5QcDqCeaU+hTuXB02tNDWQoXP+aInF4JFqxWuEOlpGZeI3lXKNyHADaNBfziwWwtmBqHKhiLn7a8RJSSrVHRY0LS2YfAi5h4R3YwORlPr9E3I8Sgss21X1D2ocOMjZ4Qdfo5/eteUmEqq3yZBzeynrUwoSR7NYzllVWXMLMOoda2kckXNGaD5U7Es=
   jobs:
   # Java 8
-  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u292-b10-3
-    DOCKER_TAG_TO_PUBLISH=8u292-bullseye-adoptopenjdk-headless
-  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u292-b10-3
-    DOCKER_TAG_TO_PUBLISH=8u292-buster-adoptopenjdk-headless
+  - DOCKER_IMAGE_BASE=debian:bookworm-slim JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.382.0.0+5
+    DOCKER_TAG_TO_PUBLISH=8u382-bookworm-temurin-jdk
+  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.382.0.0+5
+    DOCKER_TAG_TO_PUBLISH=8u382-bullseye-temurin-jdk
+  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.382.0.0+5
+    DOCKER_TAG_TO_PUBLISH=8u382-buster-temurin-jdk
+  - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.322.0.0+6-1
+    DOCKER_TAG_TO_PUBLISH=8u322-buster-temurin-jdk
 
-  - DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=8 JDK_VERSION=8u352-ga-1~18.04
-    DOCKER_TAG_TO_PUBLISH=8u352-bionic-openjdk-headless
-  - DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=8 JDK_VERSION=8u352-ga-1~20.04
-    DOCKER_TAG_TO_PUBLISH=8u342-focal-openjdk-headless
+  - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_MAJOR=8 DOCKER_TAG_TO_PUBLISH=8-stretch-openjdk-headless
 
-  - DOCKER_IMAGE_BASE=quay.io/centos/centos:stream8 JDK_VENDOR=adoptopenjdk JDK_MAJOR=8
-    JDK_VERSION=8u292_b10 DOCKER_TAG_TO_PUBLISH=8u292-centos8-adoptopenjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=8 JDK_VERSION=8u372-ga~us1-0ubuntu1~18.04
+    DOCKER_TAG_TO_PUBLISH=8u372-bionic-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=8 JDK_VERSION=8u382-ga-1~20.04.1
+    DOCKER_TAG_TO_PUBLISH=8u382-focal-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:jammy JDK_MAJOR=8 JDK_VERSION=8u382-ga-1~22.04.1
+    DOCKER_TAG_TO_PUBLISH=8u382-jammy-openjdk-headless
 
+  - DOCKER_IMAGE_BASE=ubuntu:focal JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.382.0.0+5
+    DOCKER_TAG_TO_PUBLISH=8u382-focal-temurin-jdk
+  - DOCKER_IMAGE_BASE=ubuntu:jammy JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.382.0.0+5
+    DOCKER_TAG_TO_PUBLISH=8u382-jammy-temurin-jdk
+
+  - DOCKER_IMAGE_BASE=debian:bookworm-slim JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1:8.302.08-1
+    DOCKER_TAG_TO_PUBLISH=8u302-bookworm-corretto-headless
   - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1:8.302.08-1
     DOCKER_TAG_TO_PUBLISH=8u302-bullseye-corretto-headless
   - DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1:8.302.08-1
@@ -41,14 +53,29 @@ env:
   - DOCKER_IMAGE_BASE=debian:bullseye-slim DOCKER_TAG_TO_PUBLISH=11-bullseye-openjdk-headless
   - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_MAJOR=11 JDK_VERSION=11.0.18+10-1~deb11u1
     DOCKER_TAG_TO_PUBLISH=11.0.18-bullseye-openjdk-headless
+  - DOCKER_IMAGE_BASE=debian:bookworm-slim DOCKER_TAG_TO_PUBLISH=11-bookworm-openjdk-headless
 
-  - DOCKER_IMAGE_BASE=ubuntu:bionic DOCKER_TAG_TO_PUBLISH=11-bionic-openjdk-headless
-  - DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=11 JDK_VERSION=11.0.17+8-1ubuntu2~18.04
-    DOCKER_TAG_TO_PUBLISH=11.0.17-bionic-openjdk-headless
+  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_MAJOR=11 JDK_VENDOR=temurin JDK_VERSION=11.0.20.0.0+8
+    DOCKER_TAG_TO_PUBLISH=11.0.20-buster-temurin-jdk
+  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_MAJOR=11 JDK_VENDOR=temurin JDK_VERSION=11.0.20.0.0+8
+    DOCKER_TAG_TO_PUBLISH=11.0.20-bullseye-temurin-jdk
+  - DOCKER_IMAGE_BASE=debian:bookworm-slim JDK_MAJOR=11 JDK_VENDOR=temurin JDK_VERSION=11.0.20.0.0+8
+    DOCKER_TAG_TO_PUBLISH=11.0.20-bookworm-temurin-jdk
 
+  - DOCKER_IMAGE_BASE=ubuntu:bionic DOCKER_TAG_TO_PUBLISH=11-bionic-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=11 JDK_VERSION=11.0.19+7~us1-0ubuntu1~18.04.1
+    DOCKER_TAG_TO_PUBLISH=11.0.19-bionic-openjdk-headless
   - DOCKER_IMAGE_BASE=ubuntu:focal DOCKER_TAG_TO_PUBLISH=11-focal-openjdk-headless
-  - DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=11 JDK_VERSION=11.0.17+8-1ubuntu2~20.04
-    DOCKER_TAG_TO_PUBLISH=11.0.17-focal-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=11 JDK_VERSION=11.0.20+8-1ubuntu1~20.04
+    DOCKER_TAG_TO_PUBLISH=11.0.20-focal-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:jammy DOCKER_TAG_TO_PUBLISH=11-jammy-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:jammy JDK_MAJOR=11 JDK_VERSION=11.0.20+8-1ubuntu1~22.04
+    DOCKER_TAG_TO_PUBLISH=11.0.20-jammy-openjdk-headless
+
+  - DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=11 JDK_VENDOR=temurin JDK_VERSION=11.0.20.0.0+8
+    DOCKER_TAG_TO_PUBLISH=11.0.20-focal-temurin-jdk
+  - DOCKER_IMAGE_BASE=ubuntu:jammy JDK_MAJOR=11 JDK_VENDOR=temurin JDK_VERSION=11.0.20.0.0+8
+    DOCKER_TAG_TO_PUBLISH=11.0.20-jammy-temurin-jdk
 
   - DOCKER_IMAGE_BASE=centos:7 JDK_MAJOR=11 JDK_VERSION=11.0.12.0.7 DOCKER_TAG_TO_PUBLISH=11.0.12.0.7-centos7-openjdk-headless
   - DOCKER_IMAGE_BASE=quay.io/centos/centos:stream8 JDK_MAJOR=11 JDK_VERSION=11.0.13.0.8
@@ -59,12 +86,26 @@ env:
 
   # Java 17
   - DOCKER_IMAGE_BASE=debian:bullseye-slim DOCKER_TAG_TO_PUBLISH=17-bullseye-openjdk-headless
-  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_MAJOR=17 JDK_VERSION=17.0.6+10-1~deb11u1
-    DOCKER_TAG_TO_PUBLISH=17.0.6-bullseye-openjdk-headless
+  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_MAJOR=17 JDK_VERSION=17.0.7+7-1~deb11u1
+    DOCKER_TAG_TO_PUBLISH=17.0.7-bullseye-openjdk-headless
+  - DOCKER_IMAGE_BASE=debian:bookworm-slim JDK_MAJOR=17 JDK_VERSION=17.0.8+7-1~deb12u1
+    DOCKER_TAG_TO_PUBLISH=17.0.8-bookworm-openjdk-headless
+
+  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_MAJOR=17 JDK_VENDOR=temurin JDK_VERSION=17.0.8.0.0+7
+    DOCKER_TAG_TO_PUBLISH=17.0.8-bullseye-temurin-jdk
+  - DOCKER_IMAGE_BASE=debian:bookworm-slim JDK_MAJOR=17 JDK_VENDOR=temurin JDK_VERSION=17.0.8.0.0+7
+    DOCKER_TAG_TO_PUBLISH=17.0.8-bookworm-temurin-jdk
 
   - DOCKER_IMAGE_BASE=ubuntu:focal DOCKER_TAG_TO_PUBLISH=17-focal-openjdk-headless
-  - DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=17 JDK_VERSION=17.0.5+8-2ubuntu1~20.04
-    DOCKER_TAG_TO_PUBLISH=17.0.5-focal-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=17 JDK_VERSION=17.0.8+7-1~20.04.2
+    DOCKER_TAG_TO_PUBLISH=17.0.8-focal-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:jammy DOCKER_TAG_TO_PUBLISH=17-jammy-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:jammy JDK_MAJOR=17 JDK_VERSION=17.0.8+7-1~22.04
+    DOCKER_TAG_TO_PUBLISH=17.0.8-jammy-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=17 JDK_VENDOR=temurin JDK_VERSION=17.0.8.0.0+7
+    DOCKER_TAG_TO_PUBLISH=17.0.8-focal-temurin-jdk
+  - DOCKER_IMAGE_BASE=ubuntu:jammy JDK_MAJOR=17 JDK_VENDOR=temurin JDK_VERSION=17.0.8.0.0+7
+    DOCKER_TAG_TO_PUBLISH=17.0.8-jammy-temurin-jdk
 
 script:
 - pipenv run molecule test --scenario-name=${JDK_VENDOR:-default}

.yamllint

@@ -12,7 +12,6 @@ rules:
   # NOTE(retr0h): Templates no longer fail this lint rule.
   #               Uncomment if running old Molecule templates.
   # truthy: disable
-
 ignore: |
   tests/
   .travis.yml

CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog).
 
 ## [Unreleased](https://github.com/idealista/java_role/tree/develop)
+### Added
+- *[#210](https://github.com/idealista/java_role/issues/210) Temurin support* @sorobon
+- *[#210](https://github.com/idealista/java_role/issues/210) Debian 12 support* @sorobon
+### Removed
+- *[#210](https://github.com/idealista/java_role/issues/210) Removed adoptopenjdk* @sorobon
 
 ## [8.1.0](https://github.com/idealista/java_role/tree/8.1.0) (2023-06-22)
 ### Added

README.md

@@ -108,22 +108,25 @@ Debian Stretch | `11`
 Debian Buster | `11` (default)
 Debian Bullseye | `17`
 Debian Bullseye | `11` (default)
+Debian Bookworm | `17`
+Debian Bookworm | `17` (default)
 Ubuntu Xenial | `8`
 Ubuntu Xenial | `9` (default)
 Ubuntu Bionic | `8`
 Ubuntu Bionic | `11` (default)
 Ubuntu Focal | `8`
 Ubuntu Focal | `11`
-Ubuntu Focal | `13`
-Ubuntu Focal | `14` (default)
+Ubuntu Focal | `17` (default)
+Ubuntu Jammy | `11`
+Ubuntu Jammy | `17` (default)
 CentOS 7 | `1.6.0`
 CentOS 7 | `1.7.0`
 CentOS 7 | `1.8.0`
 CentOS 7 | `11` (default)
 CentOS 8 | `1.8.0`
 CentOS 8 | `11` (default)
 
-Other OpenJDK implementations out of GNU/Linux distributions streams are not officially supported, but it's easy use this role too adding extra repositories (see vars/ in AdoptOpenJDK and Corretto directories).
+Other OpenJDK implementations out of GNU/Linux distributions streams are not officially supported, but it's easy use this role too adding extra repositories (see vars/ in AdoptOpenJDK/Temurin and Corretto directories).
 
 ### Adding certificates into Java's truststore
 

meta/main.yml

@@ -9,8 +9,10 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
+        - stretch
         - buster
         - bullseye
+        - bookworm
     - name: Ubuntu
       versions:
         - bionic

molecule/adoptopenjdk/Dockerfile.j2

@@ -9,6 +9,18 @@ FROM {{ item.image }}
 RUN mkdir -p /usr/share/man/man1
 RUN if [ $(command -v apt-get) ]; then sed -i -e 's/^APT/# APT/' -e 's/^DPkg/# DPkg/' /etc/apt/apt.conf.d/docker-clean; fi
 
+{% if 'stretch' in item.image %}
+RUN echo "deb http://archive.debian.org/debian/ stretch contrib main non-free" > /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian/ stretch contrib main non-free" >> /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \
+    apt-get update
+{% endif %}
+
 RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 sudo bash ca-certificates && apt-get clean; \
     elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python36 sudo python3-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \

molecule/default/Dockerfile.j2

@@ -0,0 +1,27 @@
+# Molecule managed
+
+{% if item.registry is defined %}
+FROM {{ item.registry.url }}/{{ item.image }}
+{% else %}
+FROM {{ item.image }}
+{% endif %}
+
+RUN mkdir -p /usr/share/man/man1
+
+{% if 'stretch' in item.image %}
+RUN echo "deb http://archive.debian.org/debian/ stretch contrib main non-free" > /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian/ stretch contrib main non-free" >> /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \
+    apt-get update
+{% endif %}
+
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 sudo bash ca-certificates && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python36 sudo python3-dnf bash && dnf clean all; \
+    elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
+    elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \
+    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; fi

molecule/temurin/Dockerfile.j2

@@ -9,7 +9,7 @@ lint: |
     ansible-lint .
 
 platforms:
-  - name: openjdk-adopt-test
+  - name: temurin-test
     groups:
       - openjdk
     image: ${DOCKER_IMAGE_BASE:-debian:buster-slim}
@@ -25,6 +25,6 @@ provisioner:
         java_open_jdk_version_major: ${JDK_MAJOR}
 
 scenario:
-  name: adoptopenjdk
+  name: temurin
 verifier:
   name: ansible