Merge pull request #478 from puppetlabs/release-prep

Release prep v7.0.2

CHANGELOG.md

@@ -2,7 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v7.0.1](https://github.com/puppetlabs/puppetlabs-java/tree/v7.0.1) (2021-04-17)
+## [v7.0.2](https://github.com/puppetlabs/puppetlabs-java/tree/v7.0.2) (2021-04-26)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.0.1...v7.0.2)
+
+### Fixed
+
+- add url parameter for adoptopenjdk [\#473](https://github.com/puppetlabs/puppetlabs-java/pull/473) ([cbobinec](https://github.com/cbobinec))
+
+## [v7.0.1](https://github.com/puppetlabs/puppetlabs-java/tree/v7.0.1) (2021-04-19)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.0.0...v7.0.1)
 

REFERENCE.md

@@ -127,6 +127,7 @@ The following parameters are available in the `java::adopt` defined type:
 * [`java`](#java)
 * [`proxy_server`](#proxy_server)
 * [`proxy_type`](#proxy_type)
+* [`url`](#url)
 * [`basedir`](#basedir)
 * [`manage_basedir`](#manage_basedir)
 * [`package_type`](#package_type)
@@ -189,6 +190,14 @@ Proxy server type (none|http|https|ftp). (passed to archive)
 
 Default value: ``undef``
 
+##### <a name="url"></a>`url`
+
+Data type: `Any`
+
+Full URL
+
+Default value: ``undef``
+
 ##### <a name="basedir"></a>`basedir`
 
 Data type: `Any`
@@ -481,4 +490,3 @@ Data type: `Any`
 The name for the optional symlink in the installation directory.
 
 Default value: ``undef``
-

manifests/adopt.pp

@@ -24,6 +24,9 @@
 # @param proxy_type
 #   Proxy server type (none|http|https|ftp). (passed to archive)
 #
+# @param url
+#   Full URL
+#
 # @param basedir
 #   Directory under which the installation will occur. If not set, defaults to
 #   /usr/lib/jvm for Debian and /usr/java for RedHat.
@@ -51,6 +54,7 @@ define java::adopt (
   $java           = 'jdk',
   $proxy_server   = undef,
   $proxy_type     = undef,
+  $url            = undef,
   $basedir        = undef,
   $manage_basedir = true,
   $package_type   = undef,
@@ -234,7 +238,15 @@ define java::adopt (
     $spacer = '%2B'
     $download_folder_prefix = 'jdk-'
   }
+
+  # if complete URL is provided, use this value for source in archive resource
+  if $url {
+    $source = $url
+  }
+  else {
     $source = "https://github.com/AdoptOpenJDK/openjdk${_version}-binaries/releases/download/${download_folder_prefix}${release_major}${spacer}${release_minor}/${package_name}"
+    notice ("Default source url : ${source}")
+  }
 
   # full path to the installer
   $destination = "${destination_dir}${package_name}"

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-java",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "author": "puppetlabs",
   "summary": "Installs the correct Java package on various platforms.",
   "license": "Apache-2.0",