aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsherman <none@none>2013-01-22 21:02:06 -0800
committersherman <none@none>2013-01-22 21:02:06 -0800
commit9f1989243f53c40d9f6956650d5edb318a6f9dbf (patch)
tree43ff3fc01fcc228c16b7c5164c4b7756944ca168
parentf270efccfc106cb17bda0ed10c3165da90dc551b (diff)
8003680: JSR 310 Date/Time API
Summary: Integration of JSR310 Date/Time API for M6 Reviewed-by: alanb, naoto, dholmes Contributed-by: scolebourne@joda.org, roger.riggs@oracle.com, richard.warburton@gmail.com, misterm@gmail.com
-rw-r--r--common/makefiles/javadoc/CORE_PKGS.gmk5
-rw-r--r--make/jprt.properties1
-rw-r--r--test/Makefile3
3 files changed, 8 insertions, 1 deletions
diff --git a/common/makefiles/javadoc/CORE_PKGS.gmk b/common/makefiles/javadoc/CORE_PKGS.gmk
index dcfda02..b91aae1 100644
--- a/common/makefiles/javadoc/CORE_PKGS.gmk
+++ b/common/makefiles/javadoc/CORE_PKGS.gmk
@@ -127,6 +127,11 @@ CORE_PKGS = \
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 \
diff --git a/make/jprt.properties b/make/jprt.properties
index 990c442..b7bad85 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -92,6 +92,7 @@ jprt.make.rule.core.test.targets= \
${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)
diff --git a/test/Makefile b/test/Makefile
index 9e4d509..701d39c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -63,7 +63,8 @@ JDK_DEFAULT_TEST_LIST = \
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 = \