Merge pull request #129 from idealista/fix/Update-oraclejdk

Fix/update oraclejdk

.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 

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)
 

defaults/main.yml

@@ -5,12 +5,24 @@
 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 ../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
 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
+
+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

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:

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: