Merge pull request #100 from mhaskel/merge_1.3.x_to_master

Merge 1.3.x to master

CHANGELOG.md

@@ -1,3 +1,18 @@
+##2015-01-20 - Supported Release 1.3.0
+###Summary
+This release adds 3 new facts for determining Java version, adds RHEL alternatives support, adds utopic support, and fixes the flag for `update-java-alternatives` when installed from a headless pacakge.
+
+####Features
+- Added RHEL support for alternatives
+- New facts
+  - java_major_version
+  - java_patch_level
+  - java_version
+- Add support for utopic
+
+####Bugfixes
+- Use `--jre-headless` in the `update-java-alternatives` command when installed from a `headless` package
+
 ##2014-11-11 - Supported Version 1.2.0
 
 ###Summary: 

README.markdown

@@ -8,8 +8,8 @@
     * [Beginning with the java module](#beginning-with-the-java-module)
 4. [Usage - Configuration options and additional functionality](#usage)
 5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-5. [Limitations - OS compatibility, etc.](#limitations)
+6. [Limitations - OS compatibility, etc.](#limitations)
-6. [Development - Guide for contributing to the module](#development)
+7. [Development - Guide for contributing to the module](#development)
 
 ##Overview
 
@@ -62,6 +62,16 @@ The following parameters are available in the java module:
 
 * `java_alternative_path`: The path to the 'java' command. Since the alternatives system makes it difficult to verify which alternative is actually enabled, this is required to ensure the correct JVM is enabled.
 
+###Facts
+
+The java module includes a few facts to describe the version of Java installed on the system:
+
+* `java_major_version`: The major version of Java.
+* `java_patch_level`: The patch level of Java.
+* `java_version`: The full Java version string.
+
+**Note:** The facts return `nil` if Java is not installed on the system.
+
 ##Limitations
 
 This module cannot guarantee installation of Java versions that are not available on  platform repositories. 

metadata.json

@@ -1,9 +1,9 @@
 {
   "name": "puppetlabs-java",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "author": "puppetlabs",
   "summary": "Installs the correct Java package on various platforms.",
-  "license": "Apache",
+  "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",
@@ -78,9 +78,6 @@
     }
   ],
   "dependencies": [
-    {
+    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0"}
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 2.4.0"
-    }
   ]
 }