--- a/components/ant/ant.p5m Fri Mar 20 13:14:11 2015 -0700
+++ b/components/ant/ant.p5m Sat Mar 21 08:00:32 2015 -0700
@@ -1525,10 +1525,6 @@
file path=usr/share/doc/ant/manual/api/overview-summary.html
file path=usr/share/doc/ant/manual/api/overview-tree.html
file path=usr/share/doc/ant/manual/api/package-list
-file path=usr/share/doc/ant/manual/api/resources/background.gif
-file path=usr/share/doc/ant/manual/api/resources/tab.gif
-file path=usr/share/doc/ant/manual/api/resources/titlebar.gif
-file path=usr/share/doc/ant/manual/api/resources/titlebar_end.gif
file path=usr/share/doc/ant/manual/api/serialized-form.html
file path=usr/share/doc/ant/manual/api/stylesheet.css
file path=usr/share/doc/ant/manual/argumentprocessor.html
--- a/components/ant/patches/build_xml.patch Fri Mar 20 13:14:11 2015 -0700
+++ b/components/ant/patches/build_xml.patch Sat Mar 21 08:00:32 2015 -0700
@@ -9,3 +9,13 @@
<fileset dir="${basedir}">
<include name="README"/>
<include name="INSTALL"/>
+--- apache-ant-1.8.4/build.xml.orig Thu May 29 12:28:28 2014
++++ apache-ant-1.8.4/build.xml Thu May 29 12:29:31 2014
+@@ -1464,6 +1464,7 @@
+ windowtitle="${Name} API"
+ doctitle="${Name}"
+ failonerror="true"
++ additionalparam="-Xdoclint:none"
+ verbose="${javadoc.verbose}">
+
+ <packageset dir="${java.dir}"/>
--- a/components/areca/Makefile Fri Mar 20 13:14:11 2015 -0700
+++ b/components/areca/Makefile Sat Mar 21 08:00:32 2015 -0700
@@ -47,6 +47,8 @@
include $(WS_MAKE_RULES)/ant.mk
include $(WS_MAKE_RULES)/ips.mk
+JAVA_HOME = $(JAVA7_HOME)
+
COMPONENT_BUILD_TARGETS += install -buildfile build.xml
COMPONENT_BUILD_ENV += ANT_OPTS="-Dfile.encoding=iso-8859-1"
--- a/components/beanshell/beanshell.p5m Fri Mar 20 13:14:11 2015 -0700
+++ b/components/beanshell/beanshell.p5m Sat Mar 21 08:00:32 2015 -0700
@@ -247,11 +247,6 @@
file path=usr/share/lib/java/javadoc/beanshell/overview-summary.html
file path=usr/share/lib/java/javadoc/beanshell/overview-tree.html
file path=usr/share/lib/java/javadoc/beanshell/package-list
-dir path=usr/share/lib/java/javadoc/beanshell/resources
-file path=usr/share/lib/java/javadoc/beanshell/resources/background.gif
-file path=usr/share/lib/java/javadoc/beanshell/resources/tab.gif
-file path=usr/share/lib/java/javadoc/beanshell/resources/titlebar.gif
-file path=usr/share/lib/java/javadoc/beanshell/resources/titlebar_end.gif
file path=usr/share/lib/java/javadoc/beanshell/serialized-form.html
file path=usr/share/lib/java/javadoc/beanshell/stylesheet.css
dir path=usr/share/man
--- a/components/berkeleydb/Makefile Fri Mar 20 13:14:11 2015 -0700
+++ b/components/berkeleydb/Makefile Sat Mar 21 08:00:32 2015 -0700
@@ -76,6 +76,8 @@
CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)"
CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)"
+JAVA_HOME = $(JAVA7_HOME)
+
CONFIGURE_ENV += JAVA_HOME="$(JAVA_HOME)"
CONFIGURE_OPTIONS += --includedir=/usr/include
--- a/components/graphviz/graphviz-java.p5m Fri Mar 20 13:14:11 2015 -0700
+++ b/components/graphviz/graphviz-java.p5m Sat Mar 21 08:00:32 2015 -0700
@@ -45,4 +45,4 @@
file usr/share/man/man3/gv.3java path=usr/share/man/man3/gv-java.3
license COPYING license=EPL1.0
license graphviz.license.extra license="Other Notices"
-depend type=require fmri=runtime/java/jre-7
+depend type=require fmri=runtime/java/jre-8
--- a/components/graphviz/graphviz.p5m Fri Mar 20 13:14:11 2015 -0700
+++ b/components/graphviz/graphviz.p5m Sat Mar 21 08:00:32 2015 -0700
@@ -449,7 +449,7 @@
# deliver a C# platform.
depend type=conditional \
fmri=image/graphviz/graphviz-java@$(IPS_COMPONENT_VERSION) \
- predicate=runtime/java/jre-7
+ predicate=runtime/java/jre-8
depend type=conditional \
fmri=image/graphviz/graphviz-lua@$(IPS_COMPONENT_VERSION) \
predicate=runtime/lua
--- a/components/junit/Makefile Fri Mar 20 13:14:11 2015 -0700
+++ b/components/junit/Makefile Sat Mar 21 08:00:32 2015 -0700
@@ -38,6 +38,8 @@
include $(WS_MAKE_RULES)/ant.mk
include $(WS_MAKE_RULES)/ips.mk
+JAVA_HOME = $(JAVA7_HOME)
+
# These ARGS override what is set in build.xml
COMPONENT_BUILD_ARGS += -Ddist=${PROTO_DIR}
COMPONENT_BUILD_ARGS += -Djavadocdir=${PROTO_DIR}
--- a/components/memcached-java/Makefile Fri Mar 20 13:14:11 2015 -0700
+++ b/components/memcached-java/Makefile Sat Mar 21 08:00:32 2015 -0700
@@ -81,4 +81,4 @@
test: $(NO_TESTS)
-REQUIRED_PACKAGES += runtime/java/jre-7
+REQUIRED_PACKAGES += runtime/java/jre-8
--- a/components/memcached-java/memcached-java.p5m Fri Mar 20 13:14:11 2015 -0700
+++ b/components/memcached-java/memcached-java.p5m Sat Mar 21 08:00:32 2015 -0700
@@ -92,12 +92,7 @@
file path=usr/share/lib/java/javadoc/memcached-java/api/index.html
file path=usr/share/lib/java/javadoc/memcached-java/api/overview-tree.html
file path=usr/share/lib/java/javadoc/memcached-java/api/package-list
-dir path=usr/share/lib/java/javadoc/memcached-java/api/resources
-file path=usr/share/lib/java/javadoc/memcached-java/api/resources/background.gif
-file path=usr/share/lib/java/javadoc/memcached-java/api/resources/tab.gif
-file path=usr/share/lib/java/javadoc/memcached-java/api/resources/titlebar.gif
-file path=usr/share/lib/java/javadoc/memcached-java/api/resources/titlebar_end.gif
file path=usr/share/lib/java/javadoc/memcached-java/api/serialized-form.html
file path=usr/share/lib/java/javadoc/memcached-java/api/stylesheet.css
license memcached-java.license license=BSD-like
-depend type=require fmri=runtime/java/jre-7
+depend type=require fmri=runtime/java/jre-8
--- a/components/tomcat/Makefile Fri Mar 20 13:14:11 2015 -0700
+++ b/components/tomcat/Makefile Sat Mar 21 08:00:32 2015 -0700
@@ -75,7 +75,7 @@
$(ANT) $(COMPONENT_BUILD_ARGS) -Djunit.home=/usr/share/lib/java
-REQUIRED_PACKAGES += runtime/java/jre-7
+REQUIRED_PACKAGES += runtime/java/jre-8
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/core-os
REQUIRED_PACKAGES += system/network
--- a/components/tomcat/Solaris/http-tomcat6 Fri Mar 20 13:14:11 2015 -0700
+++ b/components/tomcat/Solaris/http-tomcat6 Sat Mar 21 08:00:32 2015 -0700
@@ -21,7 +21,7 @@
#
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
. /lib/svc/share/smf_include.sh
@@ -31,7 +31,7 @@
# multiple Tomcat instances.
CATALINA_BASE=${CATALINA_BASE:-/var/tomcat6}
CATALINA_PID=$CATALINA_BASE/logs/pid
-JAVA_HOME=/usr/jdk/instances/jdk1.7.0
+JAVA_HOME=/usr/jdk/instances/jdk1.8.0
export CATALINA_HOME CATALINA_BASE CATALINA_PID JAVA_HOME
case "$1" in
--- a/components/tomcat/patches/env.patch Fri Mar 20 13:14:11 2015 -0700
+++ b/components/tomcat/patches/env.patch Sat Mar 21 08:00:32 2015 -0700
@@ -29,7 +29,7 @@
+# For Solaris
+if $solaris; then
-+ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0
++ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.8.0
+fi
+
# Get standard Java environment variables
@@ -73,7 +73,7 @@
+# For Solaris
+if $solaris; then
-+ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0
++ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.8.0
+fi
+
# Get standard Java environment variables
--- a/components/tomcat/tomcat.p5m Fri Mar 20 13:14:11 2015 -0700
+++ b/components/tomcat/tomcat.p5m Sat Mar 21 08:00:32 2015 -0700
@@ -254,4 +254,4 @@
dir path=var/tomcat6/work owner=webservd group=webservd
license tomcat.license license="Apache v2.0"
depend type=require fmri=__TBD \
- pkg.debug.depend.file=usr/jdk/instances/jdk1.7.0/bin/java
+ pkg.debug.depend.file=usr/jdk/instances/jdk1.8.0/bin/java
--- a/components/visual-panels/core/Makefile Fri Mar 20 13:14:11 2015 -0700
+++ b/components/visual-panels/core/Makefile Sat Mar 21 08:00:32 2015 -0700
@@ -33,6 +33,8 @@
include $(WS_MAKE_RULES)/justmake.mk
include $(WS_MAKE_RULES)/ips.mk
+JAVA_HOME = $(JAVA7_HOME)
+
COMPONENT_BUILD_TARGETS = build
COMPONENT_BUILD_ENV += ROOT=$(PROTO_DIR)
COMPONENT_BUILD_ENV += SRC=$(WS_COMPONENTS)/visual-panels
--- a/components/visual-panels/core/src/java/lib/visual-panels.mk Fri Mar 20 13:14:11 2015 -0700
+++ b/components/visual-panels/core/src/java/lib/visual-panels.mk Sat Mar 21 08:00:32 2015 -0700
@@ -18,7 +18,8 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
PROTO_DIR = $(WS_COMPONENTS)/visual-panels/core/build/prototype/$(MACH)
VP_DIR = $(PROTO_DIR)/usr/share/vpanels
+JAVA_HOME=$(JAVA7_HOME)
--- a/components/visual-panels/make-rules/Makefile.env Fri Mar 20 13:14:11 2015 -0700
+++ b/components/visual-panels/make-rules/Makefile.env Sat Mar 21 08:00:32 2015 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -125,7 +125,7 @@
INTLTOOL_MERGE = /usr/bin/intltool-merge
# Set here explicitly to avoid compiling with newer class version
-JDK_HOME = $(JAVA7_HOME)
+JDK_HOME = /usr/jdk/instances/jdk1.7.0
JAVA_HOME = $(JDK_HOME)
JAVAC = $(JDK_HOME)/bin/javac
--- a/make-rules/shared-macros.mk Fri Mar 20 13:14:11 2015 -0700
+++ b/make-rules/shared-macros.mk Sat Mar 21 08:00:32 2015 -0700
@@ -354,9 +354,9 @@
PYTHON_LIB= /usr/lib/python$(PYTHON_VERSION)/vendor-packages
PYTHON_DATA= $(PYTHON_LIB)
+JAVA8_HOME = /usr/jdk/instances/jdk1.8.0
JAVA7_HOME = /usr/jdk/instances/jdk1.7.0
-JAVA6_HOME = /usr/jdk/instances/jdk1.6.0
-JAVA_HOME = $(JAVA7_HOME)
+JAVA_HOME = $(JAVA8_HOME)
# This is the default BUILD version of perl
# Not necessarily the system's default version, i.e. /usr/bin/perl