From 184c745e82a832e755848c5f12485c181079c675 Mon Sep 17 00:00:00 2001
From: Helen <helen@puppetlabs.com>
Date: Thu, 15 Jun 2017 11:03:44 +0100
Subject: [PATCH] Revert "Release Mergeback 2.1.0"

---
 CHANGELOG.md        | 14 --------------
 manifests/oracle.pp |  8 +++++---
 metadata.json       |  2 +-
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea08ebd..6d3840f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,3 @@
-## Supported Release 2.1.0
-### Summary
-This release adds fixes to restore the ability to install Oracle Java. It also
-fixes the paths for the latest RHEL 7 1.7.0 and 1.8.0 OpenJDKs.
-
-### Added
-- java::oracle parameter `url`
-- java::oracle parameter `url_hash`
-
-### Fixed
-- Let `java_default_home` fact work when /usr/bin/java doesn't exist
-- Add puppet 4 parameter types
-- Use `/usr/lib/jvm/java-1.x.0` symlinks for `java_home` defaults.
-
 ## Supported Release 2.0.0
 ### Summary
 
diff --git a/manifests/oracle.pp b/manifests/oracle.pp
index 198f105..e3aa912 100644
--- a/manifests/oracle.pp
+++ b/manifests/oracle.pp
@@ -213,9 +213,11 @@ define java::oracle (
   # if complete URL is provided, use this value for source in archive resource
   if $url {
     $source = $url
-  } elsif $release_hash != undef {
+  }
+  elsif $release_hash != undef {
     $source = "${oracle_url}/${release_major}-${release_minor}/${release_hash}/${package_name}"
-  } else {
+  }
+  else {
     $source = "${oracle_url}/${release_major}-${release_minor}/${package_name}"
   }
 
@@ -256,7 +258,7 @@ define java::oracle (
             path    => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
             command => $install_command,
             creates => $creates_path,
-            require => Archive[$destination],
+            require => Archive[$destination]
           }
         }
         default : {
diff --git a/metadata.json b/metadata.json
index 0e3362c..0ece972 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-java",
-  "version": "2.1.0",
+  "version": "2.0.0",
   "author": "puppetlabs",
   "summary": "Installs the correct Java package on various platforms.",
   "license": "Apache-2.0",