From 988e41d4a8d0d2ffc9d24c1fc8608c322d76bf2b Mon Sep 17 00:00:00 2001 From: DGAlcantara Date: Thu, 25 Jun 2020 11:30:58 +0200 Subject: [PATCH 1/3] oracleJdk updated and vars moved to default --- .travis.yml | 30 +++++------------------------- defaults/main.yml | 19 ++++++++++++++++--- molecule/openjdk/verify.yml | 1 - molecule/oraclejdk/molecule.yml | 2 +- vars/main.yml | 19 ------------------- 5 files changed, 22 insertions(+), 49 deletions(-) delete mode 100644 vars/main.yml diff --git a/.travis.yml b/.travis.yml index 7bc5788..5c16a2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,12 +41,7 @@ env: - DOCKER_IMAGE_BASE=amd64/ubuntu:bionic JDK_IMPLEMENTATION=oraclejdk - JDK_VERSION=1.8.0_201 - DOCKER_TAG_TO_PUBLISH=${JDK_VERSION}-bionic-${JDK_IMPLEMENTATION} - - - DOCKER_IMAGE_BASE=amd64/ubuntu:bionic - JDK_IMPLEMENTATION=oraclejdk - JDK_VERSION=1.8.0_202 + JDK_VERSION=1.8.0_251 DOCKER_TAG_TO_PUBLISH=${JDK_VERSION}-bionic-${JDK_IMPLEMENTATION} - DOCKER_IMAGE_BASE=amd64/ubuntu:bionic @@ -81,14 +76,9 @@ env: - DOCKER_IMAGE_BASE=debian:jessie-slim JDK_IMPLEMENTATION=oraclejdk - JDK_VERSION=1.8.0_201 + JDK_VERSION=1.8.0_251 DOCKER_TAG_TO_PUBLISH=${JDK_VERSION}-jessie-${JDK_IMPLEMENTATION} - - - DOCKER_IMAGE_BASE=debian:jessie-slim - JDK_IMPLEMENTATION=oraclejdk - JDK_VERSION=1.8.0_202 - DOCKER_TAG_TO_PUBLISH=${JDK_VERSION}-jessie-${JDK_IMPLEMENTATION} - + - DOCKER_IMAGE_BASE=debian:jessie-slim JDK_IMPLEMENTATION=oraclejdk JDK_VERSION=11.0.2 @@ -116,12 +106,7 @@ env: - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_IMPLEMENTATION=oraclejdk - JDK_VERSION=1.8.0_201 - DOCKER_TAG_TO_PUBLISH=${JDK_VERSION}-stretch-${JDK_IMPLEMENTATION} - - - DOCKER_IMAGE_BASE=debian:stretch-slim - JDK_IMPLEMENTATION=oraclejdk - JDK_VERSION=1.8.0_202 + JDK_VERSION=1.8.0_251 DOCKER_TAG_TO_PUBLISH=${JDK_VERSION}-stretch-${JDK_IMPLEMENTATION} - DOCKER_IMAGE_BASE=debian:stretch-slim @@ -151,12 +136,7 @@ env: - DOCKER_IMAGE_BASE=amd64/ubuntu:xenial JDK_IMPLEMENTATION=oraclejdk - JDK_VERSION=1.8.0_201 - DOCKER_TAG_TO_PUBLISH=${JDK_VERSION}-xenial-${JDK_IMPLEMENTATION} - - - DOCKER_IMAGE_BASE=amd64/ubuntu:xenial - JDK_IMPLEMENTATION=oraclejdk - JDK_VERSION=1.8.0_202 + JDK_VERSION=1.8.0_251 DOCKER_TAG_TO_PUBLISH=${JDK_VERSION}-xenial-${JDK_IMPLEMENTATION} - DOCKER_IMAGE_BASE=amd64/ubuntu:xenial diff --git a/defaults/main.yml b/defaults/main.yml index 2bde623..c3db801 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -2,11 +2,11 @@ # Choosen platform # [openjdk, oraclejdk] -java_implementation: openjdk +java_implementation: oraclejdk # OracleJDK implementation (provides only support for x64 architectures) -# [1.8.0_201, 1.8.0_202, 11.0.2] (see available urls in ../vars/main.yml) -java_oracle_jdk_version: 1.8.0_201 +# [1.8.0_201, 1.8.0_202, 11.0.2] (see available urls in ../group_vars/main.yml) +java_oracle_jdk_version: 1.8.0_251 java_oracle_jdk_install_path: /opt/jdk/{{ java_oracle_jdk_version }} # OpenJDK implementation @@ -14,3 +14,16 @@ java_open_jdk_package: openjdk-{{ java_open_jdk_version_major }}-jdk-headless java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-openjdk-amd64 java_open_jdk_home: /usr/lib/jvm/{{ java_open_jdk_home_dir }} java_open_jdk_default_java_home: /usr/lib/jvm/default-java +JDK_VERSION: "{{ java_oracle_jdk_version }}" + +java_open_jdk_version_major: "{{ java_open_jdk_version | regex_search('^([0-9]{1,2})') }}" + +# Older versions requires login to be downloaded +# http://www.oracle.com/technetwork/java/archive-139210.html +java_oracle_jdk_latest_versions_urls: + 11.0.2: + url: https://download.oracle.com/otn-pub/java/jdk/11.0.2+9/f51449fcd52f4d52b93a989c5c56ed3c/jdk-11.0.2_linux-x64_bin.tar.gz + sha256: 7b4fd8ffcf53e9ff699d964a80e4abf9706b5bdb5644a765c2b96f99e3a2cdc8 + 1.8.0_251: + url: https://download.oracle.com/otn-pub/java/jdk/8u251-b08/3d5a2bb8f8d4428bbe94aed7ec7ae784/jdk-8u251-linux-x64.tar.gz + sha256: 777a8d689e863275a647ae52cb30fd90022a3af268f34fc5b9867ce32f1b374e diff --git a/molecule/openjdk/verify.yml b/molecule/openjdk/verify.yml index 6e67a10..fc41ccb 100644 --- a/molecule/openjdk/verify.yml +++ b/molecule/openjdk/verify.yml @@ -24,7 +24,6 @@ vars_files: - ../../defaults/main.yml - - ../../vars/main.yml - ../../vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml tasks: diff --git a/molecule/oraclejdk/molecule.yml b/molecule/oraclejdk/molecule.yml index 08d8af0..e16d190 100644 --- a/molecule/oraclejdk/molecule.yml +++ b/molecule/oraclejdk/molecule.yml @@ -20,7 +20,7 @@ provisioner: group_vars: oraclejdk: java_implementation: oraclejdk - java_oracle_jdk_version: ${JDK_VERSION:-1.8.0_201} + java_oracle_jdk_version: ${JDK_VERSION:-1.8.0_251} lint: name: ansible-lint scenario: diff --git a/vars/main.yml b/vars/main.yml deleted file mode 100644 index 943a6c3..0000000 --- a/vars/main.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- - -java_open_jdk_version_major: "{{ java_open_jdk_version | regex_search('^([0-9]{1,2})') }}" - -# Older versions requires login to be downloaded -# http://www.oracle.com/technetwork/java/archive-139210.html -java_oracle_jdk_latest_versions_urls: - 1.8.0_201: - url: https://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.tar.gz - # https://www.oracle.com/webfolder/s/digest/8u201checksum.html - sha256: cb700cc0ac3ddc728a567c350881ce7e25118eaf7ca97ca9705d4580c506e370 - 1.8.0_202: - url: https://download.oracle.com/otn-pub/java/jdk/8u202-b08/1961070e4c9b4e26a04e7f5a083f551e/jdk-8u202-linux-x64.tar.gz - # https://www.oracle.com/webfolder/s/digest/8u202checksum.html - sha256: 9a5c32411a6a06e22b69c495b7975034409fa1652d03aeb8eb5b6f59fd4594e0 - 11.0.2: - url: https://download.oracle.com/otn-pub/java/jdk/11.0.2+9/f51449fcd52f4d52b93a989c5c56ed3c/jdk-11.0.2_linux-x64_bin.tar.gz - # https://www.oracle.com/webfolder/s/digest/11-0-2checksum.html - sha256: 7b4fd8ffcf53e9ff699d964a80e4abf9706b5bdb5644a765c2b96f99e3a2cdc8 From e7d3d6a063fdd1a0ee18d9d0038c534af1ec8fe6 Mon Sep 17 00:00:00 2001 From: DGAlcantara Date: Thu, 25 Jun 2020 11:46:33 +0200 Subject: [PATCH 2/3] Fixing PR errors --- defaults/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c3db801..23e18f5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -2,7 +2,7 @@ # Choosen platform # [openjdk, oraclejdk] -java_implementation: oraclejdk +java_implementation: openjdk # OracleJDK implementation (provides only support for x64 architectures) # [1.8.0_201, 1.8.0_202, 11.0.2] (see available urls in ../group_vars/main.yml) @@ -14,7 +14,6 @@ java_open_jdk_package: openjdk-{{ java_open_jdk_version_major }}-jdk-headless java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-openjdk-amd64 java_open_jdk_home: /usr/lib/jvm/{{ java_open_jdk_home_dir }} java_open_jdk_default_java_home: /usr/lib/jvm/default-java -JDK_VERSION: "{{ java_oracle_jdk_version }}" java_open_jdk_version_major: "{{ java_open_jdk_version | regex_search('^([0-9]{1,2})') }}" From 8c41ab424d24bf1744c6f8c4dc11b19db6d7ba95 Mon Sep 17 00:00:00 2001 From: DGAlcantara Date: Thu, 25 Jun 2020 12:16:47 +0200 Subject: [PATCH 3/3] Changelog updated --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f19b017..3079f56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ 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). +## [4.1.1](https://github.com/idealista/java_role/tree/4.1.1) (2020-06-25) +- Updated oraclejdk repositories and changed vars to default @dgalcantara + ## [4.1.0](https://github.com/idealista/java_role/tree/4.1.0) (2019-02-01) [Full Changelog](https://github.com/idealista/java_role/compare/4.0.0...4.1.0)