Skip to content

Commit

Permalink
Merge pull request #130 from idealista/fix/Update-repo-for-travis
Browse files Browse the repository at this point in the history
Updated repositories and versions
  • Loading branch information
Thasselhof authored Jun 25, 2020
2 parents 786c112 + 7a958e8 commit 224501f
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 22 deletions.
30 changes: 15 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ env:

- DOCKER_IMAGE_BASE=amd64/ubuntu:bionic
JDK_IMPLEMENTATION=openjdk
JDK_VERSION=11.0.1+13-3ubuntu1~18.04~ppa1
JDK_VERSION=11.0.7+10-2ubuntu2~18.04
DOCKER_TAG_TO_PUBLISH=11.0.1-bionic-${JDK_IMPLEMENTATION}-headless

- DOCKER_IMAGE_BASE=amd64/ubuntu:bionic
JDK_IMPLEMENTATION=openjdk
JDK_VERSION=8u191-b12-2ubuntu0.18.04.1
DOCKER_TAG_TO_PUBLISH=8u191-bionic-${JDK_IMPLEMENTATION}-headless
JDK_VERSION=8u252-b09-1~18.04
DOCKER_TAG_TO_PUBLISH=8u252-bionic-${JDK_IMPLEMENTATION}-headless

# Ubuntu Bionic/OracleJDK
- DOCKER_IMAGE_BASE=amd64/ubuntu:bionic
Expand All @@ -46,19 +46,19 @@ env:

- DOCKER_IMAGE_BASE=amd64/ubuntu:bionic
JDK_IMPLEMENTATION=oraclejdk
JDK_VERSION=11.0.2
JDK_VERSION=11.0.7
DOCKER_TAG_TO_PUBLISH=${JDK_VERSION}-bionic-${JDK_IMPLEMENTATION}

# Centos 7
- DOCKER_IMAGE_BASE=centos:7
JDK_IMPLEMENTATION=oraclejdk
JDK_VERSION=11.0.2
JDK_VERSION=11.0.7
DOCKER_TAG_TO_PUBLISH=11-centos-${JDK_IMPLEMENTATION}

- DOCKER_IMAGE_BASE=centos:7
JDK_IMPLEMENTATION=openjdk
JDK_VERSION=11.0.2.7
DOCKER_TAG_TO_PUBLISH=11-centos-${JDK_IMPLEMENTATION}-headless
JDK_VERSION=11.0.7.10
DOCKER_TAG_TO_PUBLISH=11.0.7.10-centos-${JDK_IMPLEMENTATION}-headless

# Debian Jessie
- DOCKER_IMAGE_BASE=debian:jessie-slim
Expand All @@ -81,7 +81,7 @@ env:

- DOCKER_IMAGE_BASE=debian:jessie-slim
JDK_IMPLEMENTATION=oraclejdk
JDK_VERSION=11.0.2
JDK_VERSION=11.0.7
DOCKER_TAG_TO_PUBLISH=${JDK_VERSION}-jessie-${JDK_IMPLEMENTATION}

# Debian Stretch/OpenJDK
Expand All @@ -91,13 +91,13 @@ env:

- DOCKER_IMAGE_BASE=debian:stretch-slim
JDK_IMPLEMENTATION=openjdk
JDK_VERSION=8u212-b01-1~deb9u1
DOCKER_TAG_TO_PUBLISH=8u181-stretch-${JDK_IMPLEMENTATION}-headless
JDK_VERSION=8u252-b09-1~deb9u1
DOCKER_TAG_TO_PUBLISH=8u252-stretch-${JDK_IMPLEMENTATION}-headless

- DOCKER_IMAGE_BASE=debian:stretch-slim
JDK_IMPLEMENTATION=openjdk
JDK_VERSION=11.0.2+9-3~bpo9+1
DOCKER_TAG_TO_PUBLISH=11.0.2-stretch-${JDK_IMPLEMENTATION}-headless
JDK_VERSION=11.0.6+10-1~bpo9+1
DOCKER_TAG_TO_PUBLISH=11.0.6-stretch-${JDK_IMPLEMENTATION}-headless

# Debian Stretch/OracleJDK
- DOCKER_IMAGE_BASE=debian:stretch-slim
Expand All @@ -111,7 +111,7 @@ env:

- DOCKER_IMAGE_BASE=debian:stretch-slim
JDK_IMPLEMENTATION=oraclejdk
JDK_VERSION=11.0.2
JDK_VERSION=11.0.7
DOCKER_TAG_TO_PUBLISH=${JDK_VERSION}-stretch-${JDK_IMPLEMENTATION}

# Ubuntu Xenial/OpenJDK
Expand All @@ -121,8 +121,8 @@ env:

- DOCKER_IMAGE_BASE=amd64/ubuntu:xenial
JDK_IMPLEMENTATION=openjdk
JDK_VERSION=8u191-b12-2ubuntu0.16.04.1
DOCKER_TAG_TO_PUBLISH=8u191-xenial-${JDK_IMPLEMENTATION}-headless
JDK_VERSION=8u252-b09-1~16.04
DOCKER_TAG_TO_PUBLISH=8u252-xenial-${JDK_IMPLEMENTATION}-headless

- DOCKER_IMAGE_BASE=amd64/ubuntu:xenial
JDK_IMPLEMENTATION=openjdk
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch

## [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
- Updated all repositories and versions for travis @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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ A specific OpenJDK version should be selected overriding `java_open_jdk_version`
Operative System | OpenJDK version
--- | ---
Debian Jessie | `8u171-b11-1~bpo8+1` (default)
Debian Stretch | `8u212-b01-1~deb9u1` (default)
Debian Stretch | `8u252-b09-1~deb9u1` (default)
Debian Stretch | `11.0.2+9-3~bpo9+1`
Ubuntu Xenial | `8u191-b12-2ubuntu0.16.04.1`
Ubuntu Xenial | `9~b114-0ubuntu1` (default)
Expand Down
6 changes: 3 additions & 3 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ java_open_jdk_version_major: "{{ java_open_jdk_version | regex_search('^([0-9]{1
# 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
11.0.7:
url: https://download.oracle.com/otn-pub/java/jdk/11.0.7%2B8/8c7daf89330c48f0b9e32f57169f7bac/jdk-11.0.7_linux-x64_bin.tar.gz
sha256: a7334a400fe9a9dbb329e299ca5ebab6ec969b5659a3a72fe0d6f981dbca0224
1.8.0_251:
url: https://download.oracle.com/otn-pub/java/jdk/8u251-b08/3d5a2bb8f8d4428bbe94aed7ec7ae784/jdk-8u251-linux-x64.tar.gz
sha256: 777a8d689e863275a647ae52cb30fd90022a3af268f34fc5b9867ce32f1b374e
2 changes: 1 addition & 1 deletion vars/CentOS-7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-openjdk-{{ java_o
# java-11-openjdk-11.0.2.7-0.el7_6.x86_64

# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
__java_open_jdk_version: "11.0.2.7"
__java_open_jdk_version: "11.0.7.10"

__java_required_repositories_openjdk: []
__java_required_libs_openjdk: []
2 changes: 1 addition & 1 deletion vars/Debian-9.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---

# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
__java_open_jdk_version: "8u212-b01-1~deb9u1"
__java_open_jdk_version: "8u252-b09-1~deb9u1"

__java_required_repositories_openjdk:
- deb http://ftp.debian.org/debian stretch-backports main
Expand Down
2 changes: 1 addition & 1 deletion vars/Ubuntu-18.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---

# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
__java_open_jdk_version: "11.0.1+13-3ubuntu1~18.04~ppa1"
__java_open_jdk_version: "11.0.7+10-2ubuntu2~18.04"

# Needed because Ubuntu Bionic SRU Exception with OpenJDK
__java_required_repositories_openjdk:
Expand Down

0 comments on commit 224501f

Please sign in to comment.