Merge pull request #231 from eputnam/170prep

forgot to update version in metadata for major version bump puppet-archive, a puppetlabs-java dependency, is now using structured facts on master. this commit changes the minimum number of facts from legacy to structured so that spec tests continue to pass
(maint) facts update oracle.pp
2017-05-30 14:04:50 -07:00 · 2017-05-30 13:54:03 -07:00 · 2017-05-30 13:47:58 -07:00 · 2017-05-26 14:48:43 -07:00 · 2017-05-26 13:45:13 -07:00 · 2017-05-24 15:29:39 -07:00
32 changed files with 1167 additions and 309 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,24 @@
 #This file is generated by ModuleSync, do not edit.
 pkg/
 Gemfile.lock
+Gemfile.local
 vendor/
-spec/fixtures/
+spec/fixtures/manifests/
+spec/fixtures/modules/
+log/
+junit/
 .vagrant/
 .bundle/
 coverage/
 log/
 .idea/
+.metadata
 *.iml
+.*.sw[op]
+.yardoc
+.yardwarns
+.DS_Store
+tmp/
+vendor/
+doc/
+
--- a/.project
+++ b/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>puppetlabs-java</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -0,0 +1,508 @@
+require: rubocop-rspec
+AllCops:
+  TargetRubyVersion: 1.9
+  Include:
+    - ./**/*.rb
+  Exclude:
+    - vendor/**/*
+    - .vendor/**/*
+    - pkg/**/*
+    - spec/fixtures/**/*
+Lint/ConditionPosition:
+  Enabled: True
+
+Lint/ElseLayout:
+  Enabled: True
+
+Lint/UnreachableCode:
+  Enabled: True
+
+Lint/UselessComparison:
+  Enabled: True
+
+Lint/EnsureReturn:
+  Enabled: True
+
+Lint/HandleExceptions:
+  Enabled: True
+
+Lint/LiteralInCondition:
+  Enabled: True
+
+Lint/ShadowingOuterLocalVariable:
+  Enabled: True
+
+Lint/LiteralInInterpolation:
+  Enabled: True
+
+Style/HashSyntax:
+  Enabled: True
+
+Style/RedundantReturn:
+  Enabled: True
+
+Lint/AmbiguousOperator:
+  Enabled: True
+
+Lint/AssignmentInCondition:
+  Enabled: True
+
+Style/SpaceBeforeComment:
+  Enabled: True
+
+Style/AndOr:
+  Enabled: True
+
+Style/RedundantSelf:
+  Enabled: True
+
+# Method length is not necessarily an indicator of code quality
+Metrics/MethodLength:
+  Enabled: False
+
+# Module length is not necessarily an indicator of code quality
+Metrics/ModuleLength:
+  Enabled: False
+
+Style/WhileUntilModifier:
+  Enabled: True
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: True
+
+Lint/Eval:
+  Enabled: True
+
+Lint/BlockAlignment:
+  Enabled: True
+
+Lint/DefEndAlignment:
+  Enabled: True
+
+Lint/EndAlignment:
+  Enabled: True
+
+Lint/DeprecatedClassMethods:
+  Enabled: True
+
+Lint/Loop:
+  Enabled: True
+
+Lint/ParenthesesAsGroupedExpression:
+  Enabled: True
+
+Lint/RescueException:
+  Enabled: True
+
+Lint/StringConversionInInterpolation:
+  Enabled: True
+
+Lint/UnusedBlockArgument:
+  Enabled: True
+
+Lint/UnusedMethodArgument:
+  Enabled: True
+
+Lint/UselessAccessModifier:
+  Enabled: True
+
+Lint/UselessAssignment:
+  Enabled: True
+
+Lint/Void:
+  Enabled: True
+
+Style/AccessModifierIndentation:
+  Enabled: True
+
+Style/AccessorMethodName:
+  Enabled: True
+
+Style/Alias:
+  Enabled: True
+
+Style/AlignArray:
+  Enabled: True
+
+Style/AlignHash:
+  Enabled: True
+
+Style/AlignParameters:
+  Enabled: True
+
+Metrics/BlockNesting:
+  Enabled: True
+
+Style/AsciiComments:
+  Enabled: True
+
+Style/Attr:
+  Enabled: True
+
+Style/BracesAroundHashParameters:
+  Enabled: True
+
+Style/CaseEquality:
+  Enabled: True
+
+Style/CaseIndentation:
+  Enabled: True
+
+Style/CharacterLiteral:
+  Enabled: True
+
+Style/ClassAndModuleCamelCase:
+  Enabled: True
+
+Style/ClassAndModuleChildren:
+  Enabled: False
+
+Style/ClassCheck:
+  Enabled: True
+
+# Class length is not necessarily an indicator of code quality
+Metrics/ClassLength:
+  Enabled: False
+
+Style/ClassMethods:
+  Enabled: True
+
+Style/ClassVars:
+  Enabled: True
+
+Style/WhenThen:
+  Enabled: True
+
+Style/WordArray:
+  Enabled: True
+
+Style/UnneededPercentQ:
+  Enabled: True
+
+Style/Tab:
+  Enabled: True
+
+Style/SpaceBeforeSemicolon:
+  Enabled: True
+
+Style/TrailingBlankLines:
+  Enabled: True
+
+Style/SpaceInsideBlockBraces:
+  Enabled: True
+
+Style/SpaceInsideBrackets:
+  Enabled: True
+
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: True
+
+Style/SpaceInsideParens:
+  Enabled: True
+
+Style/LeadingCommentSpace:
+  Enabled: True
+
+Style/SpaceBeforeFirstArg:
+  Enabled: True
+
+Style/SpaceAfterColon:
+  Enabled: True
+
+Style/SpaceAfterComma:
+  Enabled: True
+
+Style/SpaceAfterMethodName:
+  Enabled: True
+
+Style/SpaceAfterNot:
+  Enabled: True
+
+Style/SpaceAfterSemicolon:
+  Enabled: True
+
+Style/SpaceAroundEqualsInParameterDefault:
+  Enabled: True
+
+Style/SpaceAroundOperators:
+  Enabled: True
+
+Style/SpaceBeforeBlockBraces:
+  Enabled: True
+
+Style/SpaceBeforeComma:
+  Enabled: True
+
+Style/CollectionMethods:
+  Enabled: True
+
+Style/CommentIndentation:
+  Enabled: True
+
+Style/ColonMethodCall:
+  Enabled: True
+
+Style/CommentAnnotation:
+  Enabled: True
+
+# 'Complexity' is very relative
+Metrics/CyclomaticComplexity:
+  Enabled: False
+
+Style/ConstantName:
+  Enabled: True
+
+Style/Documentation:
+  Enabled: False
+
+Style/DefWithParentheses:
+  Enabled: True
+
+Style/PreferredHashMethods:
+  Enabled: True
+
+Style/DotPosition:
+  EnforcedStyle: trailing
+
+Style/DoubleNegation:
+  Enabled: True
+
+Style/EachWithObject:
+  Enabled: True
+
+Style/EmptyLineBetweenDefs:
+  Enabled: True
+
+Style/IndentArray:
+  Enabled: True
+
+Style/IndentHash:
+  Enabled: True
+
+Style/IndentationConsistency:
+  Enabled: True
+
+Style/IndentationWidth:
+  Enabled: True
+
+Style/EmptyLines:
+  Enabled: True
+
+Style/EmptyLinesAroundAccessModifier:
+  Enabled: True
+
+Style/EmptyLiteral:
+  Enabled: True
+
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Enabled: False
+
+Style/MethodCallParentheses:
+  Enabled: True
+
+Style/MethodDefParentheses:
+  Enabled: True
+
+Style/LineEndConcatenation:
+  Enabled: True
+
+Style/TrailingWhitespace:
+  Enabled: True
+
+Style/StringLiterals:
+  Enabled: True
+
+Style/TrailingCommaInArguments:
+  Enabled: True
+
+Style/TrailingCommaInLiteral:
+  Enabled: True
+
+Style/GlobalVars:
+  Enabled: True
+
+Style/GuardClause:
+  Enabled: True
+
+Style/IfUnlessModifier:
+  Enabled: True
+
+Style/MultilineIfThen:
+  Enabled: True
+
+Style/NegatedIf:
+  Enabled: True
+
+Style/NegatedWhile:
+  Enabled: True
+
+Style/Next:
+  Enabled: True
+
+Style/SingleLineBlockParams:
+  Enabled: True
+
+Style/SingleLineMethods:
+  Enabled: True
+
+Style/SpecialGlobalVars:
+  Enabled: True
+
+Style/TrivialAccessors:
+  Enabled: True
+
+Style/UnlessElse:
+  Enabled: True
+
+Style/VariableInterpolation:
+  Enabled: True
+
+Style/VariableName:
+  Enabled: True
+
+Style/WhileUntilDo:
+  Enabled: True
+
+Style/EvenOdd:
+  Enabled: True
+
+Style/FileName:
+  Enabled: True
+
+Style/For:
+  Enabled: True
+
+Style/Lambda:
+  Enabled: True
+
+Style/MethodName:
+  Enabled: True
+
+Style/MultilineTernaryOperator:
+  Enabled: True
+
+Style/NestedTernaryOperator:
+  Enabled: True
+
+Style/NilComparison:
+  Enabled: True
+
+Style/FormatString:
+  Enabled: True
+
+Style/MultilineBlockChain:
+  Enabled: True
+
+Style/Semicolon:
+  Enabled: True
+
+Style/SignalException:
+  Enabled: True
+
+Style/NonNilCheck:
+  Enabled: True
+
+Style/Not:
+  Enabled: True
+
+Style/NumericLiterals:
+  Enabled: True
+
+Style/OneLineConditional:
+  Enabled: True
+
+Style/OpMethod:
+  Enabled: True
+
+Style/ParenthesesAroundCondition:
+  Enabled: True
+
+Style/PercentLiteralDelimiters:
+  Enabled: True
+
+Style/PerlBackrefs:
+  Enabled: True
+
+Style/PredicateName:
+  Enabled: True
+
+Style/RedundantException:
+  Enabled: True
+
+Style/SelfAssignment:
+  Enabled: True
+
+Style/Proc:
+  Enabled: True
+
+Style/RaiseArgs:
+  Enabled: True
+
+Style/RedundantBegin:
+  Enabled: True
+
+Style/RescueModifier:
+  Enabled: True
+
+# based on https://github.com/voxpupuli/modulesync_config/issues/168
+Style/RegexpLiteral:
+  EnforcedStyle: percent_r
+  Enabled: True
+
+Lint/UnderscorePrefixedVariableName:
+  Enabled: True
+
+Metrics/ParameterLists:
+  Enabled: False
+
+Lint/RequireParentheses:
+  Enabled: True
+
+Style/SpaceBeforeFirstArg:
+  Enabled: True
+
+Style/ModuleFunction:
+  Enabled: True
+
+Lint/Debugger:
+  Enabled: True
+
+Style/IfWithSemicolon:
+  Enabled: True
+
+Style/Encoding:
+  Enabled: True
+
+Style/BlockDelimiters:
+  Enabled: True
+
+Style/MultilineBlockLayout:
+  Enabled: True
+
+# 'Complexity' is very relative
+Metrics/AbcSize:
+  Enabled: False
+
+# 'Complexity' is very relative
+Metrics/PerceivedComplexity:
+  Enabled: False
+
+Lint/UselessAssignment:
+  Enabled: True
+
+Style/ClosingParenthesisIndentation:
+  Enabled: False
+
+# RSpec
+
+# We don't use rspec in this way
+RSpec/DescribeClass:
+  Enabled: False
+
+# Example length is not necessarily an indicator of code quality
+RSpec/ExampleLength:
+  Enabled: False
+
+RSpec/NamedSubject:
+  Enabled: False
--- a/.sync.yml
+++ b/.sync.yml
@@ -0,0 +1,5 @@
+---
+appveyor.yml:
+  delete: true
+spec/spec_helper.rb:
+  allow_deprecations: true
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,33 +3,30 @@
 sudo: false
 language: ruby
 cache: bundler
-script: "bundle exec rake validate lint spec"
+script: "bundle exec rake release_checks"
+#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
+before_install:
+  - gem update bundler
 matrix:
  fast_finish: true
  include:
-  - rvm: 2.1.6
+  - rvm: 2.3.1
    dist: trusty
    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
    script: bundle exec rake beaker
    services: docker
    sudo: required
-  - rvm: 2.1.6
+  - rvm: 2.3.1
    dist: trusty
    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
    script: bundle exec rake beaker
    services: docker
    sudo: required
-  - rvm: 2.1.6
+  - rvm: 2.3.1
    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
-  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 4.0"
+  - rvm: 2.1.7
    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.5
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 3.0"
+    env: PUPPET_GEM_VERSION="~> 4.0"
 notifications:
  email: false
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## Supported Release 2.0.0
+### Summary
+
+This is a major release including some bug fixes, new parameters, and general module updates.
+
+**This release drops Puppet 3 support**
+
+#### Added
+- Debian Stretch, Yakkety Yak, Amazon Linux, Oracle Linux, Scientific Linux CERN compatibility
+- `version_major` and `version_minor` parameters for specifying Java SE version to install
+- `$JAVA_HOME` now set by the module on compatible systems. The `java_home` parameter is also provided for manual setting. [MODULES-2971](https://tickets.puppetlabs.com/browse/MODULES-2971)
+- `proxy_server` and `proxy_type` for choosing a proxy server to get Java from
+
+#### Changed
+- Moved lower Puppet version requirement to 4.7.0
+
+#### Fixed
+- Module no longer downloads the Java archive on Puppet runs if Java is already installed.
+- java_default_home fact is not always correct on oracle packages [MODULES-4050](https://tickets.puppetlabs.com/browse/MODULES-4050)
+- Order of operations for archives [MODULES-4751](https://tickets.puppetlabs.com/browse/https://tickets.puppetlabs.com/browse/MODULES-4751)
+- Increase Xmx setting for `java_version` fact [MODULES-4736](https://tickets.puppetlabs.com/browse/MODULES-4736)
+
 ## Supported Release 1.6.0
 ### Summary

@@ -125,7 +147,7 @@ Add support for new versions of Debian and Ubuntu!

 ## 2014-01-06 - Version 1.1.0

-####Summary:
+### Summary:

 Primarily a release for Ubuntu users!

@@ -134,7 +156,7 @@ Primarily a release for Ubuntu users!
 - Add `java_home` parameter for centralized setting of JAVA_HOME.
 - Add Scientific Linux

-###Bugfixes:
+#### Bugfixes:
 - Plus signs are valid in debian/ubuntu package names.

 ## 2013-08-01 - Version 1.0.1
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,7 +43,7 @@ Checklist (and a short version for the impatient)

      - Make sure you have a [GitHub account](https://github.com/join)

-      - [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
+      - [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for.

    * Preferred method:

@@ -208,13 +208,10 @@ review.
 Additional Resources
 ====================

-* [Getting additional help](http://puppetlabs.com/community/get-help)
+* [Getting additional help](http://puppet.com/community/get-help)

-* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
-
-* [Patchwork](https://patchwork.puppetlabs.com)
+* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing)

 * [General GitHub documentation](http://help.github.com/)

 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-
--- a/76
+++ b/76
@@ -2,38 +2,74 @@

 source ENV['GEM_SOURCE'] || "https://rubygems.org"

-def location_for(place, version = nil)
-  if place =~ /^(git[:@][^#]*)#(.*)/
-    [version, { :git => $1, :branch => $2, :require => false}].compact
-  elsif place =~ /^file:\/\/(.*)/
+# Determines what type of gem is requested based on place_or_version.
+def gem_type(place_or_version)
+  if place_or_version =~ /^git:/
+    :git
+  elsif place_or_version =~ /^file:/
+    :file
+  else
+    :gem
+  end
+end
+
+# Find a location or specific version for a gem. place_or_version can be a
+# version, which is most often used. It can also be git, which is specified as
+# `git://somewhere.git#branch`. You can also use a file source location, which
+# is specified as `file://some/location/on/disk`.
+def location_for(place_or_version, fake_version = nil)
+  if place_or_version =~ /^(git[:@][^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place_or_version =~ /^file:\/\/(.*)/
    ['>= 0', { :path => File.expand_path($1), :require => false }]
  else
-    [place, version, { :require => false}].compact
+    [place_or_version, { :require => false }]
  end
 end

-group :development, :unit_tests do
-  gem 'json',                      :require => false
-  gem 'metadata-json-lint',        :require => false
-  gem 'puppet_facts',              :require => false
-  gem 'puppet-blacksmith',         :require => false
-  gem 'puppetlabs_spec_helper',    :require => false
-  gem 'rspec-puppet', '>= 2.3.2',  :require => false
-  gem 'simplecov',                 :require => false
+# Used for gem conditionals
+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
+  gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby"
+  gem "puppet-module-win-default-r#{minor_version}",   :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "puppet-module-posix-dev-r#{minor_version}",     :require => false, :platforms => "ruby"
+  gem "puppet-module-win-dev-r#{minor_version}",       :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  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')
 end
+
 group :system_tests do
-  gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
-  gem 'beaker',                        *location_for(ENV['BEAKER_VERSION'])
-  gem 'serverspec',                    :require => false
-  gem 'beaker-puppet_install_helper',  :require => false
-  gem 'master_manipulator',            :require => false
-  gem 'beaker-hostgenerator',          *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
+  gem "puppet-module-posix-system-r#{minor_version}",                            :require => false, :platforms => "ruby"
+  gem "puppet-module-win-system-r#{minor_version}",                              :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')                  
+  gem "beaker-pe",                                                               :require => false
+  gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])                
+  gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
+  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
 end

-gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

+# Only explicitly specify Facter/Hiera if a version has been specified.
+# Otherwise it can lead to strange bundler behavior. If you are seeing weird
+# gem resolution behavior, try setting `DEBUG_RESOLVER` environment variable
+# to `1` and then run bundle install.
+gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
+gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']

+
+# Evaluate Gemfile.local if it exists
 if File.exists? "#{__FILE__}.local"
  eval(File.read("#{__FILE__}.local"), binding)
 end
+
+# Evaluate ~/.gemfile if it exists
+if File.exists?(File.join(Dir.home, '.gemfile'))
+  eval(File.read(File.join(Dir.home, '.gemfile')), binding)
+end
+
+# vim:ft=ruby
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -0,0 +1,6 @@
+## Maintenance
+
+Maintainers:
+  - Puppet Forge Modules Team `forge-modules |at| puppet |dot| com`
+
+Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `java`.
--- a/7
+++ b/7
@@ -1,9 +1,6 @@
-java puppet module
-
-Copyright (C) 2011-2016 Puppet Labs, Inc.
-
-Puppet Labs can be contacted at: info@puppetlabs.com
+Puppet Module - puppetlabs-java

+Copyright 2017 Puppet, Inc.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
--- a/README.markdown
+++ b/README.markdown
@@ -58,6 +58,17 @@ java::oracle { 'jdk8' :
 }
 ~~~

+To install a specific release of a Java version, e.g. 8u101-b13, provide both parameters `version_major` and `version_minor` as follows:
+
+~~~
+java::oracle { 'jdk8' :
+  ensure  => 'present',
+  version_major => '8u101',
+  version_minor => 'b13',
+  java_se => 'jdk',
+}
+~~~
+
 ## Reference

 ### Classes
@@ -104,9 +115,15 @@ Valid options: 'present', 'installed', 'latest', or a string matching `/^[.+_0-9

 The following parameters are available in `java::oracle`:

-######`version`
+##### `version`
 Version of Java Standard Edition (SE) to install. 6, 7 or 8.

+##### `version_major`
+Major version of the Java Standard Edition (SE) to install. Must be used together with `version_minor`. For example, '8u101'.
+
+##### `version_minor`
+Minor version (or build version) of the Java Standard Edition (SE) to install. Must be used together with `version_major`. For example, 'b13'.
+
 ##### `java_se`
 Type of Java SE to install, jdk or jre.

@@ -116,6 +133,12 @@ Install or remove the package.
 ##### `oracle_url`
 Official Oracle URL to download the binaries from.

+##### `proxy_server`
+Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
+
+##### `proxy_type`
+Proxy server type (none|http|https|ftp). (passed to archive)
+
 ### Facts

 The java module includes a few facts to describe the version of Java installed on the system:
@@ -147,7 +170,7 @@ OpenJDK is supported on:
 * Debian 6, 7
 * Ubuntu 10.04, 12.04, 14.04
 * Solaris 11
-* SLES 11 SP1, 12 
+* SLES 11 SP1, SP2, SP3, SP4; SLES 12, SP1, SP2
 * OpenBSD 5.6, 5.7

 Sun Java is supported on:  
@@ -157,14 +180,18 @@ Sun Java is supported on:
 Oracle Java is supported on:
 * CentOS 6

-### A note about OpenBSD
+### Known issues
+
+#### OpenBSD
+
 OpenBSD packages install Java JRE/JDK in a unique directory structure, not linking
 the binaries to a standard directory. Because of that, the path to this location
-is hardcoded in the java_version fact. Whenever a Java upgrade to a newer
-version/path will be done on OpenBSD, it has to be adapted there.
+is hardcoded in the `java_version` fact. Whenever you upgrade Java to a newer
+version, you have to update the path in this fact.

-### A note about FreeBSD
-By default on FreeBSD Puppet < 4.0, you will see an error as `pkgng` is not the default provider. To fix this, you can install the [zleslie/pkgng module](https://forge.puppetlabs.com/zleslie/pkgng) and set it as the default package provider like so:
+#### FreeBSD
+
+By default on FreeBSD, Puppet versions prior to 4.0 throw an error saying `pkgng` is not the default provider. To fix this, install the [zleslie/pkgng module](https://forge.puppetlabs.com/zleslie/pkgng) and set it as the default package provider:

 ```puppet
 Package {
@@ -172,12 +199,12 @@ Package {
 }
 ```

-On Puppet > 4.0 (ie. using the sysutils/puppet4 port), `pkgng` is included within Puppet and it's the default package provider.
+On Puppet 4.0 and later, `pkgng` is included within Puppet and is the default package provider.

 ## Development

-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve. We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things. For more information, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html)
+Puppet modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. To contribute to Puppet projects, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html)

 ## Contributors

-The list of contributors can be found at: [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors).
+The list of contributors can be found at [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors).
--- a/9
+++ b/9
@@ -1,14 +1,9 @@
-require 'puppet_blacksmith/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet-lint/tasks/puppet-lint'
+require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?

 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]

 desc 'Generate pooler nodesets'
 task :gen_nodeset do
--- a/examples/alternative.pp
+++ b/examples/alternative.pp
--- a/examples/init.pp
+++ b/examples/init.pp
--- a/examples/oracle.pp
+++ b/examples/oracle.pp
--- a/lib/facter/java_default_home.rb
+++ b/lib/facter/java_default_home.rb
@@ -15,7 +15,11 @@ Facter.add(:java_default_home) do
  setcode do
    if Facter::Util::Resolution.which('readlink')
      java_bin = Facter::Util::Resolution.exec('readlink -e /usr/bin/java').strip
+      if java_bin =~ %r(/jre/)
        java_default_home = File.dirname(File.dirname(File.dirname(java_bin)))
+      else
+        java_default_home = File.dirname(File.dirname(java_bin))
+      end
    end
  end
 end
--- a/lib/facter/java_version.rb
+++ b/lib/facter/java_version.rb
@@ -23,7 +23,7 @@ Facter.add(:java_version) do
  setcode do
    unless [ 'openbsd', 'darwin' ].include? Facter.value(:operatingsystem).downcase
      if Facter::Util::Resolution.which('java')
-        Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip
+        Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.first.split(/"/)[1].strip
      end
    end
  end
@@ -35,7 +35,7 @@ Facter.add(:java_version) do
  setcode do
    Facter::Util::Resolution.with_env("PATH" => '/usr/local/jdk-1.7.0/jre/bin:/usr/local/jre-1.7.0/bin') do
      if Facter::Util::Resolution.which('java')
-        Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip
+        Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.first.split(/"/)[1].strip
      end
    end
  end
@@ -46,7 +46,7 @@ Facter.add(:java_version) do
  has_weight 100
  setcode do
    unless /Unable to find any JVMs matching version/ =~ Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1')
-      Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip
+      Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.first.split(/"/)[1].strip
    end
  end
 end
--- a/locales/config.yaml
+++ b/locales/config.yaml
@@ -0,0 +1,25 @@
+---
+# This is the project-specific configuration file for setting up
+# fast_gettext for your project.
+gettext:
+  # This is used for the name of the .pot and .po files; they will be
+  # called <project_name>.pot?
+  project_name: puppetlabs-java
+  # This is used in comments in the .pot and .po files to indicate what
+  # project the files belong to and should bea little more desctiptive than
+  # <project_name>
+  package_name: puppetlabs-java
+  # The locale that the default messages in the .pot file are in
+  default_locale: en
+  # The email used for sending bug reports.
+  bugs_address: docs@puppet.com
+  # The holder of the copyright.
+  copyright_holder: Puppet, Inc.
+  # This determines which comments in code should be eligible for translation.
+  # Any comments that start with this string will be externalized. (Leave
+  # empty to include all.)
+  comments_tag: TRANSLATOR
+  # Patterns for +Dir.glob+ used to find all files that might contain
+  # translatable content, relative to the project root directory
+  source_files:
+  
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -9,6 +9,13 @@ class java::config ( ) {
          unless  => "test /etc/alternatives/java -ef '${java::use_java_alternative_path}'",
        }
      }
+      if $java::use_java_home != undef {
+        file_line { 'java-home-environment':
+          path  => '/etc/environment',
+          line  => "JAVA_HOME=${$java::use_java_home}",
+          match => 'JAVA_HOME=',
+        }
+      }
    }
    'RedHat': {
      if $java::use_java_alternative != undef and $java::use_java_alternative_path != undef {
@@ -29,6 +36,31 @@ class java::config ( ) {
          unless  => "test /etc/alternatives/java -ef '${java::use_java_alternative_path}'",
        }
      }
+      if $java::use_java_home != undef {
+        file_line { 'java-home-environment':
+          path  => '/etc/environment',
+          line  => "JAVA_HOME=${$java::use_java_home}",
+          match => 'JAVA_HOME=',
+        }
+      }
+    }
+    'OpenBSD', 'FreeBSD', 'Suse': {
+      if $java::use_java_home != undef {
+        file_line { 'java-home-environment':
+          path  => '/etc/environment',
+          line  => "JAVA_HOME=${$java::use_java_home}",
+          match => 'JAVA_HOME=',
+        }
+      }
+    }
+    'Solaris': {
+      if $java::use_java_home != undef {
+        file_line { 'java-home-environment':
+          path  => '/etc/profile',
+          line  => "JAVA_HOME=${$java::use_java_home}",
+          match => 'JAVA_HOME=',
+        }
+      }
    }
    default: {
      # Do nothing.
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -35,6 +35,10 @@
 #    alternative is actually enabled, this is required to ensure the
 #    correct JVM is enabled.
 #
+#  [*java_home*]
+#   The path to where the JRE is installed. This will be set as an
+#   environment variable.
+#
 # Actions:
 #
 # Requires:
@@ -47,7 +51,8 @@ class java(
  $package               = undef,
  $package_options       = undef,
  $java_alternative      = undef,
-  $java_alternative_path = undef
+  $java_alternative_path = undef,
+  $java_home             = undef
 ) {
  include java::params

@@ -61,7 +66,7 @@ class java(
    $default_package_name     = $java::params::java[$distribution]['package']
    $default_alternative      = $java::params::java[$distribution]['alternative']
    $default_alternative_path = $java::params::java[$distribution]['alternative_path']
-    $java_home                = $java::params::java[$distribution]['java_home']
+    $default_java_home        = $java::params::java[$distribution]['java_home']
  } else {
    fail("Java distribution ${distribution} is not supported.")
  }
@@ -91,6 +96,14 @@ class java(
    default => $java_alternative_path,
  }

+  $use_java_home = $java_home ? {
+    undef   => $use_java_package_name ? {
+      $default_package_name => $default_java_home,
+      default               => undef,
+    },
+    default => $java_home,
+  }
+
  $jre_flag = $use_java_package_name ? {
    /headless/ => '--jre-headless',
    default    => '--jre'
@@ -105,14 +118,12 @@ class java(
  }

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

 }
--- a/manifests/oracle.pp
+++ b/manifests/oracle.pp
@@ -14,7 +14,16 @@
 #
 # Parameters
 # [*version*]
-# Version of Java to install
+# Version of Java to install, e.g. '7' or '8'. Default values for major and minor
+# versions will be used.
+#
+# [*version_major*]
+# Major version which should be installed, e.g. '8u101'. Must be used together with
+# version_minor.
+#
+# [*version_minor*]
+# Minor version which should be installed, e.g. 'b12'. Must be used together with
+# version_major.
 #
 # [*java_se*]
 # Type of Java Standard Edition to install, jdk or jre.
@@ -25,6 +34,12 @@
 # [*oracle_url*]
 # Official Oracle URL to download binaries from.
 #
+# [*proxy_server*]
+# Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
+#
+# [*proxy_type*]
+# Proxy server type (none|http|https|ftp). (passed to archive)
+#
 # Variables
 # [*release_major*]
 # Major version release number for java_se. Used to construct download URL.
@@ -73,8 +88,12 @@
 define java::oracle (
  $ensure        = 'present',
  $version       = '8',
+  $version_major = undef,
+  $version_minor = undef,
  $java_se       = 'jdk',
  $oracle_url    = 'http://download.oracle.com/otn-pub/java/jdk/',
+  $proxy_server  = undef,
+  $proxy_type    = undef,
 ) {

  # archive module is used to download the java package
@@ -87,7 +106,17 @@ define java::oracle (
    fail('Java SE must be either jre or jdk.')
  }

-  # determine oracle Java major and minor version, and installation path
+  # determine Oracle Java major and minor version, and installation path
+  if $version_major and $version_minor {
+    $release_major = $version_major
+    $release_minor = $version_minor
+    if $release_major =~ /(\d+)u(\d+)/ {
+      $install_path = "${java_se}1.${1}.0_${2}"
+    } else {
+      $install_path = "${java_se}${release_major}${release_minor}"
+    }
+  } else {
+    # use default versions if no specific major and minor version parameters are provided
    case $version {
      '6' : {
        $release_major = '6u45'
@@ -110,12 +139,13 @@ define java::oracle (
        $install_path = "${java_se}1.8.0_51"
      }
    }
+  }

  # determine package type (exe/tar/rpm), destination directory based on OS
-  case $::kernel {
+  case $facts['kernel'] {
    'Linux' : {
-      case $::operatingsystem {
-        'CentOS', 'RedHat' : {
+      case $facts['os']['family'] {
+        'RedHat', 'Amazon' : {
          # Oracle Java 6 comes in a special rpmbin format
          if $version == '6' {
            $package_type = 'rpmbin'
@@ -124,7 +154,7 @@ define java::oracle (
          }
        }
        default : {
-          fail ("unsupported platform ${::operatingsystem}") }
+          fail ("unsupported platform ${$facts['os']['name']}") }
      }

      $os = 'linux'
@@ -132,15 +162,15 @@ define java::oracle (
      $creates_path = "/usr/java/${install_path}"
    }
    default : {
-      fail ( "unsupported platform ${::kernel}" ) }
+      fail ( "unsupported platform ${$facts['kernel']}" ) }
  }

  # set java architecture nomenclature
-  case $::architecture {
+  case $facts['os']['architecture'] {
    'i386' : { $arch = 'i586' }
    'x86_64' : { $arch = 'x64' }
    default : {
-      fail ("unsupported platform ${::architecture}")
+      fail ("unsupported platform ${$facts['os']['architecture']}")
    }
  }

@@ -190,20 +220,24 @@ define java::oracle (
      archive { $destination :
        ensure       => present,
        source       => "${oracle_url}${release_major}-${release_minor}/${package_name}",
-        cleanup      => false,
-        extract_path => '/tmp',
        cookie       => 'gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie',
-      }->
-      case $::kernel {
+        extract_path => '/tmp',
+        cleanup      => false,
+        creates      => $creates_path,
+        proxy_server => $proxy_server,
+        proxy_type   => $proxy_type,
+      }
+      case $facts['kernel'] {
        'Linux' : {
          exec { "Install Oracle java_se ${java_se} ${version}" :
            path    => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
            command => $install_command,
            creates => $creates_path,
+            require => Archive[$destination]
          }
        }
        default : {
-          fail ("unsupported platform ${::kernel}")
+          fail ("unsupported platform ${$facts['kernel']}")
        }
      }
    }
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -15,46 +15,63 @@ class java::params {
  case $::osfamily {
    'RedHat': {
      case $::operatingsystem {
-        'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL': {
+        'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC': {
          if (versioncmp($::operatingsystemrelease, '5.0') < 0) {
            $jdk_package = 'java-1.6.0-sun-devel'
            $jre_package = 'java-1.6.0-sun'
+            $java_home   = '/usr/lib/jvm/java-1.6.0-sun/jre/'
          }
          elsif (versioncmp($::operatingsystemrelease, '6.3') < 0) {
            $jdk_package = 'java-1.6.0-openjdk-devel'
            $jre_package = 'java-1.6.0-openjdk'
+            $java_home   = "/usr/lib/jvm/java-1.6.0-openjdk-${::architecture}/"
          }
          elsif (versioncmp($::operatingsystemrelease, '7.1') < 0) {
            $jdk_package = 'java-1.7.0-openjdk-devel'
            $jre_package = 'java-1.7.0-openjdk'
+            $java_home   = "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/"
          }
          else {
            $jdk_package = 'java-1.8.0-openjdk-devel'
            $jre_package = 'java-1.8.0-openjdk'
+            $java_home   = "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/"
          }
        }
        'Fedora': {
          if (versioncmp($::operatingsystemrelease, '21') < 0) {
            $jdk_package = 'java-1.7.0-openjdk-devel'
            $jre_package = 'java-1.7.0-openjdk'
+            $java_home   = "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/"
          }
          else {
            $jdk_package = 'java-1.8.0-openjdk-devel'
            $jre_package = 'java-1.8.0-openjdk'
+            $java_home   = "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/"
          }
        }
        'Amazon': {
          $jdk_package = 'java-1.7.0-openjdk-devel'
          $jre_package = 'java-1.7.0-openjdk'
+          $java_home   = "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/"
        }
        default: { fail("unsupported os ${::operatingsystem}") }
      }
      $java = {
-        'jdk' => { 'package' => $jdk_package, },
-        'jre' => { 'package' => $jre_package, },
+        'jdk' => {
+          'package'   => $jdk_package,
+          'java_home' => $java_home,
+        },
+        'jre' => {
+          'package'   => $jre_package,
+          'java_home' => $java_home,
+        },
      }
    }
    'Debian': {
+      $oracle_architecture = $::architecture ? {
+        'amd64' => 'x64',
+        default => $::architecture
+      }
      case $::lsbdistcodename {
        'lenny', 'squeeze', 'lucid', 'natty': {
          $java  = {
@@ -122,9 +139,21 @@ class java::params {
              'alternative_path' => '/usr/lib/jvm/j2sdk1.8-oracle/bin/java',
              'java_home'        => '/usr/lib/jvm/j2sdk1.8-oracle/',
            },
+            'oracle-java8-jre' => {
+              'package'          => 'oracle-java8-jre',
+              'alternative'      => "jre-8-oracle-${oracle_architecture}",
+              'alternative_path' => "/usr/lib/jvm/jre-8-oracle-${oracle_architecture}/bin/java",
+              'java_home'        => "/usr/lib/jvm/jre-8-oracle-${oracle_architecture}/",
+            },
+            'oracle-java8-jdk' => {
+              'package'          => 'oracle-java8-jdk',
+              'alternative'      => "jdk-8-oracle-${oracle_architecture}",
+              'alternative_path' => "/usr/lib/jvm/jdk-8-oracle-${oracle_architecture}/bin/java",
+              'java_home'        => "/usr/lib/jvm/jdk-8-oracle-${oracle_architecture}/",
+            },
          }
        }
-        'vivid', 'wily', 'xenial': {
+        'stretch', 'vivid', 'wily', 'xenial', 'yakkety': {
          $java =  {
            'jdk' => {
              'package'          => 'openjdk-8-jdk',
@@ -145,48 +174,81 @@ class java::params {
    }
    'OpenBSD': {
      $java = {
-        'jdk' => { 'package' => 'jdk', },
-        'jre' => { 'package' => 'jre', },
+        'jdk' => {
+          'package'   => 'jdk',
+          'java_home' => '/usr/local/jdk/',
+        },
+        'jre' => {
+          'package'   => 'jre',
+          'java_home' => '/usr/local/jdk/',
+        },
      }
    }
    'FreeBSD': {
      $java = {
-        'jdk' => { 'package' => 'openjdk', },
-        'jre' => { 'package' => 'openjdk-jre', },
+        'jdk' => {
+          'package'   => 'openjdk',
+          'java_home' => '/usr/local/openjdk7/',
+        },
+        'jre' => {
+          'package'   => 'openjdk-jre',
+          'java_home' => '/usr/local/openjdk7/',
+        },
      }
    }
    'Solaris': {
      $java = {
-        'jdk' => { 'package' => 'developer/java/jdk-7', },
-        'jre' => { 'package' => 'runtime/java/jre-7', },
+        'jdk' => {
+          'package'   => 'developer/java/jdk-7',
+          'java_home' => '/usr/jdk/instances/jdk1.7.0/',
+        },
+        'jre' => {
+          'package'   => 'runtime/java/jre-7',
+          'java_home' => '/usr/jdk/instances/jdk1.7.0/',
+        },
      }
    }
    'Suse': {
      case $::operatingsystem {
        'SLES': {
-          if (versioncmp($::operatingsystemrelease, '12') >= 0) {
+          if (versioncmp($::operatingsystemrelease, '12.1') >= 0) {
+            $jdk_package = 'java-1_8_0-openjdk-devel'
+            $jre_package = 'java-1_8_0-openjdk'
+            $java_home   = '/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/'
+          } elsif (versioncmp($::operatingsystemrelease, '12') >= 0) {
            $jdk_package = 'java-1_7_0-openjdk-devel'
            $jre_package = 'java-1_7_0-openjdk'
+            $java_home   = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/'
          } elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) {
-            $jdk_package = 'java-1_7_0-ibm-devel'
-            $jre_package = 'java-1_7_0-ibm'
+            $jdk_package = 'java-1_7_1-ibm-devel'
+            $jre_package = 'java-1_7_1-ibm'
+            $java_home   = '/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/'
          } else {
            $jdk_package = 'java-1_6_0-ibm-devel'
            $jre_package = 'java-1_6_0-ibm'
+            $java_home   = '/usr/lib64/jvm/java-1.6.0-ibm-1.6.0/'
          }
        }
        'OpenSuSE': {
          $jdk_package = 'java-1_7_0-openjdk-devel'
          $jre_package = 'java-1_7_0-openjdk'
+          $java_home   = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/'
        }
        default: {
          $jdk_package = 'java-1_6_0-ibm-devel'
          $jre_package = 'java-1_6_0-ibm'
+          $java_home   = '/usr/lib64/jvm/java-1.6.0-ibd-1.6.0/'
        }
      }
      $java = {
-        'jdk' => { 'package' => $jdk_package, },
-        'jre' => { 'package' => $jre_package, },
+        'jdk' => {
+          'package'   => $jdk_package,
+          'java_home' => $java_home,
+        },
+        'jre' => {
+          'package'   => $jre_package,
+          'java_home' => $java_home,
+        },
      }
    }
    default: { fail("unsupported platform ${::osfamily}") }
--- a/metadata.json
+++ b/metadata.json
@@ -1,12 +1,12 @@
 {
  "name": "puppetlabs-java",
-  "version": "1.6.0",
+  "version": "2.0.0",
  "author": "puppetlabs",
  "summary": "Installs the correct Java package on various platforms.",
  "license": "Apache-2.0",
  "source": "git://github.com/puppetlabs/puppetlabs-java",
  "project_page": "https://github.com/puppetlabs/puppetlabs-java",
-  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "issues_url": "https://tickets.puppet.com/CreateIssueDetails!init.jspa?pid=10707&issuetype=1&team=Modules&customfield_14200=14302&labels=triage&customfield_10005=2147&summary=Issue+found+with+module%3A+puppetlabs-java",
  "operatingsystem_support": [
    {
      "operatingsystem": "RedHat",
@@ -67,7 +67,12 @@
      "operatingsystem": "SLES",
      "operatingsystemrelease": [
        "11 SP1",
-        "12"
+        "11 SP2",
+        "11 SP3",
+        "11 SP4",
+        "12",
+        "12 SP1",
+        "12 SP2"
      ]
    },
    {
@@ -78,16 +83,13 @@
    }
  ],
  "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": ">= 3.0.0 < 2015.4.0"
-    },
    {
      "name": "puppet",
-      "version_requirement": ">= 3.0.0 < 5.0.0"
+      "version_requirement": ">= 4.7.0 < 5.0.0"
    }
  ],
  "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"}
+    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
+    {"name":"puppet/archive","version_requirement":">= 1.1.0 < 2.0.0"}
  ]
 }
--- a/spec/acceptance/install_spec.rb
+++ b/spec/acceptance/install_spec.rb
@@ -136,6 +136,8 @@ end

 describe 'failure cases' do
  # C14711
+  # SLES 10 returns an exit code of 0 on zypper failure
+  unless fact('operatingsystem') == 'SLES' and fact('operatingsystemrelease') < '11'
    it 'should fail to install java with an incorrect version' do
      pp = <<-EOS
      class { 'java':
@@ -145,6 +147,7 @@ describe 'failure cases' do

    apply_manifest(pp, :expect_failures => true)
    end
+  end

  # C14712
  it 'should fail to install java with a blank version' do
--- a/spec/acceptance/nodesets/centos-7-x64.yml
+++ b/spec/acceptance/nodesets/centos-7-x64.yml
@@ -3,7 +3,7 @@ HOSTS:
    roles:
      - agent
      - default
-    platform: redhat-7-x86_64
+    platform: el-7-x86_64
    hypervisor: vagrant
    box: puppetlabs/centos-7.2-64-nocm
 CONFIG:
--- a/spec/classes/java_spec.rb
+++ b/spec/classes/java_spec.rb
@@ -3,28 +3,31 @@ require 'spec_helper'
 describe 'java', :type => :class do

  context 'select openjdk for Centos 5.8' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.8'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.8', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk-x86_64/') }
  end

  context 'select openjdk for Centos 6.3' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
  end

  context 'select openjdk for Centos 7.1.1503' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '7.1.1503'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '7.1.1503', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk-devel') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-x86_64/') }
  end

  context 'select openjdk for Centos 6.2' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.2'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.2', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
    it { is_expected.to_not contain_exec('update-java-alternatives') }
  end

  context 'select Oracle JRE with alternatives for Centos 6.3' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3', :architecture => 'x86_64'} }
    let(:params) { { 'package' => 'jre', 'java_alternative' => '/usr/bin/java', 'java_alternative_path' => '/usr/java/jre1.7.0_67/bin/java'} }
    it { is_expected.to contain_package('java').with_name('jre') }
    it { is_expected.to contain_exec('create-java-alternatives').with_command('alternatives --install /usr/bin/java java /usr/java/jre1.7.0_67/bin/java 20000') }
@@ -32,43 +35,47 @@ describe 'java', :type => :class do
  end

  context 'select openjdk for Fedora 20' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
  end

  context 'select openjdk for Fedora 21' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk-devel') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-x86_64/') }
  end

  context 'select passed value for Fedora 20' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20'} }
-    let(:params) { { 'distribution' => 'jre' } }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20', :architecture => 'x86_64'} }
+    let(:params) { { 'distribution' => 'jre', 'java_home' => '/usr/local/lib/jre/' } }
    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/local/lib/jre/') }
  end

  context 'select passed value for Fedora 21' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} }
-    let(:params) { { 'distribution' => 'jre' } }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21', :architecture => 'x86_64'} }
+    let(:params) { { 'distribution' => 'jre', 'java_home' => '/usr/local/lib/jre/' } }
    it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/local/lib/jre/') }
  end
  
  context 'select passed value for Fedora 21 with yum option' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21', :architecture => 'x86_64'} }
    let(:params) { { 'distribution' => 'jre' } }
    let(:params) { { 'package_options'  => ['--skip-broken'] } }
    it { is_expected.to contain_package('java') }
  end

  context 'select passed value for Centos 5.3' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} }
-    let(:params) { { 'package' => 'jdk' } }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3', :architecture => 'x86_64'} }
+    let(:params) { { 'package' => 'jdk', 'java_home' => '/usr/local/lib/jre' } }
    it { is_expected.to contain_package('java').with_name('jdk') }
    it { is_expected.to_not contain_exec('update-java-alternatives') }
  end

  context 'select default for Centos 5.3' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
    it { is_expected.to_not contain_exec('update-java-alternatives') }
  end
@@ -77,6 +84,7 @@ describe 'java', :type => :class do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
    it { is_expected.to contain_package('java').with_name('openjdk-7-jdk') }
    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') }
  end

  context 'select Oracle JRE for Debian Wheezy' do
@@ -84,13 +92,30 @@ describe 'java', :type => :class do
    let(:params) { { 'distribution' => 'oracle-jre' } }
    it { is_expected.to contain_package('java').with_name('oracle-j2re1.7') }
    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set j2re1.7-oracle --jre') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/j2re1.7-oracle/') }
  end

+  context 'select Oracle Java 8 JRE >=u100 for Debian Wheezy' do
+    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
+    let(:params) { { 'distribution' => 'oracle-java8-jre' } }
+    it { is_expected.to contain_package('java').with_name('oracle-java8-jre') }
+    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set jre-8-oracle-x64 --jre') }
+  end
+
+  context 'select Oracle Java 8 JDK >=u100 for Debian Wheezy' do
+    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
+    let(:params) { { 'distribution' => 'oracle-java8-jdk' } }
+    it { is_expected.to contain_package('java').with_name('oracle-java8-jdk') }
+    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set jdk-8-oracle-x64 --jre') }
+  end
+
+
  context 'select OpenJDK JRE for Debian Wheezy' do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
    let(:params) { { 'distribution' => 'jre' } }
    it { is_expected.to contain_package('java').with_name('openjdk-7-jre-headless') }
    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre-headless') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') }
  end

  context 'select default for Debian Squeeze' do
@@ -104,6 +129,7 @@ describe 'java', :type => :class do
    let(:params) { { 'distribution' => 'sun-jre', } }
    it { is_expected.to contain_package('java').with_name('sun-java6-jre') }
    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-sun --jre') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-6-sun/jre/') }
  end

  context 'select OpenJDK JRE for Debian Squeeze' do
@@ -111,6 +137,7 @@ describe 'java', :type => :class do
    let(:params) { { 'distribution' => 'jre', } }
    it { is_expected.to contain_package('java').with_name('openjdk-6-jre-headless') }
    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk-amd64 --jre-headless') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-6-openjdk/jre/') }
  end

  context 'select random alternative for Debian Wheezy' do
@@ -124,74 +151,96 @@ describe 'java', :type => :class do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Ubuntu', :lsbdistcodename => 'vivid', :operatingsystemrelease => '15.04', :architecture => 'amd64',} }
    let(:params) { { 'distribution' => 'jdk' } }
    it { is_expected.to contain_package('java').with_name('openjdk-8-jdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/') }
  end

  context 'select jre for Ubuntu Vivid (15.04)' do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Ubuntu', :lsbdistcodename => 'vivid', :operatingsystemrelease => '15.04', :architecture => 'amd64',} }
    let(:params) { { 'distribution' => 'jre' } }
    it { is_expected.to contain_package('java').with_name('openjdk-8-jre-headless') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/') }
  end

  context 'select openjdk for Amazon Linux' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
  end

  context 'select passed value for Amazon Linux' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '5.3.4.43-43.43.amzn1.x86_64'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '5.3.4.43-43.43.amzn1.x86_64', :architecture => 'x86_64'} }
    let(:params) { { 'distribution' => 'jre' } }
    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
  end

  context 'select openjdk for Oracle Linux' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.4'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.4', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
  end

  context 'select openjdk for Oracle Linux 6.2' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.2'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.2', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
  end

  context 'select passed value for Oracle Linux' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.3'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.3', :architecture => 'x86_64'} }
    let(:params) { { 'distribution' => 'jre' } }
    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
  end

  context 'select passed value for Scientific Linux' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Scientific', :operatingsystemrelease => '6.4'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Scientific', :operatingsystemrelease => '6.4', :architecture => 'x86_64'} }
    let(:params) { { 'distribution' => 'jre' } }
    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
+  end
+
+  context 'select passed value for Scientific Linux CERN (SLC)' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'SLC', :operatingsystemrelease => '6.4', :architecture => 'x86_64'} }
+    let(:params) { { 'distribution' => 'jre' } }
+    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
  end

  context 'select default for OpenSUSE 12.3' do
-    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}}
+    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3', :architecture => 'x86_64'}}
    it { is_expected.to contain_package('java').with_name('java-1_7_0-openjdk-devel')}
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/') }
  end

  context 'select default for SLES 11.3' do
-    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.3'}}
+    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.3', :architecture => 'x86_64'}}
    it { should contain_package('java').with_name('java-1_6_0-ibm-devel')}
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.6.0-ibm-1.6.0/') }
  end

  context 'select default for SLES 11.4' do
-    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.4'}}
-    it { should contain_package('java').with_name('java-1_7_0-ibm-devel')}
+    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.4', :architecture => 'x86_64'}}
+    it { should contain_package('java').with_name('java-1_7_1-ibm-devel')}
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/') }
+  end
+
+  context 'select default for SLES 12.0' do
+    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '12.0', :operatingsystemmajrelease => '12', :architecture => 'x86_64'}}
+    it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')}
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/') }
  end

  context 'select default for SLES 12.1' do
-    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '12.1', :operatingsystemmajrelease => '12'}}
-    it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')}
+    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '12.1', :operatingsystemmajrelease => '12', :architecture => 'x86_64'}}
+    it { should contain_package('java').with_name('java-1_8_0-openjdk-devel')}
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/') }
  end

  context 'select jdk for OpenBSD' do
-    let(:facts) { {:osfamily => 'OpenBSD'} }
+    let(:facts) { {:osfamily => 'OpenBSD', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('jdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/local/jdk/') }
  end

  context 'select jre for OpenBSD' do
-    let(:facts) { {:osfamily => 'OpenBSD'} }
+    let(:facts) { {:osfamily => 'OpenBSD', :architecture => 'x86_64'} }
    let(:params) { { 'distribution' => 'jre' } }
    it { is_expected.to contain_package('java').with_name('jre') }
  end
--- a/spec/defines/oracle_spec.rb
+++ b/spec/defines/oracle_spec.rb
@@ -2,13 +2,14 @@ require 'spec_helper'

 describe 'java::oracle', :type => :define do
    context 'On CentOS 64-bit' do
-      let(:facts) { {:kernel => 'Linux', :architecture => 'x86_64', :osfamily => 'RedHat', :operatingsystem => 'CentOS', :operatingsystemrelease => '6.6', :puppetversion => '3.4.3 (Puppet Enterprise 3.2.3)'} }
+      let(:facts) { { :kernel => 'Linux', :os => {:family => 'RedHat', :architecture => 'x86_64', :name => 'CentOS', :release => {:full => '6.0'}}}}

      context 'Oracle Java SE 6 JDK' do
      let(:params) { {:ensure => 'present', :version => '6', :java_se => 'jdk'} }
      let :title do 'jdk6' end
        it { is_expected.to contain_archive('/tmp/jdk-6u45-linux-x64-rpm.bin')}
        it { is_expected.to contain_exec('Install Oracle java_se jdk 6').with_command('sh /tmp/jdk-6u45-linux-x64-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jdk*.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-x64-rpm.bin]') }
      end

      context 'Oracle Java SE 7 JDK' do
@@ -16,6 +17,7 @@ describe 'java::oracle', :type => :define do
        let :title do 'jdk7' end
          it { is_expected.to contain_archive('/tmp/jdk-7u80-linux-x64.rpm')}
          it { is_expected.to contain_exec('Install Oracle java_se jdk 7').with_command('rpm --force -iv /tmp/jdk-7u80-linux-x64.rpm') }
+          it { is_expected.to contain_exec('Install Oracle java_se jdk 7').that_requires('Archive[/tmp/jdk-7u80-linux-x64.rpm]') }
      end

    context 'Oracle Java SE 8 JDK' do
@@ -23,6 +25,7 @@ describe 'java::oracle', :type => :define do
      let :title do 'jdk8' end
        it { is_expected.to contain_archive('/tmp/jdk-8u51-linux-x64.rpm')}
        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u51-linux-x64.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u51-linux-x64.rpm]') }
    end

    context 'Oracle Java SE 6 JRE' do
@@ -30,6 +33,7 @@ describe 'java::oracle', :type => :define do
      let :title do 'jre6' end
        it { is_expected.to contain_archive('/tmp/jre-6u45-linux-x64-rpm.bin')}
        it { is_expected.to contain_exec('Install Oracle java_se jre 6').with_command('sh /tmp/jre-6u45-linux-x64-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jre*.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 6').that_requires('Archive[/tmp/jre-6u45-linux-x64-rpm.bin]') }
    end

    context 'Oracle Java SE 7 JRE' do
@@ -37,6 +41,7 @@ describe 'java::oracle', :type => :define do
      let :title do 'jre7' end
        it { is_expected.to contain_archive('/tmp/jre-7u80-linux-x64.rpm')}
        it { is_expected.to contain_exec('Install Oracle java_se jre 7').with_command('rpm --force -iv /tmp/jre-7u80-linux-x64.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 7').that_requires('Archive[/tmp/jre-7u80-linux-x64.rpm]') }
    end

    context 'select Oracle Java SE 8 JRE' do
@@ -44,18 +49,20 @@ describe 'java::oracle', :type => :define do
      let :title do 'jre8' end
        it { is_expected.to contain_archive('/tmp/jre-8u51-linux-x64.rpm')}
        it { is_expected.to contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u51-linux-x64.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u51-linux-x64.rpm]') }
    end

  end

  context 'On CentOS 32-bit' do
-    let(:facts) { {:kernel => 'Linux', :architecture => 'i386', :osfamily => 'RedHat', :operatingsystem => 'CentOS', :operatingsystemrelease => '6.6', :puppetversion => '3.4.3 (Puppet Enterprise 3.2.3)'} }
+    let(:facts) { {:kernel => 'Linux',  :os => { :family => 'RedHat', :architecture => 'i386', :name => 'CentOS', :release => { :full => '6.6' } } } }

    context 'select Oracle Java SE 6 JDK on RedHat family, 32-bit' do
      let(:params) { {:ensure => 'present', :version => '6', :java_se => 'jdk'} }
      let :title do 'jdk6' end
        it { is_expected.to contain_archive('/tmp/jdk-6u45-linux-i586-rpm.bin')}
        it { is_expected.to contain_exec('Install Oracle java_se jdk 6').with_command('sh /tmp/jdk-6u45-linux-i586-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jdk*.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-i586-rpm.bin]') }
    end

    context 'select Oracle Java SE 7 JDK on RedHat family, 32-bit' do
@@ -63,6 +70,7 @@ describe 'java::oracle', :type => :define do
      let :title do 'jdk7' end
        it { is_expected.to contain_archive('/tmp/jdk-7u80-linux-i586.rpm')}
        it { is_expected.to contain_exec('Install Oracle java_se jdk 7').with_command('rpm --force -iv /tmp/jdk-7u80-linux-i586.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 7').that_requires('Archive[/tmp/jdk-7u80-linux-i586.rpm]') }
    end

    context 'select Oracle Java SE 8 JDK on RedHat family, 32-bit' do
@@ -70,6 +78,7 @@ describe 'java::oracle', :type => :define do
      let :title do 'jdk8' end
        it { is_expected.to contain_archive('/tmp/jdk-8u51-linux-i586.rpm')}
        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u51-linux-i586.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u51-linux-i586.rpm]') }
    end

    context 'select Oracle Java SE 6 JRE on RedHat family, 32-bit' do
@@ -77,6 +86,7 @@ describe 'java::oracle', :type => :define do
      let :title do 'jdk6' end
        it { is_expected.to contain_archive('/tmp/jre-6u45-linux-i586-rpm.bin')}
        it { is_expected.to contain_exec('Install Oracle java_se jre 6').with_command('sh /tmp/jre-6u45-linux-i586-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jre*.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 6').that_requires('Archive[/tmp/jre-6u45-linux-i586-rpm.bin]') }
    end

    context 'select Oracle Java SE 7 JRE on RedHat family, 32-bit' do
@@ -84,6 +94,7 @@ describe 'java::oracle', :type => :define do
      let :title do 'jdk7' end
        it { is_expected.to contain_archive('/tmp/jre-7u80-linux-i586.rpm')}
        it { is_expected.to contain_exec('Install Oracle java_se jre 7').with_command('rpm --force -iv /tmp/jre-7u80-linux-i586.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 7').that_requires('Archive[/tmp/jre-7u80-linux-i586.rpm]') }
    end

    context 'select Oracle Java SE 8 JRE on RedHat family, 32-bit' do
@@ -91,55 +102,71 @@ describe 'java::oracle', :type => :define do
      let :title do 'jdk8' end
        it { is_expected.to contain_archive('/tmp/jre-8u51-linux-i586.rpm')}
        it { is_expected.to contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u51-linux-i586.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u51-linux-i586.rpm]') }
    end
  end

-  describe 'incompatible OSs' do
+  describe 'incompatible OSes' do
    [
      {
        # C14706
-        :kernel                 => 'windows',
-        :osfamily               => 'windows',
-        :operatingsystem        => 'windows',
-        :operatingsystemrelease => '8.1',
-        :puppetversion          => '3.4.3 (Puppet Enterprise 3.2.3)',
+        :kernel => 'Windows',
+        :os => {
+          :family => 'Windows',
+          :name => 'Windows',
+          :release => {
+            :full => '8.1'
+          }
+        },
      },
      {
        # C14707
        :kernel => 'Darwin',
-        :osfamily               => 'Darwin',
-        :operatingsystem        => 'Darwin',
-        :operatingsystemrelease => '13.3.0',
-        :puppetversion          => '3.4.3 (Puppet Enterprise 3.2.3)',
+        :os => {
+          :family => 'Darwin',
+          :name => 'Darwin',
+          :release => {
+            :full => '13.3.0'
+          }
+        },
      },
      {
        # C14708
        :kernel => 'AIX',
-        :osfamily               => 'AIX',
-        :operatingsystem        => 'AIX',
-        :operatingsystemrelease => '7100-02-00-000',
-        :puppetversion          => '3.4.3 (Puppet Enterprise 3.2.3)',
+        :os => {
+          :family => 'AIX',
+          :name => 'AIX',
+          :release => {
+            :full => '7100-02-00-000'
+          }
+        },
      },
      {
-        # C14708
+        # C14709
        :kernel => 'AIX',
-        :osfamily               => 'AIX',
-        :operatingsystem        => 'AIX',
-        :operatingsystemrelease => '6100-07-04-1216',
-        :puppetversion          => '3.4.3 (Puppet Enterprise 3.2.3)',
+        :os => {
+          :family => 'AIX',
+          :name => 'AIX',
+          :release => {
+            :full => '6100-07-04-1216'
+          }
+        },
      },
      {
-        # C14708
+        # C14710
        :kernel => 'AIX',
-        :osfamily               => 'AIX',
-        :operatingsystem        => 'AIX',
-        :operatingsystemrelease => '5300-12-01-1016',
-        :puppetversion          => '3.4.3 (Puppet Enterprise 3.2.3)',
+        :os => {
+          :family => 'AIX',
+          :name => 'AIX',
+          :release => {
+            :full => '5300-12-01-1016'
+          }
        },
+      }
    ].each do |facts|
      let(:facts) { facts }
      let :title do 'jdk' end
-      it "is_expected.to fail on #{facts[:operatingsystem]} #{facts[:operatingsystemrelease]}" do
+      it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do
        expect { catalogue }.to raise_error Puppet::Error, /unsupported platform/
      end
    end
--- a/spec/spec.opts
+++ b/spec/spec.opts
@@ -1,6 +0,0 @@
--format
-s
--colour
--loadby
-mtime
--backtrace
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,43 +1,20 @@
 require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
+require 'beaker/module_install_helper'

 run_puppet_install_helper
+install_module_on(hosts)
+install_module_dependencies_on(hosts)

 UNSUPPORTED_PLATFORMS = [ "Darwin", "windows" ]

 unless ENV["RS_PROVISION"] == "no" or ENV["BEAKER_provision"] == "no"
  hosts.each do |host|
-    if host['platform'] =~ /sles-1/i ||  host['platform'] =~ /solaris-1/i
-      get_stdlib = <<-stdlib
-      package{'wget':}
-      exec{'download':
-        command => "wget -P /root/ https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.3.2.tar.gz --no-check-certificate",
-        path => ['/opt/csw/bin/','/usr/bin/']
-      }
-      stdlib
-      apply_manifest_on(host, get_stdlib)
-      # have to use force otherwise it checks ssl cert even though it is a local file
-      on host, puppet('module install /root/puppetlabs-stdlib-4.3.2.tar.gz --force')
-    else
-      on host, puppet("module install puppetlabs-stdlib")
-      # For test support
-      on host, puppet("module install puppetlabs-apt")
-    end
+    install_puppet_module_via_pmt_on(host, {module_name: 'puppetlabs-apt'})
  end
 end

 RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-
  # Readable test descriptions
  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module
-    hosts.each do |host|
-      copy_module_to(host, :source => proj_root, :module_name => "java")
-    end
-  end
 end
--- a/spec/unit/facter/java_default_home_spec.rb
+++ b/spec/unit/facter/java_default_home_spec.rb
@@ -8,6 +8,7 @@ describe Facter::Util::Fact do

  describe "java_default_home" do
    context 'returns java home path when readlink present' do
+      context 'when java is in HOME/jre/bin/java' do
        it do
          java_path_output = <<-EOS
 /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
@@ -17,6 +18,17 @@ describe Facter::Util::Fact do
          expect(Facter.value(:java_default_home)).to eql "/usr/lib/jvm/java-7-openjdk-amd64"
        end
      end
+      context 'when java is in HOME/bin/java' do
+        it do
+          java_path_output = <<-EOS
+/usr/lib/jvm/oracle-java8-jre-amd64/bin/java
+          EOS
+          Facter::Util::Resolution.expects(:which).with("readlink").returns(true)
+          Facter::Util::Resolution.expects(:exec).with("readlink -e /usr/bin/java").returns(java_path_output)
+          expect(Facter.value(:java_default_home)).to eql "/usr/lib/jvm/oracle-java8-jre-amd64"
+        end
+      end
+    end

    context 'returns nil when readlink not present' do
      it do
--- a/spec/unit/facter/java_version_spec.rb
+++ b/spec/unit/facter/java_version_spec.rb
@@ -19,7 +19,7 @@ OpenJDK Runtime Environment (build 1.7.0_71-b14)
 OpenJDK 64-Bit Server VM (build 24.71-b01, mixed mode)
          EOS
          Facter::Util::Resolution.expects(:which).with("java").returns('/usr/local/jdk-1.7.0/jre/bin/java')
-          Facter::Util::Resolution.expects(:exec).with("java -Xmx8m -version 2>&1").returns(java_version_output)
+          Facter::Util::Resolution.expects(:exec).with("java -Xmx12m -version 2>&1").returns(java_version_output)
          expect(Facter.value(:java_version)).to eq("1.7.0_71")
        end
      end
@@ -35,7 +35,7 @@ Java(TM) SE Runtime Environment (build 1.7.0_71-b14)
 Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
          EOS
          Facter::Util::Resolution.expects(:exec).with("/usr/libexec/java_home --failfast 2>&1").returns("/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home")
-          Facter::Util::Resolution.expects(:exec).with("java -Xmx8m -version 2>&1").returns(java_version_output)
+          Facter::Util::Resolution.expects(:exec).with("java -Xmx12m -version 2>&1").returns(java_version_output)
          expect(Facter.value(:java_version)).to eql "1.7.0_71"
        end
      end
@@ -50,7 +50,7 @@ java version "1.7.0_71"
 Java(TM) SE Runtime Environment (build 1.7.0_71-b14)
 Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
          EOS
-          Facter::Util::Resolution.expects(:exec).with("java -Xmx8m -version 2>&1").returns(java_version_output)
+          Facter::Util::Resolution.expects(:exec).with("java -Xmx12m -version 2>&1").returns(java_version_output)
          expect(Facter.value(:java_version)).to eq("1.7.0_71")
        end
      end
Author	SHA1	Message	Date
Hunter Haugen	3b45a95e50	Merge pull request #231 from eputnam/170prep forgot to update version in metadata for major version bump puppet-archive, a puppetlabs-java dependency, is now using structured facts on master. this commit changes the minimum number of facts from legacy to structured so that spec tests continue to pass	2017-05-30 14:04:50 -07:00
Eric Putnam	7f843d4b5b	(maint) facts update oracle.pp puppet-archive, a puppetlabs-java dependency, is now using structured facts on master. this commit changes the minimum number of facts from legacy to structured so that spec tests continue to pass	2017-05-30 13:54:03 -07:00
Eric Putnam	3e284312b0	(maint) update metadata forgot to update version in metadata for major version bump	2017-05-30 13:47:58 -07:00
Eric Putnam	c1a83674bd	Merge pull request #230 from jbondpdx/release fixed formatting errors + made various minor changes	2017-05-26 14:48:43 -07:00
jbondpdx	733fa45999	fixed formatting errors + made various minor changes	2017-05-26 13:45:13 -07:00
Hunter Haugen	3e16918284	Merge pull request #228 from eputnam/170prep	2017-05-24 15:29:39 -07:00
Eric Putnam	36b3de516f	(MODULES-4958) prep for 2.0.0 release and some markdown rendering fixes	2017-05-24 15:11:55 -07:00
Eric Putnam	755aab753e	Merge pull request #221 from traylenator/yakkety Support for Ubuntu 16.10 - Yakkety Yak	2017-05-24 12:53:42 -07:00
Eric Putnam	beef56c294	Merge pull request #227 from chsnell/ticket/MODULES-4892-metadata_update (MODULES-4892) Update metadata	2017-05-23 12:56:28 -07:00
Chris Snell	4fb2954ffe	(MODULES-4829) puppethack - Correct link for issues_url	2017-05-23 14:49:27 -04:00
Eric Putnam	827a870a7c	Merge pull request #226 from hlmartin/sles-openjdk-1.8 Update OpenJDK packages to 1.8.0 for SLES 12 service packs	2017-05-23 11:47:13 -07:00
Chris Snell	0b45946bd7	(MODULES-4892) Update metadata for new version requirement and update issues_url	2017-05-23 12:46:43 -04:00
Hailey Martin	b25212a04e	Update OpenJDK packages to 1.8.0 for SLES 12 service packs	2017-05-15 20:37:26 +10:00
Hunter Haugen	fcf3ac3476	Merge pull request #225 from bstopp/bug/master/oracle-archive (MODULES-4751) Fix Archive Order of Operations	2017-04-25 16:26:30 -07:00
Bryan Stopp	b266755711	(MODULES-4751) Fix Archive Order of Operations Without this patch the Oracle based package installations fail due to missing dependency: the package. The package installation command is defined and applied before the archive resource downloads the remote file. This patch correctly applies the order of operations: download package, install package.	2017-04-20 14:17:49 -05:00
Paula McMaw	ab6e3867fc	Merge pull request #224 from vchepkov/java_version [MODULES-4736] Increase Xmx setting for java_version fact	2017-04-19 13:53:35 +01:00
Vadym Chepkov	797677caf7	[MODULES-4736] Increase Xmx setting for java_version fact Previous value of 8M caused JVM to crash on servers with more then 40G of RAM Tested on databases servers up to 1.5T of RAM, 12M seems to be sufficient	2017-04-19 07:47:07 -04:00
Paula McMaw	df1fbfd29d	Merge pull request #222 from puppetlabs/modules-4506 [msync] 786266 Implement puppet-module-gems, a45803 Remove metadata.json from locales config	2017-04-03 13:38:18 +01:00
Wilson McCoubrey	a8448286f7	[maint] Fix puppet-lint warnings introduced with 2.2.0 puppet-lint release	2017-03-29 15:49:27 +01:00
Wilson McCoubrey	216620c90f	[msync] 786266 Implement puppet-module-gems, a45803 Remove metadata.json from locales config	2017-03-29 13:55:50 +01:00
Steve Traylen	8627e7ddd4	Support for Ubuntu 16.10 - Yakkety Yak	2017-03-24 22:28:22 +01:00
Helen	32f4492828	Merge pull request #219 from puppetlabs/modules-4528 [MODULES-4528] Replace Puppet.version.to_f version comparison from spec_helper.rb	2017-03-24 11:35:20 +00:00
Wilson McCoubrey	c776023d56	[MODULES-4528] Replace Puppet.version.to_f version comparison from spec_helper.rb	2017-03-22 15:07:33 +00:00
Helen	a1e3695849	Merge pull request #218 from puppetlabs/MODULES-4556 [MODULES-4556] Remove PE requirement from metadata.json	2017-03-21 09:48:00 +00:00
Wilson McCoubrey	a5ba5b43cd	[MODULES-4556] Remove PE requirement from metadata.json	2017-03-20 17:52:36 +00:00
Wilson McCoubrey	16e369ef21	Merge pull request #217 from traylenator/slc Support SLC operatingsystem	2017-03-16 14:08:20 +00:00
Steve Traylen	580d875b9a	Support SLC operatingsystem Scientific Linux CERN has a facter operatingsystem value of SLC. Other than that identical to SL.	2017-03-10 16:52:19 +01:00
Helen	ebb30f1ef5	Merge pull request #216 from tphoney/fix_oracle_spec pinning to archive 1.2.0, for puppet 3 compat	2017-02-24 11:38:40 +00:00
tphoney	66c0d88026	pinning to archive 1.2.0, for puppet 3 compat	2017-02-24 11:20:59 +00:00
Eric Putnam	6605e34d71	Merge pull request #212 from puppetlabs/hunner_msync (MODULES-4098) Sync the rest of the files	2017-01-20 15:48:52 -08:00
Hunter Haugen	c7830db74e	(MODULES-4098) Sync the rest of the files	2017-01-20 10:59:09 -08:00
Eric Putnam	ea3fbbf99f	Merge pull request #210 from puppetlabs/hunner_msync (MODULES-4097) Sync travis.yml	2017-01-17 14:17:37 -08:00
Eric Putnam	e36f6ce760	Merge pull request #211 from puppetlabs/implement-beaker-module_install_helper [MODULES-4224] Implement beaker-module_install_helper	2017-01-11 13:40:24 -05:00
Hunter Haugen	2604fcf5fb	(MODULES-4097) Sync travis.yml	2017-01-10 14:13:55 -08:00
Wilson McCoubrey	378f0b7fcc	[MODULES-4224] Implement beaker-module_install_helper Gemfile updated by modulesync PR: puppetlabs/modulesync_configs#122	2017-01-10 12:08:21 +00:00
TP Honey	866eae1393	Merge pull request #209 from hedzr/master add 'Amazon Linux AMI' supports	2016-12-23 11:41:16 +00:00
Tyler Langlois	70b6b81ec9	Update SLES 11sp4 packages to Java 1.7.1 (#178 )	2016-12-23 11:36:22 +00:00
Hunter Haugen	37e799a35c	Merge pull request #208 from puppetlabs/modsync (FM-5972) gettext and spec.opts	2016-12-14 22:57:41 -08:00
hedzr	9de6384cb1	Merge pull request #1 from hedzr/hedzr-patch-add-amazon-linux-ami-supports for 'Amazon Linux AMI' supports	2016-12-15 11:13:40 +08:00
hedzr	c2420550c6	for 'Amazon Linux AMI' supports [Amazon Linux AMI](https://aws.amazon.com/cn/amazon-linux-ami/2016.09-release-notes/) is another RedHat-like os image, openjdk-7 was shipped in that image but we want more choices or jdk 8. i'd been tested ok for oracle jdk installation on a 't2.micro' instance.	2016-12-15 11:08:55 +08:00
Eric Putnam	e17aa2c65c	gettext and spec.opts	2016-12-14 15:08:55 -08:00
Eric Putnam	0b47353d81	Merge pull request #207 from puppetlabs/hunner_msync (MODULES-3631) msync Gemfile for 1.9 frozen strings	2016-12-07 21:52:18 -08:00
TP Honey	66671ccf76	Merge pull request #206 from DavidS/move-to-examples Designate former tests files as examples	2016-12-02 12:57:35 +00:00
Hunter Haugen	d39b0d5d1a	(MODULES-3631) msync Gemfile for 1.9 frozen strings	2016-12-01 11:37:46 -08:00
David Schmitt	aa62b1816e	Designate former tests files as examples	2016-12-01 17:50:03 +00:00
Eric Putnam	9ce23de1c2	Merge pull request #188 from MiamiOH/archive_proxy_server Add proxy options for Oracle Java	2016-11-28 16:15:21 -08:00
Eric Putnam	ae4ab7736c	Merge pull request #191 from bodik/lsbdistcodename-stretch support java on debian stretch	2016-11-28 15:47:38 -08:00
David Schmitt	08ace70cb3	Merge pull request #205 from eputnam/MODULES-4081 (MODULES-4081) uses /etc/profile for solaris	2016-11-23 19:23:09 +00:00
Eric Putnam	efb9823d3c	uses /etc/profile/ for solaris	2016-11-23 10:58:16 -08:00
Eric Putnam	d27b0af5a9	Merge pull request #204 from puppetlabs/hunner_msync (MODULES-3704) Update gemfile template to be identical	2016-11-10 14:43:38 -08:00
Wilson McCoubrey	658be7b4f2	Merge pull request #202 from vrtdev/bugfix/fact_java_default_home MODULES-4050: Check if jre is in the path before subsubdir.	2016-11-10 16:00:38 +00:00
Hunter Haugen	cf077aa16e	(MODULES-3704) Update gemfile template to be identical	2016-11-09 12:01:49 -08:00
Hunter Haugen	b94fb4a044	Merge pull request #201 from puppetlabs/modulesync_stuff mocha version update	2016-11-07 13:29:31 -08:00
Jan Vansteenkiste	b5b03e5c00	(MODULES-4050) Check if jre is in the path before subsubdir	2016-11-07 16:06:36 +01:00
Chris Edester	25c1ac83ce	Add proxy options for Oracle Java	2016-11-03 13:32:01 -04:00
Wilson McCoubrey	91871b1408	Merge pull request #200 from MiamiOH/archive_creates java::oracle Do not download archive if already installed	2016-11-03 17:16:18 +00:00
Eric Putnam	1dd62ddc33	mocha version update	2016-11-02 16:10:17 -07:00
Chris Edester	693d980c2b	java::oracle Do not download archive if already installed We are having issues on reboot of boxes. It tries to download to tmp even though already installed, which would be fine, but the version is no longer available. This results in curl downloading something to tmp every time puppet runs, which eventualy fills up tmp :(	2016-11-01 12:53:46 -04:00
Hunter Haugen	daddd9a115	Merge pull request #198 from puppetlabs/Paula_modulesync (MODULES-3983) Update parallel_tests for ruby 2.0.0	2016-10-31 09:53:24 -07:00
Paula McMaw	e1b4cb5276	(MODULES-3983) Update parallel_tests for ruby 2.0.0	2016-10-20 09:47:55 +01:00
Hunter Haugen	b1f910d764	Merge pull request #196 from gzurowski/fix-docs Fix naming of version_major and version_minor parameters	2016-10-19 10:46:55 -07:00
Gregor Zurowski	2fe6ff23b3	Fix naming of version_major and version_minor parameters in documentation. Signed-off-by: Gregor Zurowski <gregor@zurowski.org>	2016-10-18 16:10:56 +02:00
Hunter Haugen	06c3f9f112	Merge pull request #184 from ntpttr/fix/master/modules-2971 (MODULES-2971) Add java_home to all operating systems	2016-10-17 10:54:06 -07:00
Nate Potter	9df2f3d2a6	Change exec to file_line This commit updates the setting of JAVA_HOME in /etc/environment to be done with file_line rather than exec.	2016-10-14 09:10:53 -07:00
Hunter Haugen	fec59be2b7	Merge pull request #195 from eputnam/sles10_test_failure (maint) ci fix for install_spec	2016-10-13 16:05:14 -07:00
Eric Putnam	bd25f7a58a	ci fix for install_spec	2016-10-13 14:20:20 -07:00
Eric Putnam	f9d152e991	Merge pull request #194 from puppetlabs/modulesync Update modulesync_config [51f469d]	2016-10-11 22:07:57 -07:00
Hunter Haugen	8852a13a11	Merge pull request #193 from gzurowski/oracle-java-specific-versions-docs Update documentation about parameters major_version and minor_version	2016-10-10 13:48:34 -07:00
David Schmitt	6f2d6057a8	Update modulesync_config [51f469d]	2016-10-10 14:25:47 +01:00
Gregor Zurowski	3a13507a67	Update documentation about parameters major_version and minor_version Signed-off-by: Gregor Zurowski <gregor@zurowski.org>	2016-10-08 19:16:25 +02:00
Gregor Zurowski	2a8236e6d1	Allow targeting specific major/minor Oracle JDK versions (#192 ) * Allow targeting specific major/minor Oracle JDK versions Expose two new parameters 'version_major' and 'version_minor' to allow users targeting specific Oracle JDK versions. Signed-off-by: Gregor Zurowski <gregor@zurowski.org> * Fix lint validation issues Signed-off-by: Gregor Zurowski <gregor@zurowski.org>	2016-10-07 19:48:58 +02:00
ntpttr	9093da3b32	Update config.pp	2016-09-20 14:05:18 -07:00
ntpttr	3960227e60	Add unless clause to exec	2016-09-20 13:53:03 -07:00
Nate Potter	eb587a433e	Change file resource to exec This commit changes the way the JAVA_HOME variable is added to /etc/environment from using a file resource to using an exec resource. This way we can avoid resource conflicts with the file. Signed-off-by: Nate Potter <ntpttr@gmail.com>	2016-09-17 11:58:58 -07:00
Eric Putnam	2b0bd48cb5	Merge pull request #187 from alphagov/master thanks! Support recent java versions > 8u99 built with make-jpkg 0.53	2016-09-08 12:47:04 -07:00
Jinn Koriech	0c9aafe52c	Test cases for oracle-java8-(jre\|jdk) New versions of oracle java 8 >= 100 have an updated naming scheme. These test cases validate the new conditional logic around this for Debian and derivatives.	2016-09-08 16:12:24 +01:00
Jinn Koriech	feb669f203	Support recent java versions > 8u99 built with make-jpkg 0.53 The previous make-jpkg from java-package_0.50 doesn't support building java versions with three digits in the release number. Therefore it has been necessary to upgrade java-packaages to the newer 0.53 version. Building oracle packages using the java-package tools 0.53 results in package with a new naming scheme as compared to 0.50. In particular where the packages were previously named oracle-j2re1.8 they are now named oracle-java8-jre, while oracle-j2dk1.8 has become oracle-java8-jdk. The alternatives naming has also changed. We also need to handle the system architecture naming on debian systems where Debian names it's 64bit architecture 'amd64' and Oracle use 'x64'. This results in the java_home path using x64 rather than amd64. We need to handle this variation while also accommodating all architectures, and only for the recent packages. Given this has only been tested on Ubuntu, and the make-jpkg tooling is managed in the Debian flavour, the changes are only applied to that code branch. Jinn Koriech & Doug Neal	2016-09-08 15:43:38 +01:00
root	d30954ebc4	support java on debian stretch	2016-09-07 20:16:31 +02:00
Eric Putnam	a39d5dbafa	Merge pull request #190 from puppetlabs/modulesync Update modulesync_config [a3fe424]	2016-08-26 13:55:43 -07:00
David Schmitt	f8a897c5cf	Update modulesync_config [a3fe424]	2016-08-26 18:42:08 +02:00
Helen	9179d65d68	Merge pull request #186 from puppetlabs/update-modulesync (MAINT) Update for modulesync_config 72d19f184	2016-07-29 15:03:04 +01:00
David Schmitt	b37d69c314	(MAINT) Update for modulesync_config 72d19f184	2016-07-27 15:43:59 +01:00
Hunter Haugen	47e567a94c	Merge pull request #185 from LightAxe/master Add support for Oracle Linux	2016-07-20 15:46:45 -07:00
RoboGi	9dbe1ce9bb	Changed from operatingsystem to osfamily to match other RHEL derivitives such as Oracle Linux	2016-07-19 11:25:36 -07:00
Nate Potter	dd8f85a2fa	(MODULES-2971) Add java_home to all operating systems This patch adds the java_home variable to all supported operating systemd, and gives the user the option to set it themselves. It also updates config.pp to ensure that the JAVA_HOME variable is set to the desired java_home.	2016-07-16 21:32:26 -07:00
TP Honey	71a8bed51d	Merge pull request #183 from DavidS/modulesync (MODULES-3581) modulesync [067d08a]	2016-07-11 09:22:13 +01:00
David Schmitt	19d44bb5cf	(MODULES-3581) modulesync [067d08a]	2016-07-08 13:34:17 +01:00
Greg Hardy	5c2e3528bb	Merge pull request #179 from puppetlabs/modulesync {maint} modulesync 0794b2c	2016-06-30 15:45:09 +01:00
tphoney	c99b28bab0	{maint} modulesync 0794b2c	2016-06-30 14:38:10 +01:00
Hunter Haugen	a5c137d735	Merge pull request #177 from puppetlabs/release 1.6.0 Release mergeback	2016-06-13 16:17:02 -07:00