Fix for issue 254.
http://code.google.com/p/google-guice/issues/detail?id=254
This solution is unfortunate but it works... For each extension like assistedinject, we use jarjar to create a .jar with all dependencies embedded. This classes in this jar have "imports" that point at the .internal versions of our libraries.
Then we create a second jar that's a copy of the first without the internal/ package. This way Guice only includes one copy of collections, etc.
It would be convenient if jarjar had a feature where it could remap imports without actually embedding 'em.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@706 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/build.xml b/build.xml
index e092ccf..98c3e2d 100644
--- a/build.xml
+++ b/build.xml
@@ -9,22 +9,12 @@
<fileset dir="${lib.dir}/build" includes="*.jar"/>
</path>
- <target name="jar" depends="compile, manifest"
- description="Build jar.">
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
- classpath="lib/build/jarjar-1.0rc8.jar"/>
- <mkdir dir="${build.dir}/dist"/>
- <jarjar jarfile="${build.dir}/dist/guice-${version}.jar"
+
+ <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
+ <jar jarfile="${build.dir}/dist/guice-${version}.jar"
manifest="${build.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.dir}/classes"/>
- <zipfileset src="lib/build/cglib-2.2.jar"/>
- <zipfileset src="lib/build/asm-3.1.jar"/>
- <zipfileset src="lib/build/google-collect-snapshot-20080530.jar"/>
- <rule pattern="com.google.common.**" result="com.google.inject.internal.@1"/>
- <rule pattern="net.sf.cglib.**" result="com.google.inject.internal.cglib.@1"/>
- <rule pattern="org.objectweb.asm.**" result="com.google.inject.internal.asm.@1"/>
- <keep pattern="com.google.inject.**"/>
- </jarjar>
+ <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"/>
+ </jar>
</target>
<target name="dist" depends="distjars, javadoc"
@@ -38,25 +28,25 @@
<ant antfile="extensions/commands/build.xml" target="distjars" inheritAll="false"/>
<copy toDir="${build.dir}/dist">
- <fileset dir="servlet/build" includes="*.jar"/>
+ <fileset dir="servlet/build" includes="*.jar" excludes="*-with-deps.jar"/>
</copy>
<copy toDir="${build.dir}/dist">
- <fileset dir="spring/build" includes="*.jar"/>
+ <fileset dir="spring/build" includes="*.jar" excludes="*-with-deps.jar"/>
</copy>
<copy toDir="${build.dir}/dist">
- <fileset dir="struts2/plugin/build" includes="*.jar"/>
+ <fileset dir="struts2/plugin/build" includes="*.jar" excludes="*-with-deps.jar"/>
</copy>
<copy toDir="${build.dir}/dist">
- <fileset dir="extensions/assistedinject/build" includes="*.jar"/>
+ <fileset dir="extensions/assistedinject/build" includes="*.jar" excludes="*-with-deps.jar"/>
</copy>
<copy toDir="${build.dir}/dist">
- <fileset dir="extensions/throwingproviders/build" includes="*.jar"/>
+ <fileset dir="extensions/throwingproviders/build" includes="*.jar" excludes="*-with-deps.jar"/>
</copy>
<copy toDir="${build.dir}/dist">
- <fileset dir="extensions/multibindings/build" includes="*.jar"/>
+ <fileset dir="extensions/multibindings/build" includes="*.jar" excludes="*-with-deps.jar"/>
</copy>
<copy toDir="${build.dir}/dist">
- <fileset dir="extensions/commands/build" includes="*.jar"/>
+ <fileset dir="extensions/commands/build" includes="*.jar" excludes="*-with-deps.jar"/>
</copy>
<copy toDir="${build.dir}/dist" file="COPYING"/>
@@ -69,7 +59,7 @@
</copy>
<zip destfile="${build.dir}/guice-${version}.zip">
- <zipfileset dir="${build.dir}/dist" prefix="guice-${version}"/>
+ <zipfileset dir="${build.dir}/dist" prefix="guice-${version}" excludes="*-src.jar"/>
</zip>
<zip destfile="${build.dir}/guice-${version}-src.zip">
<zipfileset dir="." prefix="guice-${version}-src"
diff --git a/common.xml b/common.xml
index 22796ee..e5444f6 100644
--- a/common.xml
+++ b/common.xml
@@ -104,4 +104,22 @@
depends="source.jar, jar"
description="Build jar files"/>
+ <target name="jar.withdeps" depends="compile"
+ description="Build jar with dependencies embedded.">
+ <mkdir dir="${build.dir}/dist"/>
+ <dirname property="common.basedir" file="${ant.file.common}"/>
+ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+ classpath="${common.basedir}/lib/build/jarjar-1.0rc8.jar"/>
+ <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
+ <fileset dir="${build.dir}/classes"/>
+ <zipfileset src="${common.basedir}/lib/build/cglib-2.2.jar"/>
+ <zipfileset src="${common.basedir}/lib/build/asm-3.1.jar"/>
+ <zipfileset src="${common.basedir}/lib/build/google-collect-snapshot-20080530.jar"/>
+ <rule pattern="com.google.common.**" result="com.google.inject.internal.@1"/>
+ <rule pattern="net.sf.cglib.**" result="com.google.inject.internal.cglib.@1"/>
+ <rule pattern="org.objectweb.asm.**" result="com.google.inject.internal.asm.@1"/>
+ <keep pattern="com.google.inject.**"/>
+ </jarjar>
+ </target>
+
</project>
diff --git a/extensions/assistedinject/build.xml b/extensions/assistedinject/build.xml
index 272a61d..ecb1623 100644
--- a/extensions/assistedinject/build.xml
+++ b/extensions/assistedinject/build.xml
@@ -10,12 +10,11 @@
<fileset dir="../../build/dist" includes="*.jar"/>
</path>
- <target name="jar" depends="compile, manifest"
- description="Build jar.">
- <mkdir dir="${build.dir}"/>
+ <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
<jar destfile="${build.dir}/${ant.project.name}-${version}.jar"
- manifest="${build.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.dir}/classes"/>
+ manifest="${build.dir}/META-INF/MANIFEST.MF">
+ <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"
+ excludes="com/google/inject/internal/**"/>
</jar>
</target>
diff --git a/extensions/commands/build.xml b/extensions/commands/build.xml
index 1d7860f..d932453 100644
--- a/extensions/commands/build.xml
+++ b/extensions/commands/build.xml
@@ -10,12 +10,11 @@
<fileset dir="../../build/dist" includes="*.jar"/>
</path>
- <target name="jar" depends="compile, manifest"
- description="Build jar.">
- <mkdir dir="${build.dir}"/>
+ <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
<jar destfile="${build.dir}/${ant.project.name}-${version}.jar"
- manifest="${build.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.dir}/classes"/>
+ manifest="${build.dir}/META-INF/MANIFEST.MF">
+ <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"
+ excludes="com/google/inject/internal/**"/>
</jar>
</target>
diff --git a/extensions/multibindings/build.xml b/extensions/multibindings/build.xml
index 3d14211..804851e 100644
--- a/extensions/multibindings/build.xml
+++ b/extensions/multibindings/build.xml
@@ -10,12 +10,11 @@
<fileset dir="../../build/dist" includes="*.jar"/>
</path>
- <target name="jar" depends="compile, manifest"
- description="Build jar.">
- <mkdir dir="${build.dir}"/>
+ <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
<jar destfile="${build.dir}/${ant.project.name}-${version}.jar"
- manifest="${build.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.dir}/classes"/>
+ manifest="${build.dir}/META-INF/MANIFEST.MF">
+ <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"
+ excludes="com/google/inject/internal/**"/>
</jar>
</target>
diff --git a/extensions/throwingproviders/build.xml b/extensions/throwingproviders/build.xml
index b69029b..b6367d6 100644
--- a/extensions/throwingproviders/build.xml
+++ b/extensions/throwingproviders/build.xml
@@ -10,12 +10,11 @@
<fileset dir="../../build/dist" includes="*.jar"/>
</path>
- <target name="jar" depends="compile, manifest"
- description="Build jar.">
- <mkdir dir="${build.dir}"/>
+ <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
<jar destfile="${build.dir}/${ant.project.name}-${version}.jar"
- manifest="${build.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.dir}/classes"/>
+ manifest="${build.dir}/META-INF/MANIFEST.MF">
+ <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"
+ excludes="com/google/inject/internal/**"/>
</jar>
</target>
diff --git a/servlet/build.xml b/servlet/build.xml
index 3140d27..db6a25f 100644
--- a/servlet/build.xml
+++ b/servlet/build.xml
@@ -12,12 +12,11 @@
<fileset dir="../build/dist" includes="*.jar"/>
</path>
- <target name="jar" depends="compile, manifest"
- description="Build jar.">
- <mkdir dir="${build.dir}"/>
+ <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
<jar destfile="${build.dir}/${ant.project.name}-${version}.jar"
- manifest="${build.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.dir}/classes"/>
+ manifest="${build.dir}/META-INF/MANIFEST.MF">
+ <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"
+ excludes="com/google/inject/internal/**"/>
</jar>
</target>
diff --git a/spring/build.xml b/spring/build.xml
index 2b02aad..2762b14 100644
--- a/spring/build.xml
+++ b/spring/build.xml
@@ -10,12 +10,11 @@
<fileset dir="../build/dist" includes="*.jar"/>
</path>
- <target name="jar" depends="compile, manifest"
- description="Build jar.">
- <mkdir dir="${build.dir}"/>
+ <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
<jar destfile="${build.dir}/${ant.project.name}-${version}.jar"
- manifest="${build.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.dir}/classes"/>
+ manifest="${build.dir}/META-INF/MANIFEST.MF">
+ <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"
+ excludes="com/google/inject/internal/**"/>
</jar>
</target>
diff --git a/struts2/plugin/build.xml b/struts2/plugin/build.xml
index efc3e10..ed668b4 100644
--- a/struts2/plugin/build.xml
+++ b/struts2/plugin/build.xml
@@ -10,12 +10,11 @@
<fileset dir="../../servlet/build" includes="*.jar"/>
</path>
- <target name="jar" depends="compile, manifest"
- description="Build jar.">
- <mkdir dir="${build.dir}"/>
+ <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
<jar destfile="${build.dir}/${ant.project.name}-${version}.jar"
- manifest="${build.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.dir}/classes"/>
+ manifest="${build.dir}/META-INF/MANIFEST.MF">
+ <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"
+ excludes="com/google/inject/internal/**"/>
</jar>
</target>