Merge branch '6.6'

FasterXML · Mar 27, 2024 · 1e812f5 · 1e812f5
2 parents eea9a78 + 06dfc28
commit 1e812f5
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 0 deletions.
diff --git 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>
  -->

diff --git 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
@@ -11,6 +11,11 @@ Project: woodstox
 #196: WstxSAXParser error handling when used with JAXB validation
  (reported by @winfriedgerlach)
 
+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