Skip to content
This repository was archived by the owner on Dec 19, 2024. It is now read-only.

Commit c7cb329

Browse files
committed
v2.2.2
Add support for Java '7u75', '7u76' and '8u31'
1 parent dd78279 commit c7cb329

File tree

7 files changed

+54
-22
lines changed

7 files changed

+54
-22
lines changed

CHANGELOG.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
###2.2.2
2+
3+
Add support for Java '7u75', '7u76' and '8u31'
4+
15
###2.2.1
26

37
Improve code quality, doc and metadata
@@ -18,13 +22,13 @@ Improve code quality, doc and metadata
1822
###2.0.0
1923

2024
* Support tar.gz format - now multiplatform!
21-
* Dropped support for Java 6 (too hacky)
25+
* Dropped support for Java 6
2226
* Major refactoring
2327
* Use `nanliu/archive` module for download and extraction
2428

2529
###1.1.5
2630

27-
* Add support for Java '7u71', '7u72' and '8u25'
31+
Add support for Java '7u71', '7u72' and '8u25'
2832

2933
###1.1.4
3034

@@ -33,7 +37,7 @@ Improve code quality, doc and metadata
3337

3438
###1.1.3
3539

36-
* Add support for Java '8u20'
40+
Add support for Java '8u20'
3741

3842
###1.1.2
3943

@@ -48,11 +52,11 @@ Improve code quality, doc and metadata
4852

4953
###1.1.0
5054

51-
* Add support for Java SE 6 series
55+
Add support for Java SE 6 series
5256

5357
###1.0.1
5458

55-
* Add support for Java '7u65' and '8u11'
59+
Add support for Java '7u65' and '8u11'
5660

5761
###1.0.0
5862

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,31 @@ oracle_java will affect the following parts of your system:
3232
Including the main class is enough to install the latest version of the Oracle JRE.
3333

3434
```puppet
35-
include ::oracle_java
35+
include oracle_java
3636
```
3737

3838
####A couple of examples
3939

4040
Install the latest release of the Java 7 SE JRE
4141

4242
```puppet
43-
class { '::oracle_java':
43+
class { 'oracle_java':
4444
version => 7
4545
}
4646
```
4747

4848
Install the latest available JDK
4949

5050
```puppet
51-
class { '::oracle_java':
51+
class { 'oracle_java':
5252
type => 'jdk'
5353
}
5454
```
5555

5656
Install a specific version of the JDK
5757

5858
```puppet
59-
class { '::oracle_java':
59+
class { 'oracle_java':
6060
version => '7u45',
6161
type => 'jdk'
6262
}
@@ -65,7 +65,7 @@ class { '::oracle_java':
6565
Force installation from standard tar.gz archive
6666

6767
```puppet
68-
class { '::oracle_java':
68+
class { 'oracle_java':
6969
7070
format => 'tar.gz'
7171
}
@@ -74,7 +74,7 @@ class { '::oracle_java':
7474
Disable checksum validation and add java alternative
7575

7676
```puppet
77-
class { '::oracle_java':
77+
class { 'oracle_java':
7878
7979
check_checksum => false,
8080
add_alternative => true

manifests/checksums.pp

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@
99
}
1010

1111
case $oracle_java::filename {
12+
# 8u31
13+
'jdk-8u31-linux-i586.rpm' : { $checksum = '0676136c154c3e0a6f3c3c9ebeb2a47d' }
14+
'jdk-8u31-linux-i586.tar.gz' : { $checksum = '4e9aec24367672412c7d10105a2a2bbb' }
15+
'jdk-8u31-linux-x64.rpm' : { $checksum = 'be6abc353ef797755c1c9260c27422e9' }
16+
'jdk-8u31-linux-x64.tar.gz' : { $checksum = '173e24bc2d5d5ca3469b8e34864a80da' }
17+
'jre-8u31-linux-i586.rpm' : { $checksum = 'ba6a68f0bbf350040d7d75b92cedae55' }
18+
'jre-8u31-linux-i586.tar.gz' : { $checksum = '6cb48241523ad39862c05d8cf791ce92' }
19+
'jre-8u31-linux-x64.rpm' : { $checksum = '4d6a99aa7f2addde8f6ad714e788ff61' }
20+
'jre-8u31-linux-x64.tar.gz' : { $checksum = 'c81a3cdabe4a12439dae08d4311670ff' }
1221
# 8u25
1322
'jdk-8u25-linux-i586.rpm' : { $checksum = '86c47648337ab32477f52f8b303c4fca' }
1423
'jdk-8u25-linux-i586.tar.gz' : { $checksum = 'b5b16247f66643727d9b6d4bc7c5efda' }
@@ -54,15 +63,33 @@
5463
'jre-8-linux-i586.tar.gz' : { $checksum = '045a0309585e546fa2da2316309c09ea' }
5564
'jre-8-linux-x64.rpm' : { $checksum = 'aa776b85d53202a385e7894b5b64c91e' }
5665
'jre-8-linux-x64.tar.gz' : { $checksum = '1e024eb9b0f7f61722e10fc08c873543' }
66+
# 7u76
67+
'jdk-7u76-linux-i586.rpm' : { $checksum = '75a1a5873014e18683b48fbf6e9990f9' }
68+
'jdk-7u76-linux-i586.tar.gz' : { $checksum = '566dcbcedbb9ec5a26f08bd65b14746b' }
69+
'jdk-7u76-linux-x64.rpm' : { $checksum = '993d0d6425951d2a3fe39d8ad2e550fc' }
70+
'jdk-7u76-linux-x64.tar.gz' : { $checksum = '5a98b1a3e4c48363d03f664f173bbb9a' }
71+
'jre-7u76-linux-i586.rpm' : { $checksum = '2d19d0aafa8e3684616803977e3cc364' }
72+
'jre-7u76-linux-i586.tar.gz' : { $checksum = 'e7eb5d65eab8f57cbf0d5da804327f75' }
73+
'jre-7u76-linux-x64.rpm' : { $checksum = '02ec5613512692c3d0c41fde4484d4e3' }
74+
'jre-7u76-linux-x64.tar.gz' : { $checksum = 'a5ee5fd266453e0209e45fb8bb5acd6d' }
75+
# 7u75
76+
'jdk-7u75-linux-i586.rpm' : { $checksum = 'c8b7d39c1c6bf750750e51d39e6b72fe' }
77+
'jdk-7u75-linux-i586.tar.gz' : { $checksum = 'e4371a4fddc049eca3bfef293d812b8e' }
78+
'jdk-7u75-linux-x64.rpm' : { $checksum = '53b8513548ae527d79899902524a06e1' }
79+
'jdk-7u75-linux-x64.tar.gz' : { $checksum = '6f1f81030a34f7a9c987f8b68a24d139' }
80+
'jre-7u75-linux-i586.rpm' : { $checksum = '89f718c7850f3089753da03202087205' }
81+
'jre-7u75-linux-i586.tar.gz' : { $checksum = '3a2a94b9cd76fa1323dd9a5aaf48383b' }
82+
'jre-7u75-linux-x64.rpm' : { $checksum = '302813994fe51f5177e8f7717d71e13c' }
83+
'jre-7u75-linux-x64.tar.gz' : { $checksum = '1869f0d2dac96372e3c345105543ba3e' }
5784
# 7u72
58-
'jdk-7u72-linux-x64.rpm' : { $checksum = 'c55acf3c04e149c0b91f57758f6b63ce' }
5985
'jdk-7u72-linux-i586.rpm' : { $checksum = 'bc6d383794f5baca63568fbbb663d0b5' }
60-
'jdk-7u72-linux-x64.tar.gz' : { $checksum = 'cfa44b49e50ea06e5c6ab95ff79e5b2a' }
6186
'jdk-7u72-linux-i586.tar.gz' : { $checksum = '4a942a47a700e63e050dd66e8ca08a1f' }
62-
'jre-7u72-linux-x64.rpm' : { $checksum = 'e48cdd20ee993726005dbaea26ec0dcc' }
87+
'jdk-7u72-linux-x64.rpm' : { $checksum = 'c55acf3c04e149c0b91f57758f6b63ce' }
88+
'jdk-7u72-linux-x64.tar.gz' : { $checksum = 'cfa44b49e50ea06e5c6ab95ff79e5b2a' }
6389
'jre-7u72-linux-i586.rpm' : { $checksum = 'c31b755e808633bb0ec3102cee67179e' }
64-
'jre-7u72-linux-x64.tar.gz' : { $checksum = '4ae2ef732dfd309e86a182ca0f7681fe' }
6590
'jre-7u72-linux-i586.tar.gz' : { $checksum = 'a66052322c1a26c33bf6078cb4040dfb' }
91+
'jre-7u72-linux-x64.rpm' : { $checksum = 'e48cdd20ee993726005dbaea26ec0dcc' }
92+
'jre-7u72-linux-x64.tar.gz' : { $checksum = '4ae2ef732dfd309e86a182ca0f7681fe' }
6693
# 7u71
6794
'jdk-7u71-linux-i586.rpm' : { $checksum = 'ca000c4668d4ffb4958474776ceddf8b' }
6895
'jdk-7u71-linux-i586.tar.gz' : { $checksum = '54899d0733d9a8697da59de79a02cc8f' }

manifests/download.pp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
group => 'root'
2222
}
2323

24-
# get checksums list
25-
include oracle_java::checksums
26-
2724
# download archive
2825
Archive {
2926
cookie => 'oraclelicense=accept-securebackup-cookie',
@@ -34,6 +31,7 @@
3431

3532
# WITH checksum check
3633
if $oracle_java::check_checksum {
34+
include oracle_java::checksums # get checksums list
3735
archive { "/usr/java/${oracle_java::filename}":
3836
checksum => $oracle_java::checksums::checksum,
3937
checksum_type => 'md5'

manifests/init.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#
2727
# === Sample Usage:
2828
#
29-
# class { '::oracle_java':
29+
# class { 'oracle_java':
3030
# version => '8u5',
3131
# type => 'jdk',
3232
# format => 'rpm'
@@ -51,9 +51,9 @@
5151

5252
# set to latest release if no minor version was provided
5353
if $version == '8' {
54-
$version_real = '8u25'
54+
$version_real = '8u31'
5555
} elsif $version == '7' {
56-
$version_real = '7u72'
56+
$version_real = '7u76'
5757
} else {
5858
$version_real = $version
5959
}

manifests/javalist.pp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
case $oracle_java::maj_version {
1313
8 : {
1414
case $oracle_java::min_version {
15+
'31' : { $build = '-b13' }
1516
'25' : { $build = '-b17' }
1617
'20' : { $build = '-b26' }
1718
'11' : { $build = '-b12' }
@@ -22,6 +23,8 @@
2223
}
2324
7 : {
2425
case $oracle_java::min_version {
26+
'76' : { $build = '-b13' }
27+
'75' : { $build = '-b13' }
2528
'72' : { $build = '-b14' }
2629
'71' : { $build = '-b14' }
2730
'67' : { $build = '-b01' }

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"project_page": "https://github.com/tOnI0/aco-oracle_java",
66
"source": "git://github.com/tOnI0/aco-oracle_java.git",
77
"summary": "Puppet module to install Oracle Java on Linux systems",
8-
"version": "2.2.1",
8+
"version": "2.2.2",
99
"tags": ["jre","jdk","oracle","java"],
1010
"dependencies": [
1111
{

0 commit comments

Comments
 (0)