OpenJDK / jdk / jdk10
changeset 42392:f1d47e36de0c
Merge
| author | alanb |
|---|---|
| date | Thu, 01 Dec 2016 11:15:12 +0000 |
| parents | 4083bc2c3b5b 42b2a7c1473b |
| children | 905b6c3efc0f |
| files | jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java |
| diffstat | 5 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java Tue Nov 29 13:19:23 2016 +0000 +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java Thu Dec 01 11:15:12 2016 +0000 @@ -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/jaxp/src/jdk.xml.dom/share/classes/module-info.java Tue Nov 29 13:19:23 2016 +0000 +++ b/jaxp/src/jdk.xml.dom/share/classes/module-info.java Thu Dec 01 11:15:12 2016 +0000 @@ -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/jaxp/test/TEST.ROOT Tue Nov 29 13:19:23 2016 +0000 +++ b/jaxp/test/TEST.ROOT Thu Dec 01 11:15:12 2016 +0000 @@ -23,7 +23,7 @@ groups=TEST.groups # Minimum jtreg version -requiredVersion=4.2 b03 +requiredVersion=4.2 b04 # Use new module options useNewOptions=true
--- a/jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java Tue Nov 29 13:19:23 2016 +0000 +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java Thu Dec 01 11:15:12 2016 +0000 @@ -45,6 +45,7 @@ * @test * @bug 8077931 * @library /javax/xml/jaxp/libs + * @modules java.xml/javax.xml.catalog:open * @run testng/othervm -DrunSecMngr=true catalog.DeferFeatureTest * @run testng/othervm catalog.DeferFeatureTest * @summary This case tests whether the catalogs specified in delegateSystem,
--- a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/unnamed/Main.java Tue Nov 29 13:19:23 2016 +0000 +++ b/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/unnamed/Main.java Thu Dec 01 11:15:12 2016 +0000 @@ -23,6 +23,7 @@ import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; +import java.lang.module.ModuleDescriptor.Provides; import java.lang.reflect.Layer; import java.lang.reflect.Module; import java.util.Arrays; @@ -48,7 +49,8 @@ .map(xmlProviderName -> Layer.boot().findModule(xmlProviderName).get()) .mapToLong( // services provided by the implementation in provider module - provider -> provider.getDescriptor().provides().keySet().stream() + provider -> provider.getDescriptor().provides().stream() + .map(Provides::service) .filter(serviceName -> { allServices.remove(serviceName); // remove service provided by // customized module from allServices