aboutsummaryrefslogtreecommitdiff
path: root/common.xml
diff options
context:
space:
mode:
authorsberlin <sberlin@d779f126-a31b-0410-b53b-1d3aecad763e>2011-02-24 14:49:01 +0000
committersberlin <sberlin@d779f126-a31b-0410-b53b-1d3aecad763e>2011-02-24 14:49:01 +0000
commitbd7a14b0b5830a06f48337a3f02af308300abefd (patch)
tree4e3f78e0fe3cacbdc55029252f3779f9a11d1d6b /common.xml
parentb281953cbb22a77f858ca44d057c9448e3d49a28 (diff)
downloadguice-bd7a14b0b5830a06f48337a3f02af308300abefd.tar.gz
make sure tests can run in on dist code, and no_aop can still build.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1507 d779f126-a31b-0410-b53b-1d3aecad763e
Diffstat (limited to 'common.xml')
-rw-r--r--common.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/common.xml b/common.xml
index e3cbb02d..a318ab33 100644
--- a/common.xml
+++ b/common.xml
@@ -123,6 +123,10 @@
classpath="${common.basedir}/lib/build/jarjar-snapshot.jar"/>
<jarjar jarfile="${build.dir}/${ant.project.name}-${version}-tests.jar">
<fileset dir="${build.dir}/test"/>
+ <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"/>
+ <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/>
+ <rule pattern="org.objectweb.asm.**.*" result="com.google.inject.internal.asm.@1.$@2"/>
<rule pattern="com.google.inject.internal.util.*" result="com.google.inject.internal.util.$@1"/>
<rule pattern="com.google.inject.internal.util.**.*" result="com.google.inject.internal.util.@1.$@2"/>
<keep pattern="com.google.inject.**"/>