From 5a263999379f5c23eae84416c56ffc055b2a0165 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Mon, 26 Feb 2024 14:06:54 -0800 Subject: [PATCH] Try resolve #193: exclude refs to shaded modules (#198) --- release-notes/CREDITS | 6 ++++++ release-notes/VERSION | 6 ++++++ src/moditect/module-info.java | 6 ++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/release-notes/CREDITS b/release-notes/CREDITS index a2159234..f9f50d2f 100644 --- a/release-notes/CREDITS +++ b/release-notes/CREDITS @@ -94,3 +94,9 @@ Kamil Gołębiewski (@Magmaruss) * Contributed #165: Add support to optionally allow surrogate pair entities (6.6.0) + +Alexey Gavrilov (@agavrilov76) + +* Reported #193: Module `com.ctc.wstx` does not read a module that exports + `com.ctc.wstx.shaded.msv.org_isorelax.verifier` + (6.6.1) diff --git a/release-notes/VERSION b/release-notes/VERSION index b5da6344..af2d6bbc 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION @@ -4,6 +4,12 @@ Project: woodstox === Releases === ------------------------------------------------------------------------ +6.6.1 (26-Feb-2024) + +#193: Module `com.ctc.wstx` does not read a module that exports + `com.ctc.wstx.shaded.msv.org_isorelax.verifier` + (reported by Alexey G) + 6.6.0 (15-Jan-2024) #67: Wrong line for XML event location in elements following DTD diff --git a/src/moditect/module-info.java b/src/moditect/module-info.java index ba7ebf7e..f4a719d0 100644 --- a/src/moditect/module-info.java +++ b/src/moditect/module-info.java @@ -30,8 +30,10 @@ provides javax.xml.stream.XMLOutputFactory with com.ctc.wstx.stax.WstxOutputFactory; //Include shaded in provisions - provides com.ctc.wstx.shaded.msv.relaxng_datatype.DatatypeLibraryFactory with com.ctc.wstx.shaded.msv_core.datatype.xsd.ngimpl.DataTypeLibraryImpl; - provides com.ctc.wstx.shaded.msv.org_isorelax.verifier.VerifierFactoryLoader with com.ctc.wstx.shaded.msv_core.verifier.jarv.FactoryLoaderImpl; + // 26-Feb-2024, tatu: Seems like these are problematic; exclude + //provides com.ctc.wstx.shaded.msv.relaxng_datatype.DatatypeLibraryFactory with com.ctc.wstx.shaded.msv_core.datatype.xsd.ngimpl.DataTypeLibraryImpl; + //provides com.ctc.wstx.shaded.msv.org_isorelax.verifier.VerifierFactoryLoader with com.ctc.wstx.shaded.msv_core.verifier.jarv.FactoryLoaderImpl; + provides org.codehaus.stax2.validation.XMLValidationSchemaFactory.dtd with com.ctc.wstx.dtd.DTDSchemaFactory; provides org.codehaus.stax2.validation.XMLValidationSchemaFactory.relaxng with com.ctc.wstx.msv.RelaxNGSchemaFactory; provides org.codehaus.stax2.validation.XMLValidationSchemaFactory.w3c with com.ctc.wstx.msv.W3CSchemaFactory;