RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Merge pull request #222 from puppetlabs/modules-4506

Browse Source 
[msync] 786266 Implement puppet-module-gems, a45803 Remove metadata.json from locales config
This commit is contained in:
Paula McMaw
2017-04-03 13:38:18 +01:00
committed by GitHub
parent 32f4492828 a8448286f7
commit df1fbfd29d
4 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Gemfile
View File

@@ -29,38 +29,27 @@ end
# Used for gem conditionals # Used for gem conditionals
supports_windows = false supports_windows = false
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
group :development do group :development do
gem 'puppet-lint', :require => false gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby"
gem 'metadata-json-lint', :require => false, :platforms => 'ruby' gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
gem 'puppet_facts', :require => false gem "puppet-module-posix-dev-r#{minor_version}", :require => false, :platforms => "ruby"
gem 'puppet-blacksmith', '>= 3.4.0', :require => false, :platforms => 'ruby' gem "puppet-module-win-dev-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
gem 'puppetlabs_spec_helper', '>= 1.2.1', :require => false gem "json_pure", '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
gem 'rspec-puppet', '>= 2.3.2', :require => false gem "fast_gettext", '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
gem 'rspec-puppet-facts', :require => false, :platforms => 'ruby' gem "fast_gettext", :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
gem 'mocha', '< 1.2.0', :require => false
gem 'simplecov', :require => false, :platforms => 'ruby'
gem 'parallel_tests', '< 2.10.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
gem 'parallel_tests', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
gem 'rubocop', '0.41.2', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
gem 'rubocop', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
gem 'rubocop-rspec', '~> 1.6', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
gem 'pry', :require => false
gem 'json_pure', '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
gem 'fast_gettext', '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
gem 'fast_gettext', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
gem 'rainbow', '< 2.2.0', :require => false
end end
group :system_tests do group :system_tests do
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '>= 3') gem "puppet-module-posix-system-r#{minor_version}", :require => false, :platforms => "ruby"
gem 'beaker-pe', :require => false gem "puppet-module-win-system-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION']) gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')
gem 'beaker-puppet_install_helper', :require => false gem "beaker-pe", :require => false
gem 'beaker-module_install_helper', :require => false gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])
gem 'master_manipulator', :require => false gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION']) gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
end end
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION']) gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

3
locales/config.yaml
View File

@@ -22,5 +22,4 @@ gettext:
# Patterns for +Dir.glob+ used to find all files that might contain # Patterns for +Dir.glob+ used to find all files that might contain
# translatable content, relative to the project root directory # translatable content, relative to the project root directory
source_files: source_files:
- 'metadata.json'

6
manifests/init.pp
View File

@@ -118,14 +118,12 @@ class java(
} }
anchor { 'java::begin:': } anchor { 'java::begin:': }
-> -> package { 'java':
package { 'java':
ensure => $version, ensure => $version,
install_options => $package_options, install_options => $package_options,
name => $use_java_package_name, name => $use_java_package_name,
} }
-> -> class { 'java::config': }
class { 'java::config': }
-> anchor { 'java::end': } -> anchor { 'java::end': }
} }

3
manifests/oracle.pp
View File

@@ -226,13 +226,14 @@ define java::oracle (
creates => $creates_path, creates => $creates_path,
proxy_server => $proxy_server, proxy_server => $proxy_server,
proxy_type => $proxy_type, proxy_type => $proxy_type,
}-> }
case $::kernel { case $::kernel {
'Linux' : { 'Linux' : {
exec { "Install Oracle java_se ${java_se} ${version}" : exec { "Install Oracle java_se ${java_se} ${version}" :
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin', path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
command => $install_command, command => $install_command,
creates => $creates_path, creates => $creates_path,
before => Archive[$destination]
} }
} }
default : { default : {