[Jython-checkins] jython: Updated several extlibs to most recent versions as of this writing. Libs where
stefan.richthofer
jython-checkins at python.org
Fri May 26 18:56:28 EDT 2017
https://hg.python.org/jython/rev/f6b3ddbc1df8
changeset: 8097:f6b3ddbc1df8
user: Stefan Richthofer <stefan.richthofer at gmx.de>
date: Sat May 27 00:52:34 2017 +0200
summary:
Updated several extlibs to most recent versions as of this writing. Libs where an update attempt caused notable issues were left unmodified.
files:
NEWS | 8 +-
b/.idea/libraries/extlibs.xml | 79 +++++---
build.xml | 88 +++++----
extlibs/asm-5.0.4.jar | Bin
extlibs/asm-5.2.jar | Bin
extlibs/asm-commons-5.0.4.jar | Bin
extlibs/asm-commons-5.2.jar | Bin
extlibs/asm-util-5.0.4.jar | Bin
extlibs/asm-util-5.2.jar | Bin
extlibs/bcpkix-jdk15on-1.54.jar | Bin
extlibs/bcpkix-jdk15on-1.57.jar | Bin
extlibs/bcprov-jdk15on-1.54.jar | Bin
extlibs/bcprov-jdk15on-1.57.jar | Bin
extlibs/commons-compress-1.12.jar | Bin
extlibs/commons-compress-1.14.jar | Bin
extlibs/guava-20.0.jar | Bin
extlibs/guava-22.0-android.jar | Bin
extlibs/icu4j-58.1.jar | Bin
extlibs/icu4j-59_1.jar | Bin
extlibs/jffi-1.2.13.jar | Bin
extlibs/jffi-1.2.15.jar | Bin
extlibs/jffi-aarch64-Linux.jar | Bin
extlibs/jffi-ppc-AIX.jar | Bin
extlibs/jffi-ppc64-Linux.jar | Bin
extlibs/jffi-ppc64le-Linux.jar | Bin
extlibs/jffi-x86_64-OpenBSD.jar | Bin
extlibs/jline-2.14.2.jar | Bin
extlibs/jline-2.14.3.jar | Bin
extlibs/jnr-constants-0.9.5.jar | Bin
extlibs/jnr-constants-0.9.9.jar | Bin
extlibs/jnr-ffi-2.1.0.jar | Bin
extlibs/jnr-ffi-2.1.5.jar | Bin
extlibs/jnr-posix-3.0.31.jar | Bin
extlibs/jnr-posix-3.0.41.jar | Bin
extlibs/mysql-connector-java-5.1.42-bin.jar | Bin
extlibs/mysql-connector-java-5.1.6.jar | Bin
extlibs/netty-buffer-4.1.11.Final.jar | Bin
extlibs/netty-buffer-4.1.6.Final.jar | Bin
extlibs/netty-codec-4.1.11.Final.jar | Bin
extlibs/netty-codec-4.1.6.Final.jar | Bin
extlibs/netty-common-4.1.11.Final.jar | Bin
extlibs/netty-common-4.1.6.Final.jar | Bin
extlibs/netty-handler-4.1.11.Final.jar | Bin
extlibs/netty-handler-4.1.6.Final.jar | Bin
extlibs/netty-resolver-4.1.11.Final.jar | Bin
extlibs/netty-resolver-4.1.6.Final.jar | Bin
extlibs/netty-transport-4.1.11.Final.jar | Bin
extlibs/netty-transport-4.1.6.Final.jar | Bin
extlibs/postgresql-42.1.1.jre7.jar | Bin
extlibs/postgresql-8.3-603.jdbc4.jar | Bin
50 files changed, 97 insertions(+), 78 deletions(-)
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -85,6 +85,13 @@
- [ 1767 ] Rich comparisons
New Features
+ - Updated Netty to 4.1.11, ASM to 5.2, BouncyCastle to 1.57, Commons Compress to 1.14,
+ Guava to 22.0, ICU4J to 59.1, JFFI to 1.2.15, JNR-JFFI to 2.1.5, JNR-POSIX to 3.0.41,
+ JNR-Constants 0.9.9, JLine to 2.14.3, MySQL Connector to 5.1.42, PostgreSQL to 42.1.1
+ Note:
+ You might find it strange that Jython bundles guava-22.0-android.jar rather than guava-22.0.jar.
+ This is the official way to support Java 7 with Guava > 20.0, also on non-Android platforms.
+ See https://github.com/google/guava/wiki/Release22#guava-release-220-release-notes.
- Recognize cpython_cmd property to automatically build CPython bytecode for oversized
functions (e.g. jython -J-Dcpython_cmd=python). This is especially convenient when
installing things like SymPy via pip; it would frequently prompt you to provide yet
@@ -110,7 +117,6 @@
Python level or for client code using PyBuffer via the "fully encapsulated" API. It
risks breaking code that makes direct access to a byte array via PyBuffer, implements
the PyBuffer interface, or extends implementation classes in org.python.core.buffer.
- - Updated Netty to 4.1.4
- Fixed platform.mac_ver to provide actual info on Mac OS similar to CPython behavior.
- Added uname function to posix module. The mostly Java-based implementation even
works to some extend on non-posix systems (e.g. Windows).
diff --git a/b/.idea/libraries/extlibs.xml b/b/.idea/libraries/extlibs.xml
--- a/b/.idea/libraries/extlibs.xml
+++ b/b/.idea/libraries/extlibs.xml
@@ -1,45 +1,56 @@
<component name="libraryTable">
<library name="extlibs">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/extlibs/mysql-connector-java-5.1.6.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi-ppc64-Linux.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/stringtemplate-3.2.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jarjar-0.7.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-Windows.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/livetribe-jsr223-2.0.6.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/antlr-3.1.3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/antlr-runtime-3.1.3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/asm-5.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/asm-commons-5.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/asm-util-5.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/bcpkix-jdk15on-1.57.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/bcprov-jdk15on-1.57.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/commons-compress-1.14.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/guava-22.0-android.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/icu4j-59_1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jarjar-1.4.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/java-sizeof-0.0.5.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-1.2.15.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-aarch64-Linux.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-arm-Linux.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-Darwin.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-FreeBSD.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/antlr-3.1.3.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi-Darwin.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/libreadline-java-0.8.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-Linux.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-OpenBSD.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/asm-3.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jnr-netdb-0.4.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-Linux.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/profile.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi-s390x-Linux.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/asm-commons-3.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/guava-r07.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi-ppc-AIX.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/antlr-runtime-3.1.3.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/xercesImpl-2.11.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/xml-apis-2.11.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/servlet-api-2.5.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jnr-posix.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi-sparcv9-SunOS.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-OpenBSD.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/antlr-2.7.7.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-SunOS.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-Windows.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/asm-util-3.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-ppc64le-Linux.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-ppc64-Linux.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-ppc-AIX.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-ppc-Linux.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-s390x-Linux.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-sparc-SunOS.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-sparcv9-SunOS.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-FreeBSD.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-Linux.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-OpenBSD.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-SunOS.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jline-1.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi-ppc-Linux.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-Linux.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-FreeBSD.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/postgresql-8.3-603.jdbc4.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/jffi-sparc-SunOS.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/junit-3.8.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-Windows.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jline-2.14.3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jnr-constants-0.9.9.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jnr-ffi-2.1.5.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jnr-netdb-1.1.6.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/jnr-posix-3.0.41.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/junit-4.10.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/mysql-connector-java-5.1.42-bin.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/netty-buffer-4.1.11.Final.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/netty-codec-4.1.11.Final.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/netty-common-4.1.11.Final.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/netty-handler-4.1.11.Final.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/netty-resolver-4.1.11.Final.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/netty-transport-4.1.11.Final.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/postgresql-42.1.1.jre7.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/profile.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/servlet-api-2.5.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/xercesImpl-2.11.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -142,31 +142,31 @@
<pathelement path="${extlibs.dir}/servlet-api-2.5.jar" />
<pathelement path="${informix.jar}" />
<pathelement path="${oracle.jar}" />
- <pathelement path="${extlibs.dir}/mysql-connector-java-5.1.6.jar" />
- <pathelement path="${extlibs.dir}/postgresql-8.3-603.jdbc4.jar" />
+ <pathelement path="${extlibs.dir}/mysql-connector-java-5.1.42-bin.jar" />
+ <pathelement path="${extlibs.dir}/postgresql-42.1.1.jre7.jar" />
<!-- pin to Antlr 3.1.3 until we upgrade parsing -->
<pathelement path="${extlibs.dir}/antlr-3.1.3.jar" />
<pathelement path="${extlibs.dir}/stringtemplate-3.2.1.jar" />
- <pathelement path="${extlibs.dir}/commons-compress-1.12.jar"/>
- <!-- pin to ASM 5.0.3 until we upgrade compilation -->
- <pathelement path="${extlibs.dir}/asm-5.0.4.jar" />
- <pathelement path="${extlibs.dir}/asm-commons-5.0.4.jar" />
- <pathelement path="${extlibs.dir}/asm-util-5.0.4.jar" />
- <pathelement path="${extlibs.dir}/guava-20.0.jar" />
- <pathelement path="${extlibs.dir}/icu4j-58.1.jar" />
- <pathelement path="${extlibs.dir}/jffi-1.2.13.jar"/>
+ <pathelement path="${extlibs.dir}/commons-compress-1.14.jar"/>
+ <!-- pin to ASM 5.2 until we upgrade compilation -->
+ <pathelement path="${extlibs.dir}/asm-5.2.jar" />
+ <pathelement path="${extlibs.dir}/asm-commons-5.2.jar" />
+ <pathelement path="${extlibs.dir}/asm-util-5.2.jar" />
+ <pathelement path="${extlibs.dir}/guava-22.0-android.jar" />
+ <pathelement path="${extlibs.dir}/icu4j-59_1.jar" />
+ <pathelement path="${extlibs.dir}/jffi-1.2.15.jar"/>
<pathelement path="${extlibs.dir}/java-sizeof-0.0.5.jar"/>
- <pathelement path="${extlibs.dir}/jnr-ffi-2.1.0.jar"/>
+ <pathelement path="${extlibs.dir}/jnr-ffi-2.1.5.jar"/>
<pathelement path="${extlibs.dir}/jnr-netdb-1.1.6.jar"/>
- <pathelement path="${extlibs.dir}/jnr-posix-3.0.31.jar"/>
- <pathelement path="${extlibs.dir}/jnr-constants-0.9.5.jar"/>
- <pathelement path="${extlibs.dir}/jline-2.14.2.jar"/>
- <pathelement path="${extlibs.dir}/netty-buffer-4.1.6.Final.jar"/>
- <pathelement path="${extlibs.dir}/netty-codec-4.1.6.Final.jar"/>
- <pathelement path="${extlibs.dir}/netty-common-4.1.6.Final.jar"/>
- <pathelement path="${extlibs.dir}/netty-handler-4.1.6.Final.jar"/>
- <pathelement path="${extlibs.dir}/netty-resolver-4.1.6.Final.jar"/>
- <pathelement path="${extlibs.dir}/netty-transport-4.1.6.Final.jar"/>
+ <pathelement path="${extlibs.dir}/jnr-posix-3.0.41.jar"/>
+ <pathelement path="${extlibs.dir}/jnr-constants-0.9.9.jar"/>
+ <pathelement path="${extlibs.dir}/jline-2.14.3.jar"/>
+ <pathelement path="${extlibs.dir}/netty-buffer-4.1.11.Final.jar"/>
+ <pathelement path="${extlibs.dir}/netty-codec-4.1.11.Final.jar"/>
+ <pathelement path="${extlibs.dir}/netty-common-4.1.11.Final.jar"/>
+ <pathelement path="${extlibs.dir}/netty-handler-4.1.11.Final.jar"/>
+ <pathelement path="${extlibs.dir}/netty-resolver-4.1.11.Final.jar"/>
+ <pathelement path="${extlibs.dir}/netty-transport-4.1.11.Final.jar"/>
</path>
<available property="informix.present" classname="com.informix.jdbc.IfxDriver" classpath="${informix.jar}" />
@@ -174,8 +174,8 @@
<path id="test.classpath">
<path refid="main.classpath"/>
- <pathelement path="${extlibs.dir}/asm-commons-4.0.jar" />
- <pathelement path="${extlibs.dir}/asm-util-4.0.jar" />
+ <pathelement path="${extlibs.dir}/asm-commons-5.2.jar" />
+ <pathelement path="${extlibs.dir}/asm-util-5.2.jar" />
<pathelement path="${extlibs.dir}/junit-4.10.jar" />
<pathelement path="${exposed.dir}" />
<pathelement path="${compile.dir}" />
@@ -552,36 +552,37 @@
<zipfileset src="extlibs/antlr-runtime-3.1.3.jar"/>
<rule pattern="org.antlr.runtime.**" result="org.python.antlr.runtime. at 1"/>
<!-- pin to ASM 5.0.3 until we upgrade compilation -->
- <zipfileset src="extlibs/asm-5.0.4.jar"/>
- <zipfileset src="extlibs/asm-commons-5.0.4.jar"/>
- <zipfileset src="extlibs/asm-util-5.0.4.jar"/>
+ <zipfileset src="extlibs/asm-5.2.jar"/>
+ <zipfileset src="extlibs/asm-commons-5.2.jar"/>
+ <zipfileset src="extlibs/asm-util-5.2.jar"/>
<rule pattern="org.objectweb.asm.**" result="org.python.objectweb.asm. at 1"/>
- <zipfileset src="extlibs/bcpkix-jdk15on-1.54.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/bcpkix-jdk15on-1.57.jar" excludes="META-INF/**"/>
<rule pattern="org.bouncycastle.**" result="org.python.bouncycastle. at 1"/>
- <zipfileset src="extlibs/bcprov-jdk15on-1.54.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/bcprov-jdk15on-1.57.jar" excludes="META-INF/**"/>
<rule pattern="org.bouncycastle.**" result="org.python.bouncycastle. at 1"/>
- <zipfileset src="extlibs/commons-compress-1.12.jar"/>
+ <zipfileset src="extlibs/commons-compress-1.14.jar"/>
<rule pattern="org.apache.**" result="org.python.apache. at 1"/>
- <zipfileset src="extlibs/guava-20.0.jar"/>
+ <zipfileset src="extlibs/guava-22.0-android.jar"/>
<rule pattern="com.google.**" result="org.python.google. at 1"/>
- <zipfileset src="extlibs/icu4j-58.1.jar"/>
+ <zipfileset src="extlibs/icu4j-59_1.jar"/>
<rule pattern="com.ibm.icu.**" result="org.python.icu. at 1"/>
- <zipfileset src="extlibs/netty-buffer-4.1.6.Final.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/netty-buffer-4.1.11.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty. at 1"/>
- <zipfileset src="extlibs/netty-codec-4.1.6.Final.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/netty-codec-4.1.11.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty. at 1"/>
- <zipfileset src="extlibs/netty-common-4.1.6.Final.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/netty-common-4.1.11.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty. at 1"/>
- <zipfileset src="extlibs/netty-handler-4.1.6.Final.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/netty-handler-4.1.11.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty. at 1"/>
- <zipfileset src="extlibs/netty-resolver-4.1.6.Final.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/netty-resolver-4.1.11.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty. at 1"/>
- <zipfileset src="extlibs/netty-transport-4.1.6.Final.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/netty-transport-4.1.11.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty. at 1"/>
<zipfileset src="${extlibs.dir}/java-sizeof-0.0.5.jar"/>
<rule pattern="com.carrotsearch.sizeof.**" result="org.python.sizeof. at 1"/>
<!-- these stub jars are pre-built in https://github.com/jnr/jffi/tree/master/archive
and rarely if ever change -->
+ <zipfileset src="extlibs/jffi-aarch64-Linux.jar"/>
<zipfileset src="extlibs/jffi-arm-Linux.jar"/>
<zipfileset src="extlibs/jffi-Darwin.jar"/>
<zipfileset src="extlibs/jffi-i386-FreeBSD.jar"/>
@@ -589,6 +590,7 @@
<zipfileset src="extlibs/jffi-i386-OpenBSD.jar"/>
<zipfileset src="extlibs/jffi-i386-SunOS.jar"/>
<zipfileset src="extlibs/jffi-i386-Windows.jar"/>
+ <zipfileset src="extlibs/jffi-ppc64le-Linux.jar"/>
<zipfileset src="extlibs/jffi-ppc-AIX.jar"/>
<zipfileset src="extlibs/jffi-ppc-Linux.jar"/>
<zipfileset src="extlibs/jffi-ppc64-Linux.jar"/>
@@ -601,17 +603,17 @@
<zipfileset src="extlibs/jffi-x86_64-SunOS.jar"/>
<zipfileset src="extlibs/jffi-x86_64-Windows.jar"/>
<!-- remainder of JNR, JFFI -->
- <zipfileset src="extlibs/jffi-1.2.13.jar"/>
- <zipfileset src="${extlibs.dir}/jnr-ffi-2.1.0.jar"/>
+ <zipfileset src="extlibs/jffi-1.2.15.jar"/>
+ <zipfileset src="${extlibs.dir}/jnr-ffi-2.1.5.jar"/>
<zipfileset src="${extlibs.dir}/jnr-netdb-1.1.6.jar"/>
- <zipfileset src="${extlibs.dir}/jnr-posix-3.0.31.jar"/>
- <zipfileset src="${extlibs.dir}/jnr-constants-0.9.5.jar"/>
+ <zipfileset src="${extlibs.dir}/jnr-posix-3.0.41.jar"/>
+ <zipfileset src="${extlibs.dir}/jnr-constants-0.9.9.jar"/>
<zipfileset src="extlibs/xercesImpl-2.11.0.jar" excludes="META-INF/services/*"/>
<rule pattern="org.apache.xml.**" result="org.python.apache.xml. at 1"/>
<rule pattern="org.apache.xerces.**" result="org.python.apache.xerces. at 1"/>
<rule pattern="org.apache.wml.**" result="org.python.apache.wml. at 1"/>
<rule pattern="org.apache.html.**" result="org.python.apache.html. at 1"/>
- <zipfileset src="extlibs/jline-2.14.2.jar"/>
+ <zipfileset src="extlibs/jline-2.14.3.jar"/>
<rule pattern="jline.**" result="org.python.jline. at 1"/>
<manifest>
<attribute name="Main-Class" value="org.python.util.jython" />
@@ -752,8 +754,8 @@
<include name="extlibs/**/*.jar" />
<!-- don't distribute jdbc jars -->
- <exclude name="extlibs/mysql-connector-java-5.1.6.jar" />
- <exclude name="extlibs/postgresql-8.3-603.jdbc4.jar" />
+ <exclude name="extlibs/mysql-connector-java-5.1.42-bin.jar" />
+ <exclude name="extlibs/postgresql-42.1.1.jre7.jar" />
<exclude name="extlibs/ifxjdbc.jar" />
<exclude name="extlibs/ojdbc14.jar" />
diff --git a/extlibs/asm-5.0.4.jar b/extlibs/asm-5.0.4.jar
deleted file mode 100644
index cdb283dd7f6d7d420ba0fca8ec23e1f38fc3b7c1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/asm-5.2.jar b/extlibs/asm-5.2.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..aea11818d5181162d58cb2c206cd2243f9357b30
GIT binary patch
[stripped]
diff --git a/extlibs/asm-commons-5.0.4.jar b/extlibs/asm-commons-5.0.4.jar
deleted file mode 100644
index e89265f1e6c315689b63f11eed9397bb2e7ab9ff..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/asm-commons-5.2.jar b/extlibs/asm-commons-5.2.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cdd2e45c99bdeceafb8cb78a0fa195a2cdb53a37
GIT binary patch
[stripped]
diff --git a/extlibs/asm-util-5.0.4.jar b/extlibs/asm-util-5.0.4.jar
deleted file mode 100644
index 59bf48fb0c14e21f9c85722e27035904d405219e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/asm-util-5.2.jar b/extlibs/asm-util-5.2.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..686c3f0d04245fc1ed2d6459d2ad265033e0d62d
GIT binary patch
[stripped]
diff --git a/extlibs/bcpkix-jdk15on-1.54.jar b/extlibs/bcpkix-jdk15on-1.54.jar
deleted file mode 100644
index 86f7f0be194c0671460eea7acc2bc0ea479e304b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/bcpkix-jdk15on-1.57.jar b/extlibs/bcpkix-jdk15on-1.57.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5ce7d5c5cc49c03102e3bb5248405b52431f9ebd
GIT binary patch
[stripped]
diff --git a/extlibs/bcprov-jdk15on-1.54.jar b/extlibs/bcprov-jdk15on-1.54.jar
deleted file mode 100644
index bd95185ae8129aa3781f43bc09a194c7bd4121b1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/bcprov-jdk15on-1.57.jar b/extlibs/bcprov-jdk15on-1.57.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5a10986b3aac075df6f5400028cf2a6a0a8eb9fa
GIT binary patch
[stripped]
diff --git a/extlibs/commons-compress-1.12.jar b/extlibs/commons-compress-1.12.jar
deleted file mode 100644
index 4867705ea099d7ec5fd28e71451b3d4462d76b7d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/commons-compress-1.14.jar b/extlibs/commons-compress-1.14.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7490eb8996c5dd7b9be15ff01519767b10e907dc
GIT binary patch
[stripped]
diff --git a/extlibs/guava-20.0.jar b/extlibs/guava-20.0.jar
deleted file mode 100644
index 632772f3a4d2197c0247cf32031fb489f1531446..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/guava-22.0-android.jar b/extlibs/guava-22.0-android.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..53a6c5cc369889ac0345959a8f8791fd0550b5b2
GIT binary patch
[stripped]
diff --git a/extlibs/icu4j-58.1.jar b/extlibs/icu4j-58.1.jar
deleted file mode 100644
index de0792be150a87b3b6cdeaec1daadd242420be62..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/icu4j-59_1.jar b/extlibs/icu4j-59_1.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3dc69c8a12f4d66001fe41d9e7ea26a41471c6bf
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-1.2.13.jar b/extlibs/jffi-1.2.13.jar
deleted file mode 100644
index 44c539a307e591cc05d193ea4d099b1c6bcca624..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-1.2.15.jar b/extlibs/jffi-1.2.15.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0a100f9742d3e84700417890dc3b9ebb1ca35538
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-aarch64-Linux.jar b/extlibs/jffi-aarch64-Linux.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1d4438e3fdd467539cd11a738367b84d4a97002a
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-ppc-AIX.jar b/extlibs/jffi-ppc-AIX.jar
index 8235a3484884243b1d17d5e19340e4166f3b0b55..eed0ab732698e3c105f16622b02ce388e94eefec
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-ppc64-Linux.jar b/extlibs/jffi-ppc64-Linux.jar
index 8235a3484884243b1d17d5e19340e4166f3b0b55..cfae4bbf633cdf2c493464f99def993bf1b01728
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-ppc64le-Linux.jar b/extlibs/jffi-ppc64le-Linux.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7931dd1c2734ad45b5a3e8554a181b5179a37aae
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-x86_64-OpenBSD.jar b/extlibs/jffi-x86_64-OpenBSD.jar
index 8235a3484884243b1d17d5e19340e4166f3b0b55..3e14e03e403e162bcb929763a5d3f8206cac4e90
GIT binary patch
[stripped]
diff --git a/extlibs/jline-2.14.2.jar b/extlibs/jline-2.14.2.jar
deleted file mode 100644
index 02683de89cf5c6dbbe9abb0caf363347dc36ba07..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jline-2.14.3.jar b/extlibs/jline-2.14.3.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1dd3ef4660637fff87aea40662f54a635f29e141
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-constants-0.9.5.jar b/extlibs/jnr-constants-0.9.5.jar
deleted file mode 100644
index 41bd7637e405ac68b493249f2607a1c45f18fc94..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-constants-0.9.9.jar b/extlibs/jnr-constants-0.9.9.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a877bc42b6df7755e5eab266139a1c5bd8076a4d
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-ffi-2.1.0.jar b/extlibs/jnr-ffi-2.1.0.jar
deleted file mode 100644
index b3b3f031378bab1aeda322275862c5a368cf6b43..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-ffi-2.1.5.jar b/extlibs/jnr-ffi-2.1.5.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0ada90e99e8da8e25cdd32ef72bde55f602349f2
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-posix-3.0.31.jar b/extlibs/jnr-posix-3.0.31.jar
deleted file mode 100644
index ca14e7f8576de662403be519116816a8caa1085a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-posix-3.0.41.jar b/extlibs/jnr-posix-3.0.41.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a5f72ca042cf9e7d87fb0f46b8cef8470dbe8938
GIT binary patch
[stripped]
diff --git a/extlibs/mysql-connector-java-5.1.42-bin.jar b/extlibs/mysql-connector-java-5.1.42-bin.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4c6df38c142a66e1a8ed0a39358484eb71425a6b
GIT binary patch
[stripped]
diff --git a/extlibs/mysql-connector-java-5.1.6.jar b/extlibs/mysql-connector-java-5.1.6.jar
deleted file mode 100644
index 0539039f716034c4896c8eaa81c075c7fa3bc997..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/netty-buffer-4.1.11.Final.jar b/extlibs/netty-buffer-4.1.11.Final.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..28d32ae3217b108d5f18e6b4c7f9b1a138963556
GIT binary patch
[stripped]
diff --git a/extlibs/netty-buffer-4.1.6.Final.jar b/extlibs/netty-buffer-4.1.6.Final.jar
deleted file mode 100644
index eb9571b132f76e9b58491abca25c87c4865a788f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/netty-codec-4.1.11.Final.jar b/extlibs/netty-codec-4.1.11.Final.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4e6c46b275dd8a053804768779c1c72e54cc6449
GIT binary patch
[stripped]
diff --git a/extlibs/netty-codec-4.1.6.Final.jar b/extlibs/netty-codec-4.1.6.Final.jar
deleted file mode 100644
index 46e6d3457e0de1631961b474936ee53d411c4ff9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/netty-common-4.1.11.Final.jar b/extlibs/netty-common-4.1.11.Final.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c1db5980b47cf3db66b97591c8ded843f12bd12a
GIT binary patch
[stripped]
diff --git a/extlibs/netty-common-4.1.6.Final.jar b/extlibs/netty-common-4.1.6.Final.jar
deleted file mode 100644
index f119295ae4dada6c4224580d7f05148369fdcd3d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/netty-handler-4.1.11.Final.jar b/extlibs/netty-handler-4.1.11.Final.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..19c510eada2ebb2ce3ae6508caa762407f48d742
GIT binary patch
[stripped]
diff --git a/extlibs/netty-handler-4.1.6.Final.jar b/extlibs/netty-handler-4.1.6.Final.jar
deleted file mode 100644
index 283ae99a7dd1036ca05c40bf06bbc06250d2eeea..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/netty-resolver-4.1.11.Final.jar b/extlibs/netty-resolver-4.1.11.Final.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..41340f7b49e7df18e8a609697992da38ff07b95f
GIT binary patch
[stripped]
diff --git a/extlibs/netty-resolver-4.1.6.Final.jar b/extlibs/netty-resolver-4.1.6.Final.jar
deleted file mode 100644
index 1a9975797464c9b9b56bc2d487509037bfd296df..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/netty-transport-4.1.11.Final.jar b/extlibs/netty-transport-4.1.11.Final.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..59843cf314ebcb8f0ea7c5025a45a9c9cd1c6f10
GIT binary patch
[stripped]
diff --git a/extlibs/netty-transport-4.1.6.Final.jar b/extlibs/netty-transport-4.1.6.Final.jar
deleted file mode 100644
index b9610fee2e6f3068a92f26cd636414741a37ac5a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/postgresql-42.1.1.jre7.jar b/extlibs/postgresql-42.1.1.jre7.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..99b60a33847013f7f9b9b532cc92eccdb4e8baec
GIT binary patch
[stripped]
diff --git a/extlibs/postgresql-8.3-603.jdbc4.jar b/extlibs/postgresql-8.3-603.jdbc4.jar
deleted file mode 100644
index 0bf0de0577a1e52b9206ce72a1617f18af20d2d7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
--
Repository URL: https://hg.python.org/jython
More information about the Jython-checkins
mailing list