From d4431712fba049843cbb55031543d9b5a7b16236 Mon Sep 17 00:00:00 2001
From: Jeremy Norris <norrisjeremy@users.noreply.github.com>
Date: Tue, 26 Mar 2024 22:24:50 -0500
Subject: [PATCH 1/2] Fix shading of isorelax (#200). (#202)

---
 pom.xml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/pom.xml b/pom.xml
index 253f6c0..9bfc42c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,12 +108,42 @@ SAX2 and Stax2 APIs
             <scope>provided</scope>
        -->
             <optional>true</optional>
+            <exclusions>
+                <!-- don't use isorelax version that lacks source code on Maven Central -->
+                <exclusion>
+                    <groupId>isorelax</groupId>
+                    <artifactId>isorelax</artifactId>
+                </exclusion>
+                <!-- xml-apis is unneeded since it repackages XML APIs that are built into the JDK -->
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>net.java.dev.msv</groupId>
             <artifactId>xsdlib</artifactId>
             <version>${version.msv}</version>
+<!--
+            <scope>provided</scope>
+ -->
+            <optional>true</optional>
+            <!-- xercesImpl is unneeded since all modern JDKs already include it -->
+            <exclusions>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- use an isorelax version that has source code on Maven Central -->
+        <dependency>
+            <groupId>com.sun.xml.bind.jaxb</groupId>
+            <artifactId>isorelax</artifactId>
+            <version>20090621</version>
 <!--
             <scope>provided</scope>
  -->

From 06dfc28437aed9a4c850e0b03c002bb5e1781daa Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Tue, 26 Mar 2024 20:27:05 -0700
Subject: [PATCH 2/2] Update release notes wrt #200

---
 release-notes/CREDITS | 4 ++++
 release-notes/VERSION | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/release-notes/CREDITS b/release-notes/CREDITS
index f9f50d2..66d11da 100644
--- a/release-notes/CREDITS
+++ b/release-notes/CREDITS
@@ -100,3 +100,7 @@ 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)
+
+Jeremy Norris (@norrisjeremy)
+* Reported #200: Fix shading of `isorelax` dependency (and other msv-core components)
+ (6.6.2)
diff --git a/release-notes/VERSION b/release-notes/VERSION
index af2d6bb..b29022e 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -4,6 +4,11 @@ Project: woodstox
 === Releases ===
 ------------------------------------------------------------------------
 
+6.6.2 (26-Mar-2024)
+
+#200: Fix shading of `isorelax` dependency (and other msv-core components)
+ (reported, fix contribtued by Jeremy N)
+
 6.6.1 (26-Feb-2024)
 
 #193: Module `com.ctc.wstx` does not read a module that exports