From 28008a3ff42811402257410eb5dd81eb2d996bf7 Mon Sep 17 00:00:00 2001
From: Jeff Allen <ja.py@farowl.co.uk>
Date: Tue, 20 Feb 2024 08:01:08 +0000
Subject: [PATCH] Exclude duplicate org.w3c.* from JARs (#307)

This change excludes from our JARs, classes from org.w3c packages that otherwise cause (post-Jigsaw) Java to object that there are two suppliers of org.w3c.dom.html. Fixes #288.
---
 NEWS      | 1 +
 build.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 8caeb8abf..195244e99 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ New Features
 Jython 2.7.4a1 Bugs fixed
     - [ GH-304 ] from java import * not working in Java 21
     - [ GH-302 ] Interactive interpreter awaits input instead of raising syntax error
+    - [ GH-288 ] Build fails when using java module
     - [ GH-280 ] LineNumberTable deprecated for removal in 2.6 still there
     - [ GH-277 ] Argument coercion fails for Java interface with default methods
     - [ GH-269 ] Upgrade Google Guava to 32.0.1 (CVE-2023-2976)
diff --git a/build.xml b/build.xml
index 36bcbd528..6807a70af 100644
--- a/build.xml
+++ b/build.xml
@@ -902,7 +902,8 @@ The text for an official release would continue like ...
             <zipfileset src="${extlibs.dir}/jnr-ffi-2.2.12.jar"/>
             <zipfileset src="${extlibs.dir}/jnr-netdb-1.2.0.jar"/>
             <zipfileset src="${extlibs.dir}/jnr-posix-3.1.15.jar"/>
-            <zipfileset src="extlibs/xercesImpl-2.12.2.jar" excludes="META-INF/services/*"/>
+            <zipfileset src="extlibs/xercesImpl-2.12.2.jar"
+                excludes="META-INF/services/*, org/w3c/**"/>
             <rule pattern="org.apache.xml.**" result="org.python.apache.xml.@1"/>
             <rule pattern="org.apache.xerces.**" result="org.python.apache.xerces.@1"/>
             <rule pattern="org.apache.wml.**" result="org.python.apache.wml.@1"/>