Skip to content

Commit 28008a3

Browse files
authored
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.
1 parent 9e30624 commit 28008a3

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ New Features
2222
Jython 2.7.4a1 Bugs fixed
2323
- [ GH-304 ] from java import * not working in Java 21
2424
- [ GH-302 ] Interactive interpreter awaits input instead of raising syntax error
25+
- [ GH-288 ] Build fails when using java module
2526
- [ GH-280 ] LineNumberTable deprecated for removal in 2.6 still there
2627
- [ GH-277 ] Argument coercion fails for Java interface with default methods
2728
- [ GH-269 ] Upgrade Google Guava to 32.0.1 (CVE-2023-2976)

build.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,8 @@ The text for an official release would continue like ...
902902
<zipfileset src="${extlibs.dir}/jnr-ffi-2.2.12.jar"/>
903903
<zipfileset src="${extlibs.dir}/jnr-netdb-1.2.0.jar"/>
904904
<zipfileset src="${extlibs.dir}/jnr-posix-3.1.15.jar"/>
905-
<zipfileset src="extlibs/xercesImpl-2.12.2.jar" excludes="META-INF/services/*"/>
905+
<zipfileset src="extlibs/xercesImpl-2.12.2.jar"
906+
excludes="META-INF/services/*, org/w3c/**"/>
906907
<rule pattern="org.apache.xml.**" result="org.python.apache.xml.@1"/>
907908
<rule pattern="org.apache.xerces.**" result="org.python.apache.xerces.@1"/>
908909
<rule pattern="org.apache.wml.**" result="org.python.apache.wml.@1"/>

0 commit comments

Comments
 (0)