Use JarJar from Ivy (#9299)

diff --git a/build/build.xml b/build/build.xml
index 5ea0f1b4c77c8adf1668ae0780e2dc6c87512546..88eb5d2662b563cac47e9dd29293832022ab17ee 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -57,8 +57,6 @@
        <property name="gwt.user.dir" value="${gwt.root}/user"/>
        <property name="gwt.user.bin" value="${gwt.build.dir}/out/user/bin"/>
 
-       <property name="jarjar-jar" value="${gwt.tools.lib}/tonicsystems/jarjar-1.0rc8.jar"/>
-
                <!-- GWT -->
         <path id="gwt.dev.user.jars">
             <pathelement location="${gwt.user.jar}" />
@@ -850,9 +848,6 @@
         <mkdir dir="${output-dir}/META-INF"/>
         <echo file="${output-dir}/META-INF/VERSION">${version.full}</echo> 
                
-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
-            classpath="${jarjar-jar}"/>
-       
         <jarjar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}"
              compress="true" manifest="build/package/META-INF/MANIFEST.MF" duplicate="preserve" index="true">
             <metainf dir="${output-dir}/META-INF"/>

diff --git a/build/common.xml b/build/common.xml
index 2886a1698f13d917c71bd5658d13ef5a89bf93aa..1fc6349a4622fd14a1534846211a0d9640a2a1f8 100644 (file)
--- a/build/common.xml
+++ b/build/common.xml
@@ -49,7 +49,12 @@
         
         <!-- ant contrib for Maven integration -->    
         <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
-                 uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />        
+                 uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />
+       
+       <!-- jarjar -->
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+               classpathref="taskdefs.classpath"/>
+
     </target>
 
 </project>

diff --git a/build/ivy/ivy.xml b/build/ivy/ivy.xml
index b3cca0d2ca984e588550493693ed93065a231a03..4231633e98d2fcc315b27154cddf9197286fbddc 100644 (file)
--- a/build/ivy/ivy.xml
+++ b/build/ivy/ivy.xml
@@ -42,6 +42,7 @@
                <!-- Ant tasks -->      
                <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="taskdefs ->master"/>
                <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.0.10" conf="taskdefs ->master"/>
+               <dependency org="com.googlecode.jarjar" name="jarjar" rev="1.3" conf="taskdefs ->master"/>
                                
                <!-- Emma -->
                <dependency org="emma" name="emma_ant" rev="2.0.5312" conf="server.tests.extdep,taskdefs ->master"/>