Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ New Features


Jython 2.7.5a1 Bugs fixed
- [ GH-349 ] Updating Netty JARs leads to errors in test_httplib and others
- [ GH-416 ] Solve serialization backward incompatibility of oversized methods and functions
- [ GH-234 ] Clarification on compile (Module or method too large)
- [ GH-413 ] Java 25 compatibility regressions.
Expand Down
15 changes: 7 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,13 @@ dependencies {

implementation 'jline:jline:2.14.6'

// Netty JARs currently pinned at 4.1.73 by issue #349.
// Later versions (tried .80, .112) produce test failures.
implementation 'io.netty:netty-buffer:4.1.73.Final'
implementation 'io.netty:netty-codec:4.1.73.Final'
implementation 'io.netty:netty-common:4.1.73.Final'
implementation 'io.netty:netty-handler:4.1.73.Final'
implementation 'io.netty:netty-resolver:4.1.73.Final'
implementation 'io.netty:netty-transport:4.1.73.Final'
implementation 'io.netty:netty-buffer:4.1.136.Final'
implementation 'io.netty:netty-codec:4.1.136.Final'
implementation 'io.netty:netty-common:4.1.136.Final'
implementation 'io.netty:netty-handler:4.1.136.Final'
implementation 'io.netty:netty-resolver:4.1.136.Final'
implementation 'io.netty:netty-transport:4.1.136.Final'
implementation 'io.netty:netty-transport-native-unix-common:4.1.136.Final'

// Used implicitly in the Ant build, must be explicit here
implementation 'org.apache.ant:ant:1.10.14'
Expand Down
31 changes: 15 additions & 16 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,13 @@ informix.jar = ../support/jdbc-4.10.12.jar
<file name="jnr-netdb-1.2.0.jar"/>
<file name="jnr-posix-3.1.22.jar"/>
<file name="jline-2.14.6.jar"/>
<!-- Netty JARs currently pinned at 4.1.73 by issue #349.
Later versions (tried .80, .112) produce test failures. -->
<file name="netty-buffer-4.1.73.Final.jar"/>
<file name="netty-codec-4.1.73.Final.jar"/>
<file name="netty-common-4.1.73.Final.jar"/>
<file name="netty-handler-4.1.73.Final.jar"/>
<file name="netty-resolver-4.1.73.Final.jar"/>
<file name="netty-transport-4.1.73.Final.jar"/>
<file name="netty-buffer-4.1.136.Final.jar"/>
<file name="netty-codec-4.1.136.Final.jar"/>
<file name="netty-common-4.1.136.Final.jar"/>
<file name="netty-handler-4.1.136.Final.jar"/>
<file name="netty-resolver-4.1.136.Final.jar"/>
<file name="netty-transport-4.1.136.Final.jar"/>
<file name="netty-transport-native-unix-common-4.1.136.Final.jar"/>
</filelist>
</path>

Expand Down Expand Up @@ -865,19 +864,19 @@ The text for an official release would continue like ...
<rule pattern="com.google.**" result="org.python.google.@1"/>
<zipfileset src="extlibs/icu4j-75.1.jar"/>
<rule pattern="com.ibm.icu.**" result="org.python.icu.@1"/>
<!-- Netty JARs currently pinned at 4.1.73 by issue #349.
Later versions (tried .80, .112) produce test failures. -->
<zipfileset src="extlibs/netty-buffer-4.1.73.Final.jar" excludes="META-INF/**"/>
<zipfileset src="extlibs/netty-buffer-4.1.136.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty.@1"/>
<zipfileset src="extlibs/netty-codec-4.1.73.Final.jar" excludes="META-INF/**"/>
<zipfileset src="extlibs/netty-codec-4.1.136.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty.@1"/>
<zipfileset src="extlibs/netty-common-4.1.73.Final.jar" excludes="META-INF/**"/>
<zipfileset src="extlibs/netty-common-4.1.136.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty.@1"/>
<zipfileset src="extlibs/netty-handler-4.1.73.Final.jar" excludes="META-INF/**"/>
<zipfileset src="extlibs/netty-handler-4.1.136.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty.@1"/>
<zipfileset src="extlibs/netty-resolver-4.1.73.Final.jar" excludes="META-INF/**"/>
<zipfileset src="extlibs/netty-resolver-4.1.136.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty.@1"/>
<zipfileset src="extlibs/netty-transport-4.1.73.Final.jar" excludes="META-INF/**"/>
<zipfileset src="extlibs/netty-transport-4.1.136.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty.@1"/>
<zipfileset src="extlibs/netty-transport-native-unix-common-4.1.136.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty.@1"/>
<zipfileset src="${extlibs.dir}/java-sizeof-0.0.5.jar"/>
<rule pattern="com.carrotsearch.sizeof.**" result="org.python.sizeof.@1"/>
Expand Down
Binary file added extlibs/netty-buffer-4.1.136.Final.jar
Binary file not shown.
Binary file removed extlibs/netty-buffer-4.1.73.Final.jar
Binary file not shown.
Binary file added extlibs/netty-codec-4.1.136.Final.jar
Binary file not shown.
Binary file removed extlibs/netty-codec-4.1.73.Final.jar
Binary file not shown.
Binary file added extlibs/netty-common-4.1.136.Final.jar
Binary file not shown.
Binary file removed extlibs/netty-common-4.1.73.Final.jar
Binary file not shown.
Binary file added extlibs/netty-handler-4.1.136.Final.jar
Binary file not shown.
Binary file removed extlibs/netty-handler-4.1.73.Final.jar
Binary file not shown.
Binary file not shown.
Binary file added extlibs/netty-transport-4.1.136.Final.jar
Binary file not shown.
Binary file removed extlibs/netty-transport-4.1.73.Final.jar
Binary file not shown.
Binary file not shown.
Loading