Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorduke
Wed, 05 Jul 2017 21:31:15 +0200
changeset 36771 4001282c4be9
parent 36770 dfc85e3e7c4e (diff)
parent 36767 45d0d1f141e3 (current diff)
child 36773 bc28a3c5af20
Merge
jdk/make/src/classes/build/tools/module/Module.java file | annotate | diff | comparison | revisions
jdk/make/src/classes/build/tools/module/ModuleInfoReader.java file | annotate | diff | comparison | revisions
jdk/make/src/classes/build/tools/module/ModulesXmlReader.java file | annotate | diff | comparison | revisions
jdk/make/src/classes/build/tools/module/ModulesXmlWriter.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/InvalidJarIndexException.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/JarIndex.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/resources/Messages.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/resources/Messages_de.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/resources/Messages_es.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/resources/Messages_fr.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/resources/Messages_it.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/resources/Messages_ja.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/resources/Messages_ko.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/resources/Messages_pt_BR.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/resources/Messages_sv.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_CN.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_TW.java file | annotate | diff | comparison | revisions 
--- a/jaxp/.hgtags	Wed Jul 05 21:31:07 2017 +0200
+++ b/jaxp/.hgtags	Wed Jul 05 21:31:15 2017 +0200
@@ -354,3 +354,4 @@
 24e247ee1fffaa625d480b2a4eef2d3a8a59f5cb jdk-9+109
 1c1bb661d35b846dc04931bd5f687a0348f80345 jdk-9+110
 27a3d65e1580386d060e0aa3a68ab52c1a9ab568 jdk-9+111
+36326537f929d20cc5885b93939f90c0efcc4681 jdk-9+112
--- a/jaxp/test/ProblemList.txt	Wed Jul 05 21:31:07 2017 +0200
+++ b/jaxp/test/ProblemList.txt	Wed Jul 05 21:31:15 2017 +0200
@@ -23,4 +23,6 @@
 #
 ###########################################################################
 
-# No jaxp tests are on the problem list.
+# 8147431 
+javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.sh            generic-all
+
--- a/jaxp/test/javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.sh	Wed Jul 05 21:31:07 2017 +0200
+++ b/jaxp/test/javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.sh	Wed Jul 05 21:31:15 2017 +0200
@@ -25,6 +25,7 @@
 # @bug 8077931
 # @summary This case tests if the properties FILES, DEFER, PREFER, RESOLVE in
 #          jaxp.properties and system properties could be used.
+# @key intermittent
 # @library ../../libs/
 # @build catalog.CatalogTestUtils
 # @build PropertiesTest
jdk-sandbox