[Jython-checkins] jython: Update JARs for JFFI (1.2.20) and ASM 7.1.
jeff.allen
jython-checkins at python.org
Sun Sep 22 16:37:15 EDT 2019
https://hg.python.org/jython/rev/dd91eabd8988
changeset: 8298:dd91eabd8988
user: Jeff Allen <ja.py at farowl.co.uk>
date: Sat Sep 21 20:26:42 2019 +0100
summary:
Update JARs for JFFI (1.2.20) and ASM 7.1.
Attempted update of JUnit to 4.12 caused a failure in complation of
tests (missing hamcrest classes), so pinning for now to 4.10.
files:
build.gradle | 9 +++++----
build.xml | 19 ++++++++++---------
extlibs/asm-7.0.jar | Bin
extlibs/asm-7.1.jar | Bin
extlibs/asm-commons-7.0.jar | Bin
extlibs/asm-commons-7.1.jar | Bin
extlibs/asm-util-7.0.jar | Bin
extlibs/asm-util-7.1.jar | Bin
extlibs/jffi-1.2.19.jar | Bin
extlibs/jffi-1.2.20.jar | Bin
10 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/build.gradle b/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -162,9 +162,9 @@
implementation 'org.bouncycastle:bcpkix-jdk15on:1.62'
implementation 'org.bouncycastle:bcprov-jdk15on:1.62'
- implementation 'org.ow2.asm:asm:7.0'
- implementation 'org.ow2.asm:asm-commons:7.0'
- implementation 'org.ow2.asm:asm-util:7.0'
+ implementation 'org.ow2.asm:asm:7.1'
+ implementation 'org.ow2.asm:asm-commons:7.1'
+ implementation 'org.ow2.asm:asm-util:7.1'
// The Android Guava and "failureaccess" are necessary to support Java 7.
implementation 'com.google.guava:guava:28.0-android'
@@ -175,7 +175,7 @@
implementation 'com.carrotsearch:java-sizeof:0.0.5'
- implementation 'com.github.jnr:jffi:1.2.19'
+ implementation 'com.github.jnr:jffi:1.2.20'
implementation 'com.github.jnr:jnr-netdb:1.1.6'
implementation 'com.github.jnr:jnr-ffi:2.1.10'
implementation 'com.github.jnr:jnr-posix:3.0.50'
@@ -193,6 +193,7 @@
// Used implicitly in the Ant build, must be explicit here
implementation 'org.apache.ant:ant:1.9.7'
+ // Pin to 4.10 until dependency on hamcrest classes resolved.
testImplementation 'junit:junit:4.10'
}
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -246,14 +246,14 @@
<!-- Other JARs (alphabetical) -->
<filelist dir="${extlibs.dir}">
<file name="antlr-complete-3.5.2.jar" /> <!-- ANTLR 3 until we upgrade parsing -->
- <file name="asm-7.0.jar" />
- <file name="asm-commons-7.0.jar" />
- <file name="asm-util-7.0.jar" />
+ <file name="asm-7.1.jar" />
+ <file name="asm-commons-7.1.jar" />
+ <file name="asm-util-7.1.jar" />
<file name="commons-compress-1.19.jar"/>
<file name="failureaccess-1.0.1.jar" />
<file name="guava-28.0-android.jar" />
<file name="icu4j-59_1.jar" />
- <file name="jffi-1.2.19.jar"/>
+ <file name="jffi-1.2.20.jar"/>
<file name="java-sizeof-0.0.5.jar"/>
<file name="jnr-ffi-2.1.10.jar"/>
<file name="jnr-netdb-1.1.6.jar"/>
@@ -272,6 +272,7 @@
<path id="test.classpath">
<path refid="main.classpath"/>
<filelist dir="${extlibs.dir}">
+ <!-- Pin to 4.10 until dependency on hamcrest classes resolved. -->
<file name="junit-4.10.jar" />
</filelist>
<pathelement location="${exposed.dir}" />
@@ -824,15 +825,15 @@
<!-- pin to Antlr 3 until we upgrade parsing -->
<zipfileset src="extlibs/antlr-runtime-3.5.2.jar"/>
<rule pattern="org.antlr.runtime.**" result="org.python.antlr.runtime. at 1"/>
- <zipfileset src="extlibs/asm-7.0.jar"/>
- <zipfileset src="extlibs/asm-commons-7.0.jar"/>
- <zipfileset src="extlibs/asm-util-7.0.jar"/>
+ <zipfileset src="extlibs/asm-7.1.jar"/>
+ <zipfileset src="extlibs/asm-commons-7.1.jar"/>
+ <zipfileset src="extlibs/asm-util-7.1.jar"/>
<rule pattern="org.objectweb.asm.**" result="org.python.objectweb.asm. at 1"/>
<zipfileset src="extlibs/bcpkix-jdk15on-1.62.jar" excludes="META-INF/**"/>
<rule pattern="org.bouncycastle.**" result="org.python.bouncycastle. at 1"/>
<zipfileset src="extlibs/bcprov-jdk15on-1.62.jar" excludes="META-INF/**"/>
<rule pattern="org.bouncycastle.**" result="org.python.bouncycastle. at 1"/>
- <zipfileset src="extlibs/commons-compress-1.18.jar"/>
+ <zipfileset src="extlibs/commons-compress-1.19.jar"/>
<rule pattern="org.apache.commons.compress.**" result="org.python.apache.commons.compress. at 1"/>
<zipfileset src="extlibs/failureaccess-1.0.1.jar"/>
<zipfileset src="extlibs/guava-28.0-android.jar"/>
@@ -876,7 +877,7 @@
<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.19.jar"/>
+ <zipfileset src="extlibs/jffi-1.2.20.jar"/>
<zipfileset src="${extlibs.dir}/jnr-ffi-2.1.10.jar"/>
<zipfileset src="${extlibs.dir}/jnr-netdb-1.1.6.jar"/>
<zipfileset src="${extlibs.dir}/jnr-posix-3.0.50.jar"/>
diff --git a/extlibs/asm-7.0.jar b/extlibs/asm-7.0.jar
deleted file mode 100644
index 2cf38f46167192e6d65c4906c77cd7e3dce5598d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/asm-7.1.jar b/extlibs/asm-7.1.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..355eb08db9df7112a17def5a2a6efa6ae2b9c975
GIT binary patch
[stripped]
diff --git a/extlibs/asm-commons-7.0.jar b/extlibs/asm-commons-7.0.jar
deleted file mode 100644
index ba0de6cd49dc34cb2ea5423b1a16f1122a44bdca..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/asm-commons-7.1.jar b/extlibs/asm-commons-7.1.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..31ffb987d5ee19917f7895a04b75cb1784a81567
GIT binary patch
[stripped]
diff --git a/extlibs/asm-util-7.0.jar b/extlibs/asm-util-7.0.jar
deleted file mode 100644
index 47717e5d18f9b3a6df1300c9872541b3c895d2bc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/asm-util-7.1.jar b/extlibs/asm-util-7.1.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5e61f2c10465a1a6c32f5a325dcd9ea017173bba
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-1.2.19.jar b/extlibs/jffi-1.2.19.jar
deleted file mode 100644
index b92013e1ca14f2785a9a44a41190d905c0d5d1fc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-1.2.20.jar b/extlibs/jffi-1.2.20.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..011e3afa864a1f80d25eddd0c7f623c2b9f19588
GIT binary patch
[stripped]
--
Repository URL: https://hg.python.org/jython
More information about the Jython-checkins
mailing list