Fix no_aop build (make it easier to replace the cglib tokens in the ant build files).
diff --git a/build.xml b/build.xml
index d4a2558..148b3e7 100644
--- a/build.xml
+++ b/build.xml
@@ -256,10 +256,7 @@
<replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar"/>]]></replacetoken>
</replace>
<replace file="build/no_aop/common.xml" value="">
- <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar">
- <include name="LICENSE"/>
- <include name="NOTICE"/>
- </zipfileset>]]></replacetoken>
+ <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar"><include name="LICENSE"/><include name="NOTICE"/></zipfileset>]]></replacetoken>
</replace>
<replace file="build/no_aop/common.xml" value='Bundle-Name" value="$${ant.project.name} (no_aop)'>
<replacetoken><![CDATA[Bundle-Name" value="${ant.project.name}]]></replacetoken>
diff --git a/common.xml b/common.xml
index d3aa19d..1a7add9 100644
--- a/common.xml
+++ b/common.xml
@@ -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"/>