changeset 1173:34b631df1c90

Merge
author mchung
date Thu, 22 Sep 2016 15:24:31 -0700
parents 6bcbde9a3ef2 0c2361d26582
children 55df637ed95c
files
diffstat 4 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.jcheck/conf	Thu Sep 22 16:41:13 2016 +0000
+++ b/.jcheck/conf	Thu Sep 22 15:24:31 2016 -0700
@@ -1,1 +1,3 @@
 project=jdk9
+comments=lax
+tags=lax
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java	Thu Sep 22 16:41:13 2016 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java	Thu Sep 22 15:24:31 2016 -0700
@@ -471,8 +471,7 @@
             String pn = _tfactory.getPackageName();
             assert pn != null && pn.length() > 0;
 
-            ModuleDescriptor descriptor
-                = new ModuleDescriptor.Builder(mn)
+            ModuleDescriptor descriptor = ModuleDescriptor.module(mn)
                     .requires("java.xml")
                     .exports(pn)
                     .build();
--- a/src/jdk.xml.dom/share/classes/module-info.java	Thu Sep 22 16:41:13 2016 +0000
+++ b/src/jdk.xml.dom/share/classes/module-info.java	Thu Sep 22 15:24:31 2016 -0700
@@ -24,7 +24,7 @@
  */
 
 module jdk.xml.dom {
-    requires public java.xml;
+    requires transitive java.xml;
     exports org.w3c.dom.css;
     exports org.w3c.dom.html;
     exports org.w3c.dom.stylesheets;
--- a/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java	Thu Sep 22 16:41:13 2016 +0000
+++ b/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java	Thu Sep 22 15:24:31 2016 -0700
@@ -45,6 +45,7 @@
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
+ * @modules java.xml/javax.xml.catalog:private
  * @run testng/othervm -DrunSecMngr=true catalog.DeferFeatureTest
  * @run testng/othervm catalog.DeferFeatureTest
  * @summary This case tests whether the catalogs specified in delegateSystem,