changeset 594:039783b67959

Merge
author lana
date Sat, 26 Jan 2013 18:24:49 -0800
parents cd2fa0d0ed3d 8209c91b751d
children 8baaaba2ee6b
files
diffstat 4 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/common/makefiles/javadoc/CORE_PKGS.gmk	Thu Jan 24 16:48:33 2013 -0800
+++ b/common/makefiles/javadoc/CORE_PKGS.gmk	Sat Jan 26 18:24:49 2013 -0800
@@ -127,6 +127,11 @@
   java.sql                                       \
   java.text                                      \
   java.text.spi                                  \
+  java.time                                      \
+  java.time.temporal                             \
+  java.time.calendar                             \
+  java.time.format                               \
+  java.time.zone                                 \
   java.util                                      \
   java.util.concurrent                           \
   java.util.concurrent.atomic                    \
--- a/common/makefiles/javadoc/Javadoc.gmk	Thu Jan 24 16:48:33 2013 -0800
+++ b/common/makefiles/javadoc/Javadoc.gmk	Sat Jan 26 18:24:49 2013 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2013, 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
@@ -269,6 +269,7 @@
 		-quiet					\
                 -use					\
                 -keywords				\
+		-Xdoclint:none				\
 		$(ADDITIONAL_JAVADOCFLAGS)
 
 ifdef OPENJDK
--- a/make/jprt.properties	Thu Jan 24 16:48:33 2013 -0800
+++ b/make/jprt.properties	Sat Jan 26 18:24:49 2013 -0800
@@ -92,6 +92,7 @@
     ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_tools},              \
     ${jprt.my.test.target.set:TESTNAME=jdk_jfr},                \
+    ${jprt.my.test.target.set:TESTNAME=jdk_time},               \
     ${jprt.my.test.target.set:TESTNAME=jdk_other}
 
 # All vm test targets (testset=all)
--- a/test/Makefile	Thu Jan 24 16:48:33 2013 -0800
+++ b/test/Makefile	Sat Jan 26 18:24:49 2013 -0800
@@ -63,7 +63,8 @@
 	jdk_nio \
 	jdk_security1 \
 	jdk_text  \
-	jdk_util
+	jdk_util  \
+	jdk_time
 
 # These tests are not part of the default testing list
 JDK_NONDEFAULT_TEST_LIST = \