diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-16 15:04:38 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-08-16 15:04:38 +0300 |
| commit | 78bf54a568f846755406e32cbe707708ecf6eb68 (patch) | |
| tree | 05ab0971b419f86bdd0085acc1f14e75770b635b | |
| parent | 03a1b83a9ad153ed57ff44a82051b6ca6c82df1d (diff) | |
| download | vaadin-framework-78bf54a568f846755406e32cbe707708ecf6eb68.tar.gz vaadin-framework-78bf54a568f846755406e32cbe707708ecf6eb68.zip | |
Use JarJar from Ivy (#9299)
| -rw-r--r-- | build/build.xml | 5 | ||||
| -rw-r--r-- | build/common.xml | 7 | ||||
| -rw-r--r-- | build/ivy/ivy.xml | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/build/build.xml b/build/build.xml index 5ea0f1b4c7..88eb5d2662 100644 --- 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 2886a1698f..1fc6349a46 100644 --- 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 b3cca0d2ca..4231633e98 100644 --- 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"/> |