diff options
| author | Christian Edward Gruber <cgruber@google.com> | 2014-02-13 10:37:24 -0800 |
|---|---|---|
| committer | Christian Edward Gruber <cgruber@google.com> | 2014-02-13 10:41:42 -0800 |
| commit | 3236b100a95b739577dfcd117c24615370a1d0af (patch) | |
| tree | 98bf3967526d67be2edd0ddd0c1ae0ffeacaba09 /build.xml | |
| parent | bb63dc1a4fc5d5cec7692090856809bab75b4f8c (diff) | |
| download | guice-3236b100a95b739577dfcd117c24615370a1d0af.tar.gz | |
Replace guava 11 with 16 and extract Guava as a separate dependency.
Also, tidy up a teensy bit of test infrastructure, make sure OSGI test is excluded since it's designed for ant-only, and make maven tests fork, as they run out of permgen consistently. Lastly, make the build system enforce a 1.6 minimum, not a 1.5 minimum.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 31 |
1 files changed, 16 insertions, 15 deletions
@@ -31,34 +31,34 @@ <ant antfile="extensions/grapher/build.xml" target="distjars" inheritAll="false"/> <copy toDir="${build.dir}/dist"> - <fileset dir="extensions/servlet/build" includes="*.jar" excludes="*-with-deps.jar"/> + <fileset dir="extensions/servlet/build" includes="*.jar"/> </copy> <copy toDir="${build.dir}/dist"> - <fileset dir="extensions/spring/build" includes="*.jar" excludes="*-with-deps.jar"/> + <fileset dir="extensions/spring/build" includes="*.jar"/> </copy> <copy toDir="${build.dir}/dist"> - <fileset dir="extensions/struts2/build" includes="*.jar" excludes="*-with-deps.jar"/> + <fileset dir="extensions/struts2/build" includes="*.jar"/> </copy> <copy toDir="${build.dir}/dist"> - <fileset dir="extensions/assistedinject/build" includes="*.jar" excludes="*-with-deps.jar"/> + <fileset dir="extensions/assistedinject/build" includes="*.jar"/> </copy> <copy toDir="${build.dir}/dist"> - <fileset dir="extensions/jmx/build" includes="*.jar" excludes="*-with-deps.jar"/> + <fileset dir="extensions/jmx/build" includes="*.jar"/> </copy> <copy toDir="${build.dir}/dist"> - <fileset dir="extensions/jndi/build" includes="*.jar" excludes="*-with-deps.jar"/> + <fileset dir="extensions/jndi/build" includes="*.jar"/> </copy> <copy toDir="${build.dir}/dist"> - <fileset dir="extensions/throwingproviders/build" includes="*.jar" excludes="*-with-deps.jar"/> + <fileset dir="extensions/throwingproviders/build" includes="*.jar"/> </copy> <copy toDir="${build.dir}/dist"> - <fileset dir="extensions/multibindings/build" includes="*.jar" excludes="*-with-deps.jar"/> + <fileset dir="extensions/multibindings/build" includes="*.jar"/> </copy> <copy toDir="${build.dir}/dist"> - <fileset dir="extensions/persist/build" includes="*.jar" excludes="*-with-deps.jar"/> + <fileset dir="extensions/persist/build" includes="*.jar"/> </copy> <copy toDir="${build.dir}/dist"> - <fileset dir="extensions/grapher/build" includes="*.jar" excludes="*-with-deps.jar"/> + <fileset dir="extensions/grapher/build" includes="*.jar"/> </copy> <copy toDir="${build.dir}/dist" file="COPYING"/> @@ -93,7 +93,7 @@ </target> <target name="test.dist.run" - depends="jar, test.compile-with-deps" + depends="jar, test.withdeps" description="Execute JUnit tests against distribution jar with the given jvmarg."> <java fork="true" classname="junit.textui.TestRunner" @@ -102,11 +102,12 @@ <classpath> <pathelement location="${build.dir}/guice-${version}-tests.jar"/> <pathelement location="${build.dir}/dist/guice-${version}.jar"/> + <pathelement location="lib/javax.inject.jar"/> <pathelement location="lib/aopalliance.jar"/> + <pathelement location="lib/guava-16.0.1.jar"/> <pathelement location="lib/build/junit.jar"/> <pathelement location="lib/build/servlet-api-2.5.jar"/> <pathelement location="lib/build/easymock.jar"/> - <pathelement location="lib/javax.inject.jar"/> <pathelement location="lib/build/javax.inject-tck.jar"/> <pathelement location="lib/build/bnd-0.0.384.jar"/> <pathelement location="lib/build/felix-2.0.5.jar"/> @@ -134,7 +135,7 @@ <javadoc packagenames="com.google.*" docletpath="${jdiff.home}/jdiff.jar${path.separator}${jdiff.home}/xerces.jar" maxmemory="512M" - classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar"> + classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar${path.separator}lib/guava-16.0.1.jar"> <fileset dir="${src.dir}" defaultexcludes="yes"> <include name="com/google/**"/> <exclude name="com/google/inject/internal/**"/> @@ -163,7 +164,7 @@ docletpath="${jdiff.home}/jdiff.jar${path.separator}${jdiff.home}/xerces.jar" maxmemory="512M" sourcefiles="${jdiff.home}/Null.java" - classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar"> + classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar${path.separator}lib/guava-16.0.1.jar"> <doclet name="jdiff.JDiff"> <param name="-oldapi" value="${old.api}"/> <param name="-oldapidir" value="latest-api-diffs"/> @@ -183,7 +184,7 @@ docletpath="lib/build/doclava.jar" bootclasspath="${java.home}/lib/rt.jar" maxmemory="512M" - classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar"> + classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar${path.separator}lib/guava-16.0.1.jar"> <fileset dir="${src.dir}" defaultexcludes="yes"> <include name="com/google/**"/> <exclude name="com/google/inject/internal/**"/> |