[Jython-checkins] jython: Upgrade Google guava JAR to 27.1 (fixes #2728)

[jeff.allen]

https://hg.python.org/jython/rev/a1ae652df5e3
changeset:   8245:a1ae652df5e3
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Sat May 11 20:11:32 2019 +0100
summary:
  Upgrade Google guava JAR to 27.1 (fixes #2728)

We add the failureaccess JAR because Google have unbundled some dependencies
into it, previously found in the guava JAR.

files:
  build.gradle                    |    4 +++-
  build.xml                       |    6 ++++--
  extlibs/failureaccess-1.0.1.jar |  Bin 
  extlibs/guava-22.0-android.jar  |  Bin 
  extlibs/guava-27.1-android.jar  |  Bin 
  5 files changed, 7 insertions(+), 3 deletions(-)


diff --git a/build.gradle b/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -156,7 +156,9 @@
     implementation group: 'org.ow2.asm', name: 'asm-commons', version: '7.0'
     implementation group: 'org.ow2.asm', name: 'asm-util', version: '7.0'
 
-    api group: 'com.google.guava', name: 'guava', version: '22.0-android'
+    api group: 'com.google.guava', name: 'guava', version: '27.1-android'
+    compile group: 'com.google.guava', name: 'failureaccess', version: '1.0.1'
+
     implementation group: 'com.ibm.icu', name: 'icu4j', version: '59.1'
 
     implementation group: 'com.carrotsearch', name: 'java-sizeof', version: '0.0.5'
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -150,7 +150,8 @@
             <pathelement path="${extlibs.dir}/asm-7.0.jar" />
             <pathelement path="${extlibs.dir}/asm-commons-7.0.jar" />
             <pathelement path="${extlibs.dir}/asm-util-7.0.jar" />
-            <pathelement path="${extlibs.dir}/guava-22.0-android.jar" />
+            <pathelement path="${extlibs.dir}/failureaccess-1.0.1.jar" />
+            <pathelement path="${extlibs.dir}/guava-27.1-android.jar" />
             <pathelement path="${extlibs.dir}/icu4j-59_1.jar" />
             <pathelement path="${extlibs.dir}/jffi-1.2.18.jar"/>
             <pathelement path="${extlibs.dir}/java-sizeof-0.0.5.jar"/>
@@ -559,7 +560,8 @@
             <rule pattern="org.bouncycastle.**" result="org.python.bouncycastle. at 1"/>
             <zipfileset src="extlibs/commons-compress-1.18.jar"/>
             <rule pattern="org.apache.**" result="org.python.apache. at 1"/>
-            <zipfileset src="extlibs/guava-22.0-android.jar"/>
+            <zipfileset src="extlibs/failureaccess-1.0.1.jar"/>
+            <zipfileset src="extlibs/guava-27.1-android.jar"/>
             <rule pattern="com.google.**" result="org.python.google. at 1"/>
             <zipfileset src="extlibs/icu4j-59_1.jar"/>
             <rule pattern="com.ibm.icu.**" result="org.python.icu. at 1"/>
diff --git a/extlibs/failureaccess-1.0.1.jar b/extlibs/failureaccess-1.0.1.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9b56dc751c1cc7dff75ed80ccbb45f027058e8ce
GIT binary patch
[stripped]
diff --git a/extlibs/guava-22.0-android.jar b/extlibs/guava-22.0-android.jar
deleted file mode 100644
index 53a6c5cc369889ac0345959a8f8791fd0550b5b2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/guava-27.1-android.jar b/extlibs/guava-27.1-android.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8648a6050037adf7b5eaccdf1c50f3f18d6f0740
GIT binary patch
[stripped]

-- 
Repository URL: https://hg.python.org/jython