Merge

.hgtags

@@ -314,6 +314,8 @@ b14daf2459c5430dfe5d435483d6f424cff09584 jdk8u20-b23
 1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b24
 1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b25
 d1a7ea2c3e1091e0df1285963328a96f475f240d jdk8u20-b26
+3229d7b76babcf6710b3a965a2eda3f3bb2aa972 jdk8u20-b31
+9955a899edb359f2dc1704ea86044e9819cb805d jdk8u20-b32
 97c6d6a8e5bb3dfc24b9a32711aa0906ea110e23 jdk8u25-b00
 c4cfb4376f5916c5d7eb1f39a0e23402de0d9818 jdk8u25-b01
 b4d29a751077e5500e766b8104dd1cb7148a550f jdk8u25-b02
@@ -333,6 +335,21 @@ c35e73e4acd8ed03e77e8e20023bac115c7dfe38 jdk8u25-b12
 f0a48c214c46b7351ff8e6d6b6dc533463a4be21 jdk8u25-b16
 d117f01bfb4f34668ac216c9837e88acead14dce jdk8u25-b17
 efac90a2da447c2b2d43ee1b1e20c0828659f9c5 jdk8u25-b18
+1a0b4ec68abc4e9248ca6041fff04612674a9b9f jdk8u25-b31
+6db0898d3f90ad9eae2f017299314b88766446e3 jdk8u31-b00
+85792859f3bdd6a2c1bdfcf2828bb2730e06ac3c jdk8u31-b01
+4898a7460ae620ac5356cb224e1fdf3c29312533 jdk8u31-b02
+886ace09d0934d5410572764685f13119d523823 jdk8u31-b03
+e2d32fe85fb93ce5179c25f5bfd49750a85c9342 jdk8u31-b04
+97de4d73edf1435c9b87d765d2ad91bb16c8d913 jdk8u31-b05
+f1b61760d01de6ad8d360227ac6c2122765680a2 jdk8u31-b06
+e9cbffb6c1119f3ef39c68db53c36c5e544c0d3c jdk8u31-b07
+4cec543118e7720d6105f25b60742d25a458cab7 jdk8u31-b08
+ea4b31ec437d74c62b844bd8b35f0bc3a27915b4 jdk8u31-b09
+01a98532348477a84b6e3c322fdd12dfed28d96d jdk8u31-b10
+ec85d5d0e3c05b0b6d61f4fc3f41313448ed9b05 jdk8u31-b11
+ca98e3e9727ffdcde2c9980668d0c7f344261938 jdk8u31-b12
+fde671d8b2537b6be61f67e583164b5b8b33ac5b jdk8u31-b13
 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00
 f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01
 b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02
@@ -353,3 +370,6 @@ df659b8b0bc82214358e2f0ef340612011d5ed3b jdk8u40-b14
 e1c506c8e1db7356d120dd7d22b2c50276b6bcee jdk8u40-b17
 83d1d42c3df409c87ef7cb0126343a009857ca71 jdk8u40-b18
 ae4980d195b64eec58884b233d7efd312205bac8 jdk8u40-b19
+b31a07adaef50dacba20e376cff6f1096e745092 jdk8u40-b20
+765a17e75fd622f7b892381e23c9b2c531d416f0 jdk8u40-b21
+ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00

make/Javadoc.gmk

@@ -114,10 +114,10 @@ BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
 
 # Url to devdocs page
 # Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
-DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
-DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
+DEV_DOCS_URL-7 = https://docs.oracle.com/javase/7/docs/index.html
+DEV_DOCS_URL-8 = https://docs.oracle.com/javase/8/docs/index.html
 DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
-DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
+DOCS_BASE_URL = https://docs.oracle.com/javase/7/docs
 
 # Common Java trademark line
 JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
@@ -1116,14 +1116,15 @@ NASHORNAPI_WINDOWTITLE := Nashorn API
 NASHORNAPI_HEADER := <strong>Nashorn API</strong>
 NASHORNAPI_BOTTOM := $(call CommonBottom,$(NASHORNAPI_FIRST_COPYRIGHT_YEAR))
 NASHORNAPI_GROUPNAME := Packages
-NASHORNAPI_REGEXP := com.sun.source.*
+NASHORNAPI_REGEXP := jdk.nashorn.api.scripting.*
+
 # NASHORNAPI_PKGS is located in NON_CORE_PKGS.gmk
 
 NASHORNAPI_INDEX_HTML = $(NASHORNAPI_DOCDIR)/index.html
-NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
-NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
+NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/nashornapi.options
+NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/nashornapi.packages
 
-treeapidocs: $(NASHORNAPI_INDEX_HTML)
+nashornapidocs: $(NASHORNAPI_INDEX_HTML)
 
 # Set relative location to core api document root
 $(NASHORNAPI_INDEX_HTML): GET2DOCSDIR=$(NASHORNAPI2COREAPI)/..

make/Main.gmk

 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -142,17 +142,12 @@ overlay-images-only: start-make
 	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
 	@$(call TargetExit)
 
-profiles: profiles-oscheck source-tips jdk hotspot profiles-only
+profiles: source-tips jdk hotspot profiles-only
 profiles-only: start-make
 	@$(call TargetEnter)
 	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles)
 	@$(call TargetExit)
 
-profiles-oscheck:
-        ifneq ($(OPENJDK_TARGET_OS), linux)
-	  @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
-        endif
-
 install: images install-only
 install-only: start-make
 	@$(call TargetEnter)
@@ -240,7 +235,7 @@ clean-test:
 .PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
 .PHONY: default all clean dist-clean bootcycle-images start-make
 .PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
-.PHONY: profiles profiles-only profiles-oscheck
+.PHONY: profiles profiles-only
 
 include $(root_dir)/make/Jprt.gmk