Sat, 26 Jan 2013 18:24:49 -0800
Merge
1.1 --- a/common/makefiles/javadoc/CORE_PKGS.gmk Thu Jan 24 16:48:33 2013 -0800 1.2 +++ b/common/makefiles/javadoc/CORE_PKGS.gmk Sat Jan 26 18:24:49 2013 -0800 1.3 @@ -127,6 +127,11 @@ 1.4 java.sql \ 1.5 java.text \ 1.6 java.text.spi \ 1.7 + java.time \ 1.8 + java.time.temporal \ 1.9 + java.time.calendar \ 1.10 + java.time.format \ 1.11 + java.time.zone \ 1.12 java.util \ 1.13 java.util.concurrent \ 1.14 java.util.concurrent.atomic \
2.1 --- a/common/makefiles/javadoc/Javadoc.gmk Thu Jan 24 16:48:33 2013 -0800 2.2 +++ b/common/makefiles/javadoc/Javadoc.gmk Sat Jan 26 18:24:49 2013 -0800 2.3 @@ -1,4 +1,4 @@ 2.4 -# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 2.5 +# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2.6 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 # 2.8 # This code is free software; you can redistribute it and/or modify it 2.9 @@ -269,6 +269,7 @@ 2.10 -quiet \ 2.11 -use \ 2.12 -keywords \ 2.13 + -Xdoclint:none \ 2.14 $(ADDITIONAL_JAVADOCFLAGS) 2.15 2.16 ifdef OPENJDK
3.1 --- a/make/jprt.properties Thu Jan 24 16:48:33 2013 -0800 3.2 +++ b/make/jprt.properties Sat Jan 26 18:24:49 2013 -0800 3.3 @@ -92,6 +92,7 @@ 3.4 ${jprt.my.test.target.set:TESTNAME=jdk_text}, \ 3.5 ${jprt.my.test.target.set:TESTNAME=jdk_tools}, \ 3.6 ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \ 3.7 + ${jprt.my.test.target.set:TESTNAME=jdk_time}, \ 3.8 ${jprt.my.test.target.set:TESTNAME=jdk_other} 3.9 3.10 # All vm test targets (testset=all)
4.1 --- a/test/Makefile Thu Jan 24 16:48:33 2013 -0800 4.2 +++ b/test/Makefile Sat Jan 26 18:24:49 2013 -0800 4.3 @@ -63,7 +63,8 @@ 4.4 jdk_nio \ 4.5 jdk_security1 \ 4.6 jdk_text \ 4.7 - jdk_util 4.8 + jdk_util \ 4.9 + jdk_time 4.10 4.11 # These tests are not part of the default testing list 4.12 JDK_NONDEFAULT_TEST_LIST = \