Merge branch '6.6'

FasterXML · Feb 26, 2024 · d265637 · d265637
2 parents 92c816e + 5a26399
commit d265637
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git 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
@@ -11,6 +11,12 @@ Project: woodstox
 #196: WstxSAXParser error handling when used with JAXB validation
  (reported by @winfriedgerlach)
 
+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
@@ -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;