[Jython-checkins] jython: Upgrade Apache commons-compress to 1.18 (fixes #2762)

[jeff.allen]

https://hg.python.org/jython/rev/37616d952bde
changeset:   8243:37616d952bde
user:        James Mudd <james.mudd at gmail.com>
date:        Sat May 11 06:30:20 2019 +0100
summary:
  Upgrade Apache commons-compress to 1.18 (fixes #2762)

files:
  NEWS                              |    1 +
  build.gradle                      |    2 +-
  build.xml                         |    4 ++--
  extlibs/commons-compress-1.14.jar |  Bin 
  extlibs/commons-compress-1.18.jar |  Bin 
  5 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@
 
 Development tip
   Bugs fixed
+    - [ 2762 ] Upgrade Apache commons-compress to 1.18
     - [ GH-108 ] Updates to JNR/JFFI to improve ARM HF support
     - [ 2445 ] Eclipse's DelegatingFeatureMap has MRO conflict (and IBM's MQQueue)
     - [ GH-121 ] Allow struct unpack and unpack_from bytearray and buffer
diff --git a/build.gradle b/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -147,7 +147,7 @@
     implementation 'org.antlr:antlr-runtime:3.1.3'
     implementation 'org.antlr:stringtemplate:3.2.1'
 
-    implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.14'
+    implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.18'
 
     implementation group: 'org.ow2.asm', name: 'asm', version: '7.0'
     implementation group: 'org.ow2.asm', name: 'asm-commons', version: '7.0'
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -146,7 +146,7 @@
             <pathelement path="${extlibs.dir}/postgresql-42.1.1.jre7.jar" />
             <!-- pin to Antlr 3 until we upgrade parsing -->
             <pathelement path="${extlibs.dir}/antlr-complete-3.5.2.jar" />
-            <pathelement path="${extlibs.dir}/commons-compress-1.14.jar"/>
+            <pathelement path="${extlibs.dir}/commons-compress-1.18.jar"/>
             <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" />
@@ -557,7 +557,7 @@
             <rule pattern="org.bouncycastle.**" result="org.python.bouncycastle. at 1"/>
             <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.14.jar"/>
+            <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"/>
             <rule pattern="com.google.**" result="org.python.google. at 1"/>
diff --git a/extlibs/commons-compress-1.14.jar b/extlibs/commons-compress-1.14.jar
deleted file mode 100644
index 7490eb8996c5dd7b9be15ff01519767b10e907dc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/commons-compress-1.18.jar b/extlibs/commons-compress-1.18.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e401046b5a6e5b1779fa8f50cc39dcd51a7da137
GIT binary patch
[stripped]

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