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

Commit 80cbc71

Browse files
committed
Unset 'provider' param on all 'archive' res; release v2.7.3
Closes #26
1 parent 373c89b commit 80cbc71

File tree

5 files changed

+27
-16
lines changed

5 files changed

+27
-16
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1+
###2.7.3
2+
3+
* Unset `provider` parameter on all `archive` resources (from `puppet-archive` module)
4+
- quick and dirty workaround until [SERVER-94](https://tickets.puppetlabs.com/browse/SERVER-94) gets fixed
5+
- **Warning:** may break behind a HTTP proxy (untested)
6+
* Tested on Fedora 25, Amazon Linux 2016.09
7+
18
###2.7.2
29

310
* Add support for Java '8u111'/'8u112' ([mtron](https://github.com/mtron))
11+
* Contain included classes ([claytononeill](https://github.com/claytononeill))
412
* Tested on Ubuntu 16.10
513

614
###2.7.1
@@ -27,7 +35,7 @@ Add support for Java '8u71'/'8u72'
2735

2836
###2.6.0
2937

30-
* Replace deprecated module dependency [nanliu-archive](https://forge.puppetlabs.com/nanliu/archive) by [puppet-archive](https://forge.puppetlabs.com/puppet/archive)
38+
* Replace deprecated module dependency [nanliu-archive](https://forge.puppetlabs.com/nanliu/archive) with [puppet-archive](https://forge.puppetlabs.com/puppet/archive)
3139
* Use *curl* as download provider instead of *faraday*
3240

3341
###2.5.1

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ Prior to Java 8u20, two different releases of the same Java series could not coh
176176
##Contributors
177177

178178
* [Martin Zehetmayer](https://github.com/angrox)
179+
* [Clayton O'Neill](https://github.com/claytononeill)
179180
* [Michael Hoertnagl](https://github.com/mtron)
180181

181182
##Credits

manifests/download.pp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
# download archive
3434
if $oracle_java::format_real == 'rpm' or $oracle_java::maj_version == '6' {
3535
archive { "${oracle_java::install_path}/${oracle_java::filename}":
36-
provider => 'curl',
37-
cookie => 'oraclelicense=accept-securebackup-cookie',
38-
source => $oracle_java::downloadurl,
39-
cleanup => false,
40-
require => File[$oracle_java::install_path]
36+
#provider => 'curl',
37+
cookie => 'oraclelicense=accept-securebackup-cookie',
38+
source => $oracle_java::downloadurl,
39+
cleanup => false,
40+
require => File[$oracle_java::install_path]
4141
}
4242
} else {
4343
# also extract and clean up if tar.gz
4444
archive { "${oracle_java::install_path}/${oracle_java::filename}":
45-
provider => 'curl',
45+
#provider => 'curl',
4646
cookie => 'oraclelicense=accept-securebackup-cookie',
4747
source => $oracle_java::downloadurl,
4848
cleanup => true,

manifests/installation.pp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -463,16 +463,16 @@
463463
# download archive
464464
if $maj_version == '6' {
465465
archive { "${install_path}/${filename}":
466-
provider => 'curl',
467-
cookie => 'oraclelicense=accept-securebackup-cookie',
468-
source => $downloadurl,
469-
cleanup => false,
470-
require => File[$install_path]
466+
#provider => 'curl',
467+
cookie => 'oraclelicense=accept-securebackup-cookie',
468+
source => $downloadurl,
469+
cleanup => false,
470+
require => File[$install_path]
471471
}
472472
} else {
473473
# also extract and clean up if tar.gz
474474
archive { "${install_path}/${filename}":
475-
provider => 'curl',
475+
#provider => 'curl',
476476
cookie => 'oraclelicense=accept-securebackup-cookie',
477477
source => $downloadurl,
478478
cleanup => true,

metadata.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"project_page": "https://github.com/antoineco/aco-oracle_java",
66
"source": "git://github.com/antoineco/aco-oracle_java.git",
77
"summary": "Puppet module to install Oracle Java on Linux systems",
8-
"version": "2.7.2",
8+
"version": "2.7.3",
99
"tags": ["jre","jdk","oracle","java"],
1010
"dependencies": [
1111
{
@@ -65,7 +65,8 @@
6565
"operatingsystemrelease": [
6666
"2015.03",
6767
"2015.09",
68-
"2016.03"
68+
"2016.03",
69+
"2016.09"
6970
]
7071
},
7172
{
@@ -80,7 +81,8 @@
8081
"21",
8182
"22",
8283
"23",
83-
"24"
84+
"24",
85+
"25"
8486
]
8587
},
8688
{

0 commit comments

Comments
 (0)