diff options
| author | Sam Berlin <sameb@google.com> | 2013-12-07 13:23:58 -0500 |
|---|---|---|
| committer | Sam Berlin <sameb@google.com> | 2013-12-07 13:23:58 -0500 |
| commit | 1047e98e4081bd874488a99b3e5d6975e38626f8 (patch) | |
| tree | f16b831bf247d62273e23a946c91ed86ab84061d /common.xml | |
| parent | e8120035bb4b7472bf855ad33e8fda38c94fbbbc (diff) | |
| download | guice-1047e98e4081bd874488a99b3e5d6975e38626f8.tar.gz | |
Fix no_aop build (make it easier to replace the cglib tokens in the ant build files).
Diffstat (limited to 'common.xml')
| -rw-r--r-- | common.xml | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -171,10 +171,7 @@ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/> <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar"> - <zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar"> - <include name="LICENSE"/> - <include name="NOTICE"/> - </zipfileset> + <zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar"><include name="LICENSE"/><include name="NOTICE"/></zipfileset> <fileset dir="${build.dir}/classes"/> <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/> <rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/> |