[Jython-checkins] jython: Update jarjar JAR to 1.7.2 (fixes #2806).

[jeff.allen]

https://hg.python.org/jython/rev/1a493dfcd2f1
changeset:   8302:1a493dfcd2f1
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Fri Oct 04 07:53:37 2019 +0100
summary:
  Update jarjar JAR to 1.7.2 (fixes #2806).

We now source jarjar from pantsbuild.org, as tonicsystems.com does not
seem to maintain it, and jarjar-1.4 does not work with Java 8. ASM is
now found on the class path, hence the Ant build change.

files:
  NEWS                     |    1 +
  build.xml                |    9 ++++++---
  extlibs/jarjar-1.4.jar   |  Bin 
  extlibs/jarjar-1.7.2.jar |  Bin 
  4 files changed, 7 insertions(+), 3 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@
 
 Development tip
   Bugs fixed
+    - [ 2806 ] Installer contains dependencies unshaded (Java 8)
     - [ 2666 ] Oracle JDK 7 out of support so no longer available on Travis
     - [ 2294 ] Importation of modules from directories with non-ASCII characters fails
     - [ 2055 ] isinstance() and issubclass() fail with abc.ABCMeta
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -817,9 +817,12 @@
     </target>
 
     <target name="jar-complete" depends="jar, pycompile">
-        <taskdef name="jarjar"
-                 classname="com.tonicsystems.jarjar.JarJarTask"
-                 classpath="extlibs/jarjar-1.4.jar"/>
+        <taskdef name="jarjar" classname="org.pantsbuild.jarjar.JarJarTask">
+            <classpath>
+                <pathelement path="extlibs/jarjar-1.7.2.jar" />
+                <path refid="main.classpath" />
+            </classpath>
+        </taskdef>
         <jarjar destfile="${dist.dir}/${jython.deploy.jar}"  update="${jar.update}">
             <zipfileset src="${dist.dir}/${jython.dev.jar}"/>
             <!-- pin to Antlr 3 until we upgrade parsing -->
diff --git a/extlibs/jarjar-1.4.jar b/extlibs/jarjar-1.4.jar
deleted file mode 100644
index 68b9db9aa5049a8519af8ea6fdaafe0399e4da59..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jarjar-1.7.2.jar b/extlibs/jarjar-1.7.2.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..305260ea8d3f96d4240021a8334fc13e7a69188d
GIT binary patch
[stripped]

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