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

Merge pull request #196 from gzurowski/fix-docs

Browse Source 
Fix naming of version_major and version_minor parameters
This commit is contained in:
Hunter Haugen
2016-10-19 10:46:55 -07:00
committed by GitHub
parent 06c3f9f112 2fe6ff23b3
commit b1f910d764
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
README.markdown
View File

@@ -58,13 +58,13 @@ java::oracle { 'jdk8' :
} }
~~~ ~~~
To install a specific release of a Java version, e.g. 8u101-b13, provide both parameters `major_version` and `minor_version` as follows: 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' : java::oracle { 'jdk8' :
ensure => 'present', ensure => 'present',
major_version => '8u101', version_major => '8u101',
minor_version => 'b13', version_minor => 'b13',
java_se => 'jdk', java_se => 'jdk',
} }
~~~ ~~~
@@ -118,11 +118,11 @@ The following parameters are available in `java::oracle`:
#####`version` #####`version`
Version of Java Standard Edition (SE) to install. 6, 7 or 8. Version of Java Standard Edition (SE) to install. 6, 7 or 8.
#####`major_version` #####`version_major`
Major version of the Java Standard Edition (SE) to install. Must be used together with `minor_version`. For example, '8u101'. Major version of the Java Standard Edition (SE) to install. Must be used together with `version_minor`. For example, '8u101'.
#####`minor_version` #####`version_minor`
Minor version (or build version) of the Java Standard Edition (SE) to install. Must be used together with `major_version`. For example, 'b13'. 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. Type of Java SE to install, jdk or jre.

8
manifests/oracle.pp
View File

@@ -17,13 +17,13 @@
# Version of Java to install, e.g. '7' or '8'. Default values for major and minor # Version of Java to install, e.g. '7' or '8'. Default values for major and minor
# versions will be used. # versions will be used.
# #
# [*major_version*] # [*version_major*]
# Major version which should be installed, e.g. '8u101'. Must be used together with # Major version which should be installed, e.g. '8u101'. Must be used together with
# minor_version. # version_minor.
# #
# [*minor_version*] # [*version_minor*]
# Minor version which should be installed, e.g. 'b12'. Must be used together with # Minor version which should be installed, e.g. 'b12'. Must be used together with
# major_version. # version_major.
# #
# [*java_se*] # [*java_se*]
# Type of Java Standard Edition to install, jdk or jre. # Type of Java Standard Edition to install, jdk or jre.