Merge pull request #228 from eputnam/170prep

2017-05-24 15:29:39 -07:00
parent 755aab753e 36b3de516f
commit 3e16918284
3 changed files with 86 additions and 64 deletions
--- 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

@@ -37,7 +59,7 @@ A release which has several support additions for different OSes. Also a couple
 - Small README updates and syntax error fixes.

 ## Supported Release 1.4.3
-###Summary
+### Summary

 Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.

@@ -55,18 +77,18 @@ This release updates the metadata for the upcoming release of PE and update para
 #### Bugfixes:
 - Add missing OEL to params

-##2015-07-07 - Supported Release 1.4.0
-###Summary
+## 2015-07-07 - Supported Release 1.4.0
+### Summary
 This release adds several new features, bugfixes, documentation updates, and test improvements.

-####Features:
+#### Features:
 - Puppet 4 support and testing
 - Adds support for several Operating Systems
  - Ubuntu 15.04
  - OpenBSD 5.6, 5.7
  - Fedora 20, 21, 22

-####Bugfixes:
+#### Bugfixes:
 - Fixes java_version fact to work on large systems. (MODULES-1749)
 - Improves maintainability of java_version fact.
 - Fixes java package names on Fedora 21+.
@@ -74,11 +96,11 @@ This release adds several new features, bugfixes, documentation updates, and tes
 - Fixes create-java-alternatives commands on RedHat distros.
 - Fixes bug with Debian systems missing java-common package.

-##2015-01-20 - Supported Release 1.3.0
-###Summary
+## 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
+#### Features
 - Added RHEL support for alternatives
 - New facts
  - java_major_version
@@ -86,65 +108,65 @@ This release adds 3 new facts for determining Java version, adds RHEL alternativ
  - java_version
 - Add support for utopic

-####Bugfixes
+#### Bugfixes
 - Use `--jre-headless` in the `update-java-alternatives` command when installed from a `headless` package

-##2014-11-11 - Supported Version 1.2.0
+## 2014-11-11 - Supported Version 1.2.0

-###Summary: 
+### Summary: 
 This release adds SLES 12 support and is tested for Future Parser Support

-####Bugfixes:
+#### Bugfixes:
 - Several readme updates
 - Testcase flexability increased

-####Features:
+#### Features:
 - Add SLES 12 support
 - Future Parser tested
 - Validated against PE 3.7  

-##2014-08-25 - Supported Version 1.1.2
+## 2014-08-25 - Supported Version 1.1.2

-###Summary: 
+### Summary: 
 This release begins the support coverage of the puppetlabs-java module.

-###Bugfixes:
+### 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
+## 2013-08-01 - Version 1.0.1

 Matthaus Owens <matthaus@puppetlabs.com>
 * Update java packages for Fedora systems

-##2013-07-29 - Version 1.0.0
+## 2013-07-29 - Version 1.0.0

-####Detailed Changes
+#### Detailed Changes

 Krzysztof Suszyński <krzysztof.suszynski@coi.gov.pl>
 * Adding support for Oracle Enterprise Linux
@@ -169,39 +191,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 - Version 0.3.0
+## 2013-04-04 - Version 0.3.0
 Reid Vandewiele <reid@puppetlabs.com> -
 * Refactor, introduce params pattern

-##2012-11-15 - Version 0.2.0
+## 2012-11-15 - Version 0.2.0
 Scott Schneider <sschneider@puppetlabs.com>
 * Add Solaris support

-##2011-06-16 - Version 0.1.5
+## 2011-06-16 - Version 0.1.5
 Jeff McCune <jeff@puppetlabs.com> 
 * Add Debian based distro (Lucid) support

-##2011-06-02 - Version 0.1.4
+## 2011-06-02 - Version 0.1.4
 Jeff McCune <jeff@puppetlabs.com> 
 * Fix class composition ordering problems

-##2011-05-28 - Version 0.1.3
+## 2011-05-28 - Version 0.1.3
 Jeff McCune <jeff@puppetlabs.com>
 * Remove stages

-##2011-05-26 - Version 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 - Version 0.1.1
+## 2011-05-25 - Version 0.1.1
 Jeff McCune <jeff@puppetlabs.com>
 * Re-did versioning to follow semantic versioning
 * Add validation of class parameters

-##2011-05-24 - Version 0.1.0
+## 2011-05-24 - Version 0.1.0
 Jeff McCune <jeff@puppetlabs.com> 
 * Default to JDK version 6u25

-##2011-05-24 - Version 0.0.1
+## 2011-05-24 - Version 0.0.1
 Jeff McCune <jeff@puppetlabs.com> 
 * Initial release
--- a/README.markdown
+++ b/README.markdown
@@ -1,6 +1,6 @@
-#java
+# java

-####Table of Contents
+#### Table of Contents

 1. [Overview](#overview)
 2. [Module Description - What the module does and why it is useful](#module-description)
@@ -11,20 +11,20 @@
 6. [Limitations - OS compatibility, etc.](#limitations)
 7. [Development - Guide for contributing to the module](#development)

-##Overview
+## Overview

 Installs the correct Java package on various platforms. 

-##Module Description
+## Module Description

 The java module can automatically install Java jdk or jre on a wide variety of systems. Java is a base component for many software platforms, but Java system packages don't always follow packaging conventions. The java module simplifies the Java installation process.

-##Setup
+## Setup

-###Beginning with the java module
+### Beginning with the java module
 To install the correct Java package on your system, include the `java` class: `include java`.

-##Usage
+## Usage

 The java module installs the correct jdk or jre package on a wide variety of systems. By default, the module installs the jdk package, but you can set different installation parameters as needed. For example, to install jre instead of jdk, you would set the distribution parameter:

@@ -69,77 +69,77 @@ java::oracle { 'jdk8' :
 }
 ~~~

-##Reference
+## Reference

-###Classes
+### Classes

-####Public classes
+#### Public classes

 * `java`: Installs and manages the Java package.

-####Private classes
+#### Private classes

 * `java::config`: Configures the Java alternatives.

 * `java::params`: Builds a hash of jdk/jre packages for all compatible operating systems.


-####Parameters
+#### Parameters
 The following parameters are available in `java`:

 ##### `distribution`
 Specifies the Java distribution to install.  
 Valid options:  'jdk', 'jre', or, where the platform supports alternative packages, 'sun-jdk', 'sun-jre', 'oracle-jdk', 'oracle-jre'. Default: 'jdk'.

-#####`java_alternative`
+##### `java_alternative`
 Specifies the name of the Java alternative to use. If you set this parameter, *you must also set the `java_alternative_path`.*  
 Valid options: Run command `update-java-alternatives -l` for a list of available choices. Default: OS and distribution dependent defaults on *deb systems, undef on others.

-#####`java_alternative_path`  
+##### `java_alternative_path`  
 *Required when `java_alternative` is specified.* Defines the path to the `java` command.  
 Valid option: String. Default: OS and distribution dependent defaults on *deb systems, undef on others.

-#####`package`
+##### `package`
 Specifies 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 installs the appropriate package for the `distribution` parameter and target platform. If you set `package`, the `distribution` parameter does nothing.  
 Valid option: String. Default: undef. 

-#####`version`
+##### `version`
 Sets the version of Java to install, if you want to ensure a particular version.  
 Valid options: 'present', 'installed', 'latest', or a string matching `/^[.+_0-9a-zA-Z:-]+$/`. Default: 'present'.

-####Public defined types
+#### Public defined types

 * `java::oracle`: Installs specified version of Oracle Java SE.  You may install multiple versions of Oracle Jave SE on the same node using this defined type.

-####Parameters
+#### Parameters

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

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

-#####`version_major`
+##### `version_major`
 Major version of the Java Standard Edition (SE) to install. Must be used together with `version_minor`. For example, '8u101'.

-#####`version_minor`
+##### `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`
+##### `java_se`
 Type of Java SE to install, jdk or jre.

-#####`ensure`
+##### `ensure`
 Install or remove the package.

-#####`oracle_url`
+##### `oracle_url`
 Official Oracle URL to download the binaries from.

-#####`proxy_server`
+##### `proxy_server`
 Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)

-#####`proxy_type`
+##### `proxy_type`
 Proxy server type (none|http|https|ftp). (passed to archive)

-###Facts
+### Facts

 The java module includes a few facts to describe the version of Java installed on the system:

@@ -151,7 +151,7 @@ The java module includes a few facts to describe the version of Java installed o

 **Note:** The facts return `nil` if Java is not installed on the system.

-##Limitations
+## Limitations

 This module cannot guarantee installation of Java versions that are not available on  platform repositories. 

--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
  "name": "puppetlabs-java",
-  "version": "1.6.0",
+  "version": "1.7.0",
  "author": "puppetlabs",
  "summary": "Installs the correct Java package on various platforms.",
  "license": "Apache-2.0",