Author: robbie Date: Mon Mar 29 10:44:27 2010 New Revision: 928701 URL: http://svn.apache.org/viewvc?rev=928701&view=rev Log: QPID-2465: Set javac includeantruntime property in build files
Applying patch from Andrew Kennedy <[email protected]> Modified: qpid/trunk/qpid/java/broker/build.xml qpid/trunk/qpid/java/client/test/example_build.xml qpid/trunk/qpid/java/common.xml qpid/trunk/qpid/java/module.xml Modified: qpid/trunk/qpid/java/broker/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/build.xml?rev=928701&r1=928700&r2=928701&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/build.xml (original) +++ qpid/trunk/qpid/java/broker/build.xml Mon Mar 29 10:44:27 2010 @@ -52,7 +52,7 @@ <mkdir dir="${velocity.compile.dir}" /> <!-- Compile LogMessages Velocity Generator --> <javac source="${java.source}" target="${java.target}" - destdir="${velocity.compile.dir}" debug="on" + destdir="${velocity.compile.dir}" debug="on" includeantruntime="false" deprecation="${javac.deprecation}" srcdir="src/velocity/java" > <classpath> Modified: qpid/trunk/qpid/java/client/test/example_build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/test/example_build.xml?rev=928701&r1=928700&r2=928701&view=diff ============================================================================== --- qpid/trunk/qpid/java/client/test/example_build.xml (original) +++ qpid/trunk/qpid/java/client/test/example_build.xml Mon Mar 29 10:44:27 2010 @@ -66,7 +66,7 @@ <!-- Compile Java --> <target name="compile" depends="init"> - <javac destdir="${example.classes}" debug="on"> + <javac destdir="${example.classes}" debug="on" includeantruntime="false"> <classpath refid="example_amq.classpath"/> <src path="${example.src}"/> <exclude name="**/Test*.java"/> Modified: qpid/trunk/qpid/java/common.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=928701&r1=928700&r2=928701&view=diff ============================================================================== --- qpid/trunk/qpid/java/common.xml (original) +++ qpid/trunk/qpid/java/common.xml Mon Mar 29 10:44:27 2010 @@ -105,7 +105,7 @@ </macrodef> <mkdir dir="${tasks.classes}"/> - <javac source="${java.source}" target="${java.target}" srcdir="${tasks.src}" destdir="${tasks.classes}" classpath="${java.class.path}"> + <javac source="${java.source}" target="${java.target}" srcdir="${tasks.src}" destdir="${tasks.classes}" classpath="${java.class.path}" includeantruntime="false"> <compilerarg line="${javac.compiler.args}"/> </javac> Modified: qpid/trunk/qpid/java/module.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=928701&r1=928700&r2=928701&view=diff ============================================================================== --- qpid/trunk/qpid/java/module.xml (original) +++ qpid/trunk/qpid/java/module.xml Mon Mar 29 10:44:27 2010 @@ -188,7 +188,7 @@ <echo message="Targeting : ${java.target}" level="info"/> <javac source="${java.source}" target="${java.target}" - destdir="${module.classes}" debug="on" + destdir="${module.classes}" debug="on" includeantruntime="false" deprecation="${javac.deprecation}"> <compilerarg line="${javac.compiler.args}"/> <src refid="module.src.path"/> --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
