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

Commit c9eb1b5

Browse files
antoinecoantoineco
committed
Add support for Java 8u151/8u152/9.0.1
1 parent 78f49c5 commit c9eb1b5

File tree

4 files changed

+84
-16
lines changed

4 files changed

+84
-16
lines changed

‎manifests/checksums.pp‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,34 @@
1010

1111
if !$oracle_java::checksum {
1212
case $oracle_java::filename_real {
13+
# 9.0.1
14+
'jdk-9.0.1_linux-x64_bin.rpm' : { $md5checksum = '86cce47a74dfff3e224abe7a35ee7420' }
15+
'jdk-9.0.1_linux-x64_bin.tar.gz' : { $md5checksum = 'f6a5d86a9d371e9c416c1f82213b326f' }
16+
'jre-9.0.1_linux-x64_bin.rpm' : { $md5checksum = '72af66d314fce1d81fc399ea7c6cdf29' }
17+
'jre-9.0.1_linux-x64_bin.tar.gz' : { $md5checksum = '008913963c0c053d3c52bd6e3473010d' }
1318
# 9
1419
'jdk-9_linux-x64_bin.rpm' : { $md5checksum = '5f2c490f08d6da7ce8807cdeea2f282d' }
1520
'jdk-9_linux-x64_bin.tar.gz' : { $md5checksum = 'abe68b8ba280d11cb8f937410543750c' }
1621
'jre-9_linux-x64_bin.rpm' : { $md5checksum = '3d0bd97925fa3d68746c2849c6aa1d2b' }
1722
'jre-9_linux-x64_bin.tar.gz' : { $md5checksum = '113a784957235eb78ef418f89e3e6b88' }
23+
# 8u152
24+
'jdk-8u152-linux-i586.rpm' : { $md5checksum = '953f8cbdd09615c44545860d969d0937' }
25+
'jdk-8u152-linux-i586.tar.gz' : { $md5checksum = '0c70ea43ad5baf0349a16c734bc2fb41' }
26+
'jdk-8u152-linux-x64.rpm' : { $md5checksum = 'b6979be30bdc4077dc93cd99134ad84d' }
27+
'jdk-8u152-linux-x64.tar.gz' : { $md5checksum = '20dddd28ced3179685a5f58d3fcbecd8' }
28+
'jre-8u152-linux-i586.rpm' : { $md5checksum = '52b57d4cec8d8f3e6bc7c82e87d18973' }
29+
'jre-8u152-linux-i586.tar.gz' : { $md5checksum = '1ea9344c8d223694e05865e32edc3656' }
30+
'jre-8u152-linux-x64.rpm' : { $md5checksum = '865f94da68cb41faeddad894ffa01b49' }
31+
'jre-8u152-linux-x64.tar.gz' : { $md5checksum = '32c9a36d3869b13db18e8bd5bfc14dcb' }
32+
# 8u151
33+
'jdk-8u151-linux-i586.rpm' : { $md5checksum = '47116151056e99506e103c2fd84c2da4' }
34+
'jdk-8u151-linux-i586.tar.gz' : { $md5checksum = 'ecff0de91938a43b6efb312f6b2994f2' }
35+
'jdk-8u151-linux-x64.rpm' : { $md5checksum = '7f09893e12aadef39e0751ec657cc7d8' }
36+
'jdk-8u151-linux-x64.tar.gz' : { $md5checksum = '774d8cb584d9ebedef8eba9ee2dfe113' }
37+
'jre-8u151-linux-i586.rpm' : { $md5checksum = '3ee20326ff2fb9ae5cd344689d3fcbdf' }
38+
'jre-8u151-linux-i586.tar.gz' : { $md5checksum = '6adfa27e4eb8e4acc355e598139b46e7' }
39+
'jre-8u151-linux-x64.rpm' : { $md5checksum = 'a540c278bc158c4abf263f883ec3d207' }
40+
'jre-8u151-linux-x64.tar.gz' : { $md5checksum = '47ada926885c43f4ee2a8426a44af634' }
1841
# 8u144
1942
'jdk-8u144-linux-i586.rpm' : { $md5checksum = 'eb35a77bcbd2466d9c96142e5a0d9b87' }
2043
'jdk-8u144-linux-i586.tar.gz' : { $md5checksum = '13d771707f326b02e2497c99e0a2ca37' }

‎manifests/init.pp‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@
101101

102102
# set to latest release if no minor version was provided
103103
if $version == '9' {
104-
$version_real = '9u0'
104+
$version_real = '9.0.1'
105105
} elsif $version == '8' {
106-
$version_real = '8u144'
106+
$version_real = '8u152'
107107
} elsif $version == '7' {
108108
$version_real = '7u80'
109109
} elsif $version == '6' {
@@ -120,14 +120,20 @@
120120
}
121121

122122
# get major/minor version numbers
123-
$array_version = split($version_real, 'u')
124-
$maj_version = $array_version[0]
125-
$min_version = $array_version[1]
123+
if versioncmp($version_real, '9') >= 0 {
124+
$array_version = split($version_real, '\.')
125+
$maj_version = $array_version[0]
126+
$min_version = $array_version[2]
127+
} else {
128+
$array_version = split($version_real, 'u')
129+
$maj_version = $array_version[0]
130+
$min_version = $array_version[1]
131+
}
126132

127133
# remove extra particle if minor version is 0
128134
$version_final = delete($version_real, 'u0')
129-
if $version_final == '9' {
130-
$longversion = "${type}-9"
135+
if versioncmp($version_final, '9') >= 0 {
136+
$longversion = "${type}-${version_final}"
131137
} else {
132138
$longversion = $min_version ? {
133139
'0' => "${type}1.${maj_version}.0",
@@ -191,8 +197,8 @@
191197
}
192198

193199
# define package name
194-
if $version_final == '9' {
195-
$packagename = "${longversion}-9-ga"
200+
if versioncmp($version_final, '8u151') >= 0 and $maj_version != '9' {
201+
$packagename = "${type}1.${maj_version}"
196202
} elsif versioncmp($version_final, '8u20') >= 0 {
197203
$packagename = $longversion
198204
} else {

‎manifests/installation.pp‎

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@
7373

7474
# set to latest release if no minor version was provided
7575
if $version == '9' {
76-
$version_real = '9u0'
76+
$version_real = '9.0.1'
7777
} elsif $version == '8' {
78-
$version_real = '8u144'
78+
$version_real = '8u152'
7979
} elsif $version == '7' {
8080
$version_real = '7u80'
8181
} elsif $version == '6' {
@@ -92,14 +92,20 @@
9292
}
9393

9494
# get major/minor version numbers
95-
$array_version = split($version_real, 'u')
96-
$maj_version = $array_version[0]
97-
$min_version = $array_version[1]
95+
if versioncmp($version_real, '9') >= 0 {
96+
$array_version = split($version_real, '\.')
97+
$maj_version = $array_version[0]
98+
$min_version = $array_version[2]
99+
} else {
100+
$array_version = split($version_real, 'u')
101+
$maj_version = $array_version[0]
102+
$min_version = $array_version[1]
103+
}
98104

99105
# remove extra particle if minor version is 0
100106
$version_final = delete($version_real, 'u0')
101-
if $version_final == '9' {
102-
$longversion = "${type}-9"
107+
if versioncmp($version_final, '9') >= 0 {
108+
$longversion = "${type}-${version_final}"
103109
} else {
104110
$longversion = $min_version ? {
105111
'0' => "${type}1.${maj_version}.0",
@@ -126,12 +132,17 @@
126132
case $maj_version {
127133
'9' : {
128134
case $min_version {
135+
'1' : { $buildnumber = '+11' }
129136
'0' : { $buildnumber = '+181' }
130137
default : { fail("Unreleased Java SE version ${version_real}") }
131138
}
132139
}
133140
'8' : {
134141
case $min_version {
142+
'152' : { $buildnumber = '-b16'
143+
$urlcodeoracle = '/aa0333dd3019491ca4f6ddbe78cdb6d0' }
144+
'151' : { $buildnumber = '-b12'
145+
$urlcodeoracle = '/e758a0de34e24606bca991d704f6dcbf' }
135146
'144' : { $buildnumber = '-b01'
136147
$urlcodeoracle = '/090f390dda5b47b9b721c7dfaa008135' }
137148
'141' : { $buildnumber = '-b15'
@@ -244,11 +255,34 @@
244255
if !$checksum {
245256
#-- start checksum --#
246257
case $filename_real {
258+
# 9.0.1
259+
'jdk-9.0.1_linux-x64_bin.rpm' : { $md5checksum = '86cce47a74dfff3e224abe7a35ee7420' }
260+
'jdk-9.0.1_linux-x64_bin.tar.gz' : { $md5checksum = 'f6a5d86a9d371e9c416c1f82213b326f' }
261+
'jre-9.0.1_linux-x64_bin.rpm' : { $md5checksum = '72af66d314fce1d81fc399ea7c6cdf29' }
262+
'jre-9.0.1_linux-x64_bin.tar.gz' : { $md5checksum = '008913963c0c053d3c52bd6e3473010d' }
247263
# 9
248264
'jdk-9_linux-x64_bin.rpm' : { $md5checksum = '5f2c490f08d6da7ce8807cdeea2f282d' }
249265
'jdk-9_linux-x64_bin.tar.gz' : { $md5checksum = 'abe68b8ba280d11cb8f937410543750c' }
250266
'jre-9_linux-x64_bin.rpm' : { $md5checksum = '3d0bd97925fa3d68746c2849c6aa1d2b' }
251267
'jre-9_linux-x64_bin.tar.gz' : { $md5checksum = '113a784957235eb78ef418f89e3e6b88' }
268+
# 8u152
269+
'jdk-8u152-linux-i586.rpm' : { $md5checksum = '953f8cbdd09615c44545860d969d0937' }
270+
'jdk-8u152-linux-i586.tar.gz' : { $md5checksum = '0c70ea43ad5baf0349a16c734bc2fb41' }
271+
'jdk-8u152-linux-x64.rpm' : { $md5checksum = 'b6979be30bdc4077dc93cd99134ad84d' }
272+
'jdk-8u152-linux-x64.tar.gz' : { $md5checksum = '20dddd28ced3179685a5f58d3fcbecd8' }
273+
'jre-8u152-linux-i586.rpm' : { $md5checksum = '52b57d4cec8d8f3e6bc7c82e87d18973' }
274+
'jre-8u152-linux-i586.tar.gz' : { $md5checksum = '1ea9344c8d223694e05865e32edc3656' }
275+
'jre-8u152-linux-x64.rpm' : { $md5checksum = '865f94da68cb41faeddad894ffa01b49' }
276+
'jre-8u152-linux-x64.tar.gz' : { $md5checksum = '32c9a36d3869b13db18e8bd5bfc14dcb' }
277+
# 8u151
278+
'jdk-8u151-linux-i586.rpm' : { $md5checksum = '47116151056e99506e103c2fd84c2da4' }
279+
'jdk-8u151-linux-i586.tar.gz' : { $md5checksum = 'ecff0de91938a43b6efb312f6b2994f2' }
280+
'jdk-8u151-linux-x64.rpm' : { $md5checksum = '7f09893e12aadef39e0751ec657cc7d8' }
281+
'jdk-8u151-linux-x64.tar.gz' : { $md5checksum = '774d8cb584d9ebedef8eba9ee2dfe113' }
282+
'jre-8u151-linux-i586.rpm' : { $md5checksum = '3ee20326ff2fb9ae5cd344689d3fcbdf' }
283+
'jre-8u151-linux-i586.tar.gz' : { $md5checksum = '6adfa27e4eb8e4acc355e598139b46e7' }
284+
'jre-8u151-linux-x64.rpm' : { $md5checksum = 'a540c278bc158c4abf263f883ec3d207' }
285+
'jre-8u151-linux-x64.tar.gz' : { $md5checksum = '47ada926885c43f4ee2a8426a44af634' }
252286
# 8u144
253287
'jdk-8u144-linux-i586.rpm' : { $md5checksum = 'eb35a77bcbd2466d9c96142e5a0d9b87' }
254288
'jdk-8u144-linux-i586.tar.gz' : { $md5checksum = '13d771707f326b02e2497c99e0a2ca37' }

‎manifests/javalist.pp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,17 @@
1212
case $oracle_java::maj_version {
1313
'9' : {
1414
case $oracle_java::min_version {
15+
'1' : { $buildnumber = '+11' }
1516
'0' : { $buildnumber = '+181' }
1617
default : { fail("Unreleased Java SE version ${oracle_java::version_real}") }
1718
}
1819
}
1920
'8' : {
2021
case $oracle_java::min_version {
22+
'152' : { $buildnumber = '-b16'
23+
$urlcodeoracle = '/aa0333dd3019491ca4f6ddbe78cdb6d0' }
24+
'151' : { $buildnumber = '-b12'
25+
$urlcodeoracle = '/e758a0de34e24606bca991d704f6dcbf' }
2126
'144' : { $buildnumber = '-b01'
2227
$urlcodeoracle = '/090f390dda5b47b9b721c7dfaa008135' }
2328
'141' : { $buildnumber = '-b15'

0 commit comments

Comments
 (0)