Skip to content

Commit fa1f5b1

Browse files
vStonevStone
committed
Merge remote-tracking branch 'upstream/master' into develop
2 parents 0e6608f + fcf3ac3 commit fa1f5b1

14 files changed

Lines changed: 82 additions & 61 deletions

File tree

‎.fixtures.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
fixtures:
22
repositories:
33
stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
4-
archive: "git://github.com/voxpupuli/puppet-archive.git"
4+
archive:
5+
repo: "git://github.com/voxpupuli/puppet-archive.git"
6+
ref: "v1.2.0"
57
symlinks:
68
java: "#{source_dir}"

‎.gitattributes‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#This file is generated by ModuleSync, do not edit.
2-
*.rb eol=lf
2+
*.rb eol=lf
33
*.erb eol=lf
4-
*.pp eol=lf
5-
*.sh eol=lf
4+
*.pp eol=lf
5+
*.sh eol=lf

‎.travis.yml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,9 @@ matrix:
2424
sudo: required
2525
- rvm: 2.3.1
2626
bundler_args: --without system_tests
27-
env: PUPPET_GEM_VERSION="~> 4.0" STDLIB_LOG_DEPRECATIONS="false"
28-
- rvm: 2.1.9
27+
env: PUPPET_GEM_VERSION="~> 4.0"
28+
- rvm: 2.1.7
2929
bundler_args: --without system_tests
30-
env: PUPPET_GEM_VERSION="~> 4.0" STDLIB_LOG_DEPRECATIONS="false"
31-
- rvm: 2.1.5
32-
bundler_args: --without system_tests
33-
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
34-
- rvm: 2.1.5
35-
bundler_args: --without system_tests
36-
env: PUPPET_GEM_VERSION="~> 3.0"
37-
- rvm: 1.9.3
38-
bundler_args: --without system_tests
39-
env: PUPPET_GEM_VERSION="~> 3.0"
30+
env: PUPPET_GEM_VERSION="~> 4.0"
4031
notifications:
4132
email: false

‎Gemfile‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,27 @@ end
2929

3030
# Used for gem conditionals
3131
supports_windows = false
32+
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
33+
minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
3234

3335
group :development do
34-
gem 'puppet-lint', :require => false
35-
gem 'metadata-json-lint', :require => false, :platforms => 'ruby'
36-
gem 'puppet_facts', :require => false
37-
gem 'puppet-blacksmith', '>= 3.4.0', :require => false, :platforms => 'ruby'
38-
gem 'puppetlabs_spec_helper', '>= 1.2.1', :require => false
39-
gem 'rspec-puppet', '>= 2.3.2', :require => false
40-
gem 'rspec-puppet-facts', :require => false, :platforms => 'ruby'
41-
gem 'mocha', '< 1.2.0', :require => false
42-
gem 'simplecov', :require => false, :platforms => 'ruby'
43-
gem 'parallel_tests', '< 2.10.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
44-
gem 'parallel_tests', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
45-
gem 'rubocop', '0.41.2', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
46-
gem 'rubocop', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
47-
gem 'rubocop-rspec', '~> 1.6', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
48-
gem 'pry', :require => false
49-
gem 'json_pure', '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
50-
gem 'fast_gettext', '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
51-
gem 'fast_gettext', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
52-
gem 'rainbow', '< 2.2.0', :require => false
36+
gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby"
37+
gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
38+
gem "puppet-module-posix-dev-r#{minor_version}", :require => false, :platforms => "ruby"
39+
gem "puppet-module-win-dev-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
40+
gem "json_pure", '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
41+
gem "fast_gettext", '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
42+
gem "fast_gettext", :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
5343
end
5444

5545
group :system_tests do
56-
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '>= 3')
57-
gem 'beaker-pe', :require => false
58-
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'])
59-
gem 'beaker-puppet_install_helper', :require => false
60-
gem 'beaker-module_install_helper', :require => false
61-
gem 'master_manipulator', :require => false
62-
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
63-
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
46+
gem "puppet-module-posix-system-r#{minor_version}", :require => false, :platforms => "ruby"
47+
gem "puppet-module-win-system-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
48+
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')
49+
gem "beaker-pe", :require => false
50+
gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])
51+
gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
52+
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
6453
end
6554

6655
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

‎appveyor.yml‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/facter/java_version.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
setcode do
2424
unless [ 'openbsd', 'darwin' ].include? Facter.value(:operatingsystem).downcase
2525
if Facter::Util::Resolution.which('java')
26-
Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip
26+
Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.first.split(/"/)[1].strip
2727
end
2828
end
2929
end
@@ -35,7 +35,7 @@
3535
setcode do
3636
Facter::Util::Resolution.with_env("PATH" => '/usr/local/jdk-1.7.0/jre/bin:/usr/local/jre-1.7.0/bin') do
3737
if Facter::Util::Resolution.which('java')
38-
Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip
38+
Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.first.split(/"/)[1].strip
3939
end
4040
end
4141
end
@@ -46,7 +46,7 @@
4646
has_weight 100
4747
setcode do
4848
unless /Unable to find any JVMs matching version/ =~ Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1')
49-
Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip
49+
Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.first.split(/"/)[1].strip
5050
end
5151
end
5252
end

‎locales/config.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
# This is the project-specific configuration file for setting up
3+
# fast_gettext for your project.
4+
gettext:
5+
# This is used for the name of the .pot and .po files; they will be
6+
# called <project_name>.pot?
7+
project_name: puppetlabs-java
8+
# This is used in comments in the .pot and .po files to indicate what
9+
# project the files belong to and should bea little more desctiptive than
10+
# <project_name>
11+
package_name: puppetlabs-java
12+
# The locale that the default messages in the .pot file are in
13+
default_locale: en
14+
# The email used for sending bug reports.
15+
bugs_address: [email protected]
16+
# The holder of the copyright.
17+
copyright_holder: Puppet, Inc.
18+
# This determines which comments in code should be eligible for translation.
19+
# Any comments that start with this string will be externalized. (Leave
20+
# empty to include all.)
21+
comments_tag: TRANSLATOR
22+
# Patterns for +Dir.glob+ used to find all files that might contain
23+
# translatable content, relative to the project root directory
24+
source_files:
25+

‎manifests/init.pp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,12 @@
136136
}
137137

138138
anchor { 'java::begin:': }
139-
->
140-
package { 'java':
139+
-> package { 'java':
141140
ensure => $version,
142141
install_options => $package_options,
143142
name => $use_java_package_name,
144143
}
145-
->
146-
class { 'java::config': }
144+
-> class { 'java::config': }
147145
-> anchor { 'java::end': }
148146

149147
}

‎manifests/oracle.pp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,14 @@
226226
creates => $creates_path,
227227
proxy_server => $proxy_server,
228228
proxy_type => $proxy_type,
229-
}->
229+
}
230230
case $::kernel {
231231
'Linux' : {
232232
exec { "Install Oracle java_se ${java_se} ${version}" :
233233
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
234234
command => $install_command,
235235
creates => $creates_path,
236+
require => Archive[$destination]
236237
}
237238
}
238239
default : {

‎manifests/params.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
case $::osfamily {
1616
'RedHat': {
1717
case $::operatingsystem {
18-
'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL': {
18+
'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC': {
1919
if (versioncmp($::operatingsystemrelease, '5.0') < 0) {
2020
$jdk_package = 'java-1.6.0-sun-devel'
2121
$jre_package = 'java-1.6.0-sun'

0 commit comments

Comments
 (0)