version 1.2.0 adds support for java 8 on old Ubuntu releases via ppa

dsestero · dsestero · commit cb10f5ce76d2 · 2017-04-04T15:29:35.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+##2017-04-04 - Release - 1.2.0
+###Summary
+Added support for java 8 on Ubuntu 12.04 and 14.04 via ppa repository.
+
 ##2017-03-10 - Release - 1.1.2
 ###Summary
 Fixed empty release.
diff --git a/README.markdown b/README.markdown
@@ -21,6 +21,7 @@ This is the java module. It allows to install Java OpenJDK and configure the def
 
 The module provides classes and defines to install Java OpenJDK and configure the java alternative on Debian and RedHat family distributions.
 It allows to install multiple Java versions on the same node.
+It allows to install java 8 even if it is not in the standard repository in Ubuntu 12.04 and 14.04 via ppa.
 
 ##Setup
 
@@ -30,6 +31,8 @@ The module install the OpenJDK package from the repositories and set up the alte
 
 If hiera defines a value for the parameter `java::java_default_version` the alternative system link for the command java is set to manual mode according to specified version. Otherwise it is left as it is.
 
+In case java 8 installation is required on Ubuntu 12.04 or Ubuntu 14.04 the repository `ppa:openjdk-r/ppa` is added.
+
 ###Setup Requirements
 
 The module has no special requirements.
@@ -103,7 +106,7 @@ Specifies the default java in case multiple versions are installed. Valid option
 
 ##Limitations
 
-At the moment the module targets only OpenJDK 6, 7 and 8 on Debian, Ubuntu, RedHat and CentOS platforms. Specifically, it is tested only on Ubuntu 12.04 and CentOS 6.6 distributions; although probably it will work also on different versions.
+At the moment the module targets only OpenJDK 6, 7 and 8 on Debian, Ubuntu, RedHat and CentOS platforms. Specifically, it was tested on Ubuntu 12.04, 14.04, 16.04 and CentOS 6.6 distributions; although probably it will work also on different versions.
 
 ##Development
 
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -30,6 +30,7 @@
 define java (
   $java_version         = $title,
   $java_default_version = hiera('java::java_default_version', undef)) {
+  include apt
   java::install_config { $java_version:
     java_default_version => $java_default_version,
   }
diff --git a/metadata.json b/metadata.json
@@ -27,5 +27,5 @@
       }
   ],
   "tags": ["java", "jee", "jvm", "middleware"],
-  "version": "1.1.2"
+  "version": "1.2.0"
 }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`define java (`
`31`	`31`	`$java_version = $title,`
`32`	`32`	`$java_default_version = hiera('java::java_default_version', undef)) {`
	`33`	`+ include apt`
`33`	`34`	`java::install_config { $java_version:`
`34`	`35`	`java_default_version => $java_default_version,`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@`
`27`	`27`	`}`
`28`	`28`	`],`
`29`	`29`	`"tags": ["java", "jee", "jvm", "middleware"],`
`30`		`- "version": "1.1.2"`
	`30`	`+ "version": "1.2.0"`
`31`	`31`	`}`