Merge pull request #134 from idealista/develop

Release 6.0.0

Author: Francisco Javier Tsao Santín

.travis.yml

@@ -17,24 +17,22 @@ env:
   - secure: WuOSbycFJIECLpysMXvNOYckr004ufS10PoboOldE/7yJPtAwKE6KIVdHLNQ942j70+GU3y18/UErMyY0mjyZl9zzQRhvQKpyGuKniTCCIDgxydhMP/Ik3+DHslG3szfTmbjo1bJ2+uRFLOxTgY7pnxebJbW3i7AKSEpK9XQY0GzGhJzazqJJeylMsC/gTOQFza2clPe1so5b5CoedbK3/Ued82dlDgb/bqY5rlyYvx/qdbNRl5kVdH/YWLWR2xdl1WffL91Lbh/YtqgLAeZuJJsza6dHvjKlFAiVFMuWxX3GBYgcdmxnL+vzy9Ldp4FiFi1B+amSjCQsQ8HB3vJqCAhWBs1pvHE4xlM7Pxaoz+Zz5Iwnb0LwQvwu+ehitHBpHTmKG1s3wVVPAx0xArZuN5fsn9vW/HAyoVM3AkI6jOjlgTEYVMCJSr/+fLvGwjzuhYoHLQfI8R6S4A71xz6n6xU8LoLrbg9V6ypfyNSuEsBD/W+H9cE8cmqiJftMnExj0dQMXDGp0b6gpFLgPo4L5d5szPgcLGTpmwcyRTTGDymjS5veDxIhwVtUQif78PlwIJ/Ky+2M/qREnSkt8OcAtv8msqvfTGfiQIHsWu/kHsRFctVfidBmLTU6KRSxwXhe+br67HsBuYKp6aGtubYE0QGwM+gn5UnIzAy6+5OmTo=
   - secure: jnMLyXO4BXHo5OWGDsgtTnKBoiV+EG5Qd7w+a0RfkJu/SeqW/pm7NOnGqWDxKUdf9UREtKvCO26ZdciC2DwmjOVsSH5KVnvS7fr2QvPalHNJhi8IHkSOi5BP4DUIFlJowBKCGMTftNUJCiZq5tq8GnnwR9eaQg0WqhqcSmRA/dIyN4MycayGhqt/+9gaTiOaiKrun7esAUnizszXOj8P0QBLxjAiXIfDmwUfe6z7vHRaf96L/T5tpDcRd00jxm+QYlsN8zIxYK5CguPwl/ip2jRAdkq2KA8MT5tL7qaqkqAKzzaetHKbSigzuzER8Wua5Qc3JZajI9YMayvJSrow3fXDmGg+T4XYJgRe87HtIO3IwHclvtfsYgrD1kYhLm+jo2czm8uQIKdQZqVkZ8lJxhV24yZ76Xa0ysEzmHXbV2HHmNYud2Kuh8CYPA+M9yB8icwoc58IqOOfj7/N8Siv5oypSuWmEHZdkhPVkPBY4Qq7aDMGy4/Uzy+yu4V++6oJrXZMAKKlDnuMayZylEaN+CLjZnDFDjusYDkTZRoNo1Bt5EiEb0AZQ19caVW0kRD0rseRa/Af/DYJswTo6AyXs4Tk2B4Mm/0XYGhku4QKZw6In3/FxTHxF16y9GZMv1T/0xRXpkmFYYHJE/4vhhsN0shTRNe+9b+tc/zvd5a3/3g=
   jobs:
-  - DOCKER_IMAGE_BASE=debian:jessie-slim DOCKER_TAG_TO_PUBLISH=8-jessie-openjdk-headless
-  - DOCKER_IMAGE_BASE=debian:jessie-slim JDK_MAJOR=8 JDK_VERSION=8u171-b11-1~bpo8+1 DOCKER_TAG_TO_PUBLISH=8u171-jessie-openjdk-headless
   - DOCKER_IMAGE_BASE=debian:stretch-slim DOCKER_TAG_TO_PUBLISH=8-stretch-openjdk-headless
-  - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_MAJOR=8 JDK_VERSION=8u252-b09-1~deb9u1 DOCKER_TAG_TO_PUBLISH=8u252-stretch-openjdk-headless
+  - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_MAJOR=8 JDK_VERSION=8u265-b01-0+deb9u1 DOCKER_TAG_TO_PUBLISH=8u265-stretch-openjdk-headless
   - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_MAJOR=11 JDK_VERSION=11.0.6+10-1~bpo9+1 DOCKER_TAG_TO_PUBLISH=11.0.6-stretch-openjdk-headless
   - DOCKER_IMAGE_BASE=debian:buster-slim DOCKER_TAG_TO_PUBLISH=11-buster-openjdk-headless
-  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_MAJOR=11 JDK_VERSION=11.0.7+10-3~deb10u1 DOCKER_TAG_TO_PUBLISH=11.0.7-buster-openjdk-headless
+  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_MAJOR=11 JDK_VERSION=11.0.8+10-1~deb10u1 DOCKER_TAG_TO_PUBLISH=11.0.8-buster-openjdk-headless
   - DOCKER_IMAGE_BASE=amd64/ubuntu:xenial DOCKER_TAG_TO_PUBLISH=9-xenial-openjdk-headless
-  - DOCKER_IMAGE_BASE=amd64/ubuntu:xenial JDK_MAJOR=8 JDK_VERSION=8u252-b09-1~16.04 DOCKER_TAG_TO_PUBLISH=8u252-xenial-openjdk-headless
+  - DOCKER_IMAGE_BASE=amd64/ubuntu:xenial JDK_MAJOR=8 JDK_VERSION=8u265-b01-0ubuntu2~16.04 DOCKER_TAG_TO_PUBLISH=8u265-xenial-openjdk-headless
   - DOCKER_IMAGE_BASE=amd64/ubuntu:xenial JDK_MAJOR=9 JDK_VERSION=9~b114-0ubuntu1 DOCKER_TAG_TO_PUBLISH=9b114-xenial-openjdk-headless
   - DOCKER_IMAGE_BASE=amd64/ubuntu:bionic DOCKER_TAG_TO_PUBLISH=11-bionic-openjdk-headless
-  - DOCKER_IMAGE_BASE=amd64/ubuntu:bionic JDK_MAJOR=11 JDK_VERSION=11.0.7+10-2ubuntu2~18.04 DOCKER_TAG_TO_PUBLISH=11.0.7-bionic-openjdk-headless
-  - DOCKER_IMAGE_BASE=amd64/ubuntu:bionic JDK_MAJOR=8 JDK_VERSION=8u252-b09-1~18.04 DOCKER_TAG_TO_PUBLISH=8u252-bionic-openjdk-headless
+  - DOCKER_IMAGE_BASE=amd64/ubuntu:bionic JDK_MAJOR=11 JDK_VERSION=11.0.8+10-0ubuntu1~18.04.1 DOCKER_TAG_TO_PUBLISH=11.0.8-bionic-openjdk-headless
+  - DOCKER_IMAGE_BASE=amd64/ubuntu:bionic JDK_MAJOR=8 JDK_VERSION=8u265-b01-0ubuntu2~18.04 DOCKER_TAG_TO_PUBLISH=8u265-bionic-openjdk-headless
   - DOCKER_IMAGE_BASE=amd64/ubuntu:focal DOCKER_TAG_TO_PUBLISH=14-focal-openjdk-headless
   - DOCKER_IMAGE_BASE=amd64/ubuntu:focal JDK_MAJOR=14 JDK_VERSION=14.0.1+7-1ubuntu1 DOCKER_TAG_TO_PUBLISH=14.0.1-focal-openjdk-headless
-  - DOCKER_IMAGE_BASE=amd64/ubuntu:focal JDK_MAJOR=8 JDK_VERSION=8u252-b09-1ubuntu1 DOCKER_TAG_TO_PUBLISH=8u252-focal-openjdk-headless
-  - DOCKER_IMAGE_BASE=centos:7 JDK_MAJOR=11 JDK_VERSION=11.0.7.10 DOCKER_TAG_TO_PUBLISH=11.0.7.10-centos7-openjdk-headless
-  - DOCKER_IMAGE_BASE=centos:8 JDK_MAJOR=11 JDK_VERSION=11.0.7.10 DOCKER_TAG_TO_PUBLISH=11.0.7.10-centos8-openjdk-headless
+  - DOCKER_IMAGE_BASE=amd64/ubuntu:focal JDK_MAJOR=8 JDK_VERSION=8u265-b01-0ubuntu2~20.04 DOCKER_TAG_TO_PUBLISH=8u265-focal-openjdk-headless
+  - DOCKER_IMAGE_BASE=centos:7 JDK_MAJOR=11 JDK_VERSION=11.0.8.10 DOCKER_TAG_TO_PUBLISH=11.0.8.10-centos7-openjdk-headless
+  - DOCKER_IMAGE_BASE=centos:8 JDK_MAJOR=11 JDK_VERSION=11.0.8.10 DOCKER_TAG_TO_PUBLISH=11.0.8.10-centos8-openjdk-headless
 script:
 - pipenv run molecule test
 notifications:

CHANGELOG.md

@@ -4,6 +4,14 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
 
 ## [Unreleased](https://github.com/idealista/java_role/tree/develop)
 
+## [6.0.0](https://github.com/idealista/java_role/tree/6.0.0) (2020-08-13)
+[Full Changelog](https://github.com/idealista/java_role/compare/5.2.0...6.0.0)
+### Changed
+- *[#132](https://github.com/idealista/java_role/issues/132) Breaking: Removed Jessie support* @frantsao
+- *[#132](https://github.com/idealista/java_role/issues/132) Updated Debian Buster is default in molecule tests* @frantsao
+### Fixed
+- *[#132](https://github.com/idealista/java_role/issues/132) Updated JRE versions in travis tests* @frantsao
+
 ## [5.2.0](https://github.com/idealista/java_role/tree/5.2.0) (2020-06-04)
 [Full Changelog](https://github.com/idealista/java_role/compare/5.1.0...5.2.0)
 ### Changed

README.md

@@ -42,19 +42,19 @@ Create or add to your roles dependency file (e.g requirements.yml):
 ```yml
 - src: http://github.com/idealista/java_role.git
   scm: git
-  version: 5.2.0
+  version: 6.0.0
   name: java
 ```
 
 or using [Ansible Galaxy](https://galaxy.ansible.com/idealista/java_role/) as origin if you prefer:
 
 ```yml
 - src: idealista.java_role
-  version: 5.2.0
+  version: 6.0.0
   name: java
 ```
 
-Alternatively you could find tagged Docker images for Debian Jessie, Stretch and Buster, Ubuntu Xenial, Bionic and Focal, and CentOS 7 and 8 in [Docker Hub](https://hub.docker.com/r/idealista/jdk/).
+Alternatively you could find tagged Docker images for Debian Stretch and Buster, Ubuntu Xenial, Bionic and Focal, and CentOS 7 and 8 in [Docker Hub](https://hub.docker.com/r/idealista/jdk/).
 
 Install the role with ansible-galaxy command:
 
@@ -84,7 +84,7 @@ docker pull idealista/jdk:${JDK_VERSION}-${DOCKER_IMAGE_BASE}-(openjdk-headless)
 ```
 
 `JDK_VERSION:` Preferred JDK version.
-`DOCKER_IMAGE`: Currently supporting: `jessie`/`stretch`/`buster` to select between Debian versions, `xenial`/`bionic`/`focal` to select between Ubuntu versions, and `7`/`8` to select a CentOS version. 
+`DOCKER_IMAGE`: Currently supporting: `stretch`/`buster` to select between Debian versions, `xenial`/`bionic`/`focal` to select between Ubuntu versions, and `7`/`8` to select a CentOS version.
 
 For instance:
 
@@ -104,8 +104,6 @@ A specific OpenJDK version should be selected overriding `java_open_jdk_version_
 
 Operative System | OpenJDK major release
 --- | ---
-Debian Jessie | `8` (default)
-Debian Jessie | `7`
 Debian Stretch | `8` (default)
 Debian Stretch | `11`
 Debian Buster | `11` (default)
@@ -129,7 +127,7 @@ Other OpenJDK implementations out of GNU/Linux distributions streams are not off
 
 ```sh
 $ pipenv sync
-$ DOCKER_IMAGE_BASE=(debian:jessie-slim|debian:stretch-slim|debian:buster-slim|amd64/ubuntu:xenial|amd64/ubuntu:bionic|amd64/ubuntu:focal|centos:7|centos:8) JDK_MAJOR=(`java_open_jdk_version_major` see [.travis.yml](.travis.yml) file to check supported versions) JDK_VERSION=(`java_open_jdk_version` see [.travis.yml](.travis.yml) file to check supported versions) pipenv run molecule test
+$ DOCKER_IMAGE_BASE=(debian:stretch-slim|debian:buster-slim|amd64/ubuntu:xenial|amd64/ubuntu:bionic|amd64/ubuntu:focal|centos:7|centos:8) JDK_MAJOR=(`java_open_jdk_version_major` see [.travis.yml](.travis.yml) file to check supported versions) JDK_VERSION=(`java_open_jdk_version` see [.travis.yml](.travis.yml) file to check supported versions) pipenv run molecule test
 ```
 **Note:** JDK_VERSION is an optional parameter, if not defined this role will install the latest available package for the selected Java major release.
 **Note:** debian9 (Debian Stretch) will be used as default linux distro if none is provided.

meta/main.yml

@@ -9,7 +9,6 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
-        - jessie
         - stretch
         - buster
     - name: Ubuntu

molecule/default/molecule.yml

@@ -12,7 +12,7 @@ platforms:
   - name: openjdktest
     groups:
       - openjdk
-    image: ${DOCKER_IMAGE_BASE:-debian:stretch-slim}
+    image: ${DOCKER_IMAGE_BASE:-debian:buster-slim}
 
 provisioner:
   name: ansible

tasks/install_openjdk.yml

@@ -23,18 +23,6 @@
   set_fact:
     java_home: "{{ java_open_jdk_home }}"
 
-# Explanation why:
-# https://www.lucas-nussbaum.net/blog/?p=947
-- name: Java | Disable Debian 8 APT check-valid-until
-  lineinfile:
-    line: "Acquire::Check-Valid-Until no;"
-    path: /etc/apt/apt.conf.d/99no-check-valid-until
-    state: present
-    create: true
-  when:
-    - ansible_os_family == 'Debian'
-    - ansible_distribution_major_version == '8'
-
 - block:
     - name: Java | Install extra apt tools
       package:
@@ -110,13 +98,3 @@
   changed_when: false
   tags:
     - skip_ansible_lint
-
-# Ugly task in order to maintain support of Java 8 in Debian. Will remove in a near future.
-- name: Java | Remove installed OpenJDK 7 package because messy dependencies in Debian 8 backports
-  apt:
-    name: "openjdk-7-jre-headless"
-    state: absent
-  when:
-    - ansible_os_family == 'Debian'
-    - ansible_distribution_major_version == '8'
-    - java_open_jdk_version_major != '7'