Fix shading (jython#317)

Fixes jython#316
jeff5 · Mar 10, 2024 · f0afabb · f0afabb
1 parent bc9d859
commit f0afabb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -20,6 +20,7 @@ New Features
 
 
 Jython 2.7.4a1 Bugs fixed
+    - [ GH-316 ] PR313 cause regression
     - [ GH-310 ] CVE-2024-25710 and CVE-2024-26308 (commons-compress)
     - [ GH-304 ] from java import * not working in Java 21
     - [ GH-302 ] Interactive interpreter awaits input instead of raising syntax error

diff --git a/build.xml b/build.xml
@@ -854,9 +854,9 @@ The text for an official release would continue like ...
             <zipfileset src="extlibs/bcpkix-jdk18on-1.77.jar" excludes="META-INF/**"/>
             <zipfileset src="extlibs/bcprov-jdk18on-1.77.jar" excludes="META-INF/**"/>
             <rule pattern="org.bouncycastle.**" result="org.python.bouncycastle.@1"/>
-            <zipfileset src="extlibs/commons-compress-1.26.0.jar"/>
+            <zipfileset src="extlibs/commons-compress-1.26.0.jar" excludes="META-INF/versions/9/module-info.class"/>
             <rule pattern="org.apache.commons.compress.**" result="org.python.apache.commons.compress.@1"/>
-            <zipfileset src="extlibs/commons-io-2.15.1.jar"/>
+            <zipfileset src="extlibs/commons-io-2.15.1.jar" excludes="META-INF/versions/9/module-info.class"/>
             <rule pattern="org.apache.commons.io.**" result="org.python.apache.commons.io.@1"/>
             <zipfileset src="extlibs/failureaccess-1.0.1.jar"/>
             <zipfileset src="extlibs/guava-32.1.2-jre.jar"/>