Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23018419 remove java7 dependency from userland
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 30 Mar 2016 08:50:52 -0700
changeset 5678 5b527c1e97be
parent 5677 79d4c385dfbe
child 5679 d91b8121bb2a
23018419 remove java7 dependency from userland
make-rules/prep-unpack.mk file | annotate | diff | comparison | revisions
make-rules/shared-macros.mk file | annotate | diff | comparison | revisions 
--- 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
--- 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
upstream/oracle/userland-gate