[Jython-checkins] jython: Upgrade Jar Jar Links to 1.4 to fix bug 2129

[jim.baker]

http://hg.python.org/jython/rev/a5bc0032cf79
changeset:   7209:a5bc0032cf79
user:        Jim Baker <jim.baker at rackspace.com>
date:        Tue Apr 22 15:02:43 2014 -0600
summary:
  Upgrade Jar Jar Links to 1.4 to fix bug 2129

files:
  build.xml              |    4 ++--
  extlibs/jarjar-0.7.jar |  Bin 
  extlibs/jarjar-1.4.jar |  Bin 
  3 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -565,7 +565,7 @@
     </target>
 
     <target name="jar-complete" depends="jar">
-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/>
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-1.4.jar"/>
         <jarjar destfile="${dist.dir}/${jython.deploy.jar}">
             <zipfileset src="${dist.dir}/${jython.dev.jar}"/>
             <zipfileset src="extlibs/antlr-runtime-3.1.3.jar"/>
@@ -628,7 +628,7 @@
     </target>
 
 <target name="jar-standalone" depends="jar-complete, copy-lib">
-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/>
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-1.4.jar"/>
         <jarjar destfile="${dist.dir}/${jython.standalone.jar}">
             <zipfileset src="${dist.dir}/${jython.deploy.jar}"/>
             <fileset dir="${dist.dir}" includes="Lib/**" excludes="Lib/test/**,Lib/email/test/**"/>
diff --git a/extlibs/jarjar-0.7.jar b/extlibs/jarjar-0.7.jar
deleted file mode 100644
index 7f1c4871f386981bbcd8b1dc3166b12920c80f4a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jarjar-1.4.jar b/extlibs/jarjar-1.4.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..68b9db9aa5049a8519af8ea6fdaafe0399e4da59
GIT binary patch
[stripped]

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