Merge pull request #86 from mhaskel/merge_1.2.x

Merge 1.2.x

CHANGELOG.md

@@ -1,49 +1,59 @@
-2014-08-25 - Supported Version 1.1.2
+##2014-11-11 - Supported Version 1.2.0
 
-Summary: This release begins the support coverage of the puppetlabs-java
+###Summary: 
-module.
+This release adds SLES 12 support and is tested for Future Parser Support
 
-Bugfixes:
+####Bugfixes:
+- Several readme updates
+- Testcase flexability increased
+
+####Features:
+- Add SLES 12 support
+- Future Parser tested
+- Validated against PE 3.7  
+
+##2014-08-25 - Supported Version 1.1.2
+
+###Summary: 
+This release begins the support coverage of the puppetlabs-java module.
+
+###Bugfixes:
 - Update java alternative values from deprecated names
 - Readme updated
 - Testing updated
 
-2014-05-02 - Version 1.1.1
+##2014-05-02 - Version 1.1.1
 
-Summary:
+###Summary:
 
 Add support for new versions of Debian and Ubuntu!
 
-Features:
+####Features:
 - Add support for Ubuntu Trusty (14.04)
 - Add support for Debian Jessie (8.x)
 
-2014-01-06 - Version 1.1.0
+##2014-01-06 - Version 1.1.0
 
-Summary:
+####Summary:
 
 Primarily a release for Ubuntu users!
 
-Features:
+####Features:
 - Add support for Ubuntu Saucy (13.10)
 - 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
-
-1.0.2 ()
-
-Brett Porter <brett@apache.org>
-* Support Scientific Linux
-
-1.0.1 (2013-08-01)
 
 Matthaus Owens <matthaus@puppetlabs.com>
 * Update java packages for Fedora systems
 
-1.0.0 (2013-07-29)
+##2013-07-29 - Version 1.0.0
+
+####Detailed Changes
 
 Krzysztof Suszyński <krzysztof.suszynski@coi.gov.pl>
 * Adding support for Oracle Enterprise Linux
@@ -68,32 +78,39 @@ Nathan R Valentine <nrvale0@gmail.com>
 Sharif Nassar <sharif@mediatemple.net>
 * Add support for Debian alternatives, and more than one JDK/JRE per platform.
 
-2013-04-04 Reid Vandewiele <reid@puppetlabs.com> - 0.3.0
+##2013-04-04 - Version 0.3.0
+Reid Vandewiele <reid@puppetlabs.com> -
 * Refactor, introduce params pattern
 
-2012-11-15 Scott Schneider <sschneider@puppetlabs.com> - 0.2.0
+##2012-11-15 - Version 0.2.0
+Scott Schneider <sschneider@puppetlabs.com>
 * Add Solaris support
 
-2011-06-16 Jeff McCune <jeff@puppetlabs.com> - 0.1.5
+##2011-06-16 - Version 0.1.5
+Jeff McCune <jeff@puppetlabs.com> 
 * Add Debian based distro (Lucid) support
 
-2011-06-02 Jeff McCune <jeff@puppetlabs.com> - 0.1.4
+##2011-06-02 - Version 0.1.4
+Jeff McCune <jeff@puppetlabs.com> 
 * Fix class composition ordering problems
 
-2011-05-28 Jeff McCune <jeff@puppetlabs.com> - 0.1.3
+##2011-05-28 - Version 0.1.3
+Jeff McCune <jeff@puppetlabs.com>
 * Remove stages
 
-2011-05-26 Jeff McCune <jeff@puppetlabs.com> - 0.1.2
+##2011-05-26 - Version 0.1.2
+Jeff McCune <jeff@puppetlabs.com>
 * Changes JRE/JDK selection class parameter to $distribution
 
-2011-05-25 Jeff McCune <jeff@puppetlabs.com> - 0.1.1
+##2011-05-25 - Version 0.1.1
+Jeff McCune <jeff@puppetlabs.com>
 * Re-did versioning to follow semantic versioning
-
-2011-05-25 Jeff McCune <jeff@puppetlabs.com> - 1.0.1
 * Add validation of class parameters
 
-2011-05-24 Jeff McCune <jeff@puppetlabs.com> - 1.0.0
+##2011-05-24 - Version 0.1.0
+Jeff McCune <jeff@puppetlabs.com> 
 * Default to JDK version 6u25
 
-2011-05-24 Jeff McCune <jeff@puppetlabs.com> - 0.0.1
+##2011-05-24 - Version 0.0.1
+Jeff McCune <jeff@puppetlabs.com> 
 * Initial release

README.markdown

@@ -54,7 +54,7 @@ The following parameters are available in the java module:
 
 * `distribution`: The Java distribution to install. Can be 'jdk','jre', or, where the platform supports alternative packages, 'sun-jdk', 'sun-jre', 'oracle-jdk', 'oracle-jre'. Defaults to 'jdk'.
 
-*`version`: The version of Java to install, if you want to ensure a particular version. By default, the module ensures that Java is present but does not require a specific version.
+* `version`: The version of Java to install, if you want to ensure a particular version. By default, the module ensures that Java is present but does not require a specific version.
 
 * `package`: The name of the Java package. This is configurable in case you want to install a non-standard Java package. If not set, the module will install the appropriate package for the `distribution` parameter and target platform. If you set `package`, the `distribution` parameter will do nothing. 
 
@@ -78,7 +78,7 @@ OpenJDK is supported on:
 * Debian 6, 7
 * Ubuntu 10.04, 12.04, 14.04
 * Solaris 11
-* SLES 11 SP1 
+* SLES 11 SP1, 12 
 
 Sun Java is supported on:
 * Debian 6

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-java",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "author": "puppetlabs",
   "summary": "Manage the official Java runtime",
   "license": "Apache",