# HG changeset patch
# User Mike Sullivan <Mike.Sullivan@Oracle.COM>
# Date 1459353052 25200
# Node ID 5b527c1e97bef519a45ff918b5bd687bd176fee2
# Parent  79d4c385dfbec86aafdbdfab494713ebb13f0e5f
23018419 remove java7 dependency from userland

diff -r 79d4c385dfbe -r 5b527c1e97be make-rules/prep-unpack.mk
--- a/make-rules/prep-unpack.mk	Tue Mar 29 15:30:18 2016 -0700
+++ b/make-rules/prep-unpack.mk	Wed Mar 30 08:50:52 2016 -0700
@@ -58,7 +58,7 @@
 REQUIRED_PACKAGES += compress/unzip
 REQUIRED_PACKAGES += compress/xz
 REQUIRED_PACKAGES += compress/zip
-REQUIRED_PACKAGES += developer/java/jdk
+REQUIRED_PACKAGES += developer/java/jdk-8
 REQUIRED_PACKAGES += runtime/ruby
 
 endif
diff -r 79d4c385dfbe -r 5b527c1e97be make-rules/shared-macros.mk
--- a/make-rules/shared-macros.mk	Tue Mar 29 15:30:18 2016 -0700
+++ b/make-rules/shared-macros.mk	Wed Mar 30 08:50:52 2016 -0700
@@ -544,7 +544,6 @@
 PYTHON_DATA= $(PYTHON_LIB)
 
 JAVA8_HOME =	/usr/jdk/instances/jdk1.8.0
-JAVA7_HOME =	/usr/jdk/instances/jdk1.7.0
 JAVA_HOME = $(JAVA8_HOME)
 
 # This is the default BUILD version of perl
@@ -1022,7 +1021,6 @@
 REQUIRED_PACKAGES += text/gawk
 REQUIRED_PACKAGES += text/gnu-grep
 REQUIRED_PACKAGES += text/gnu-sed
-REQUIRED_PACKAGES += developer/java/jdk-7
 REQUIRED_PACKAGES += developer/java/jdk-8
 REQUIRED_PACKAGES += security/sudo