From 8c650d3cbacb2830afe2a85d7062e5cda72e7ad2 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Mon, 29 Mar 2010 10:44:27 +0000
Subject: QPID-2465: Set javac includeantruntime property in build files

Applying patch from Andrew Kennedy <andrew.international@gmail.com>


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@928701 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/build.xml              | 2 +-
 java/client/test/example_build.xml | 2 +-
 java/common.xml                    | 2 +-
 java/module.xml                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'java')

diff --git a/java/broker/build.xml b/java/broker/build.xml
index 6902049435..2401978381 100644
--- a/java/broker/build.xml
+++ b/java/broker/build.xml
@@ -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>
diff --git a/java/client/test/example_build.xml b/java/client/test/example_build.xml
index a12862be04..329c12982c 100644
--- a/java/client/test/example_build.xml
+++ b/java/client/test/example_build.xml
@@ -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"/>
diff --git a/java/common.xml b/java/common.xml
index bbde7b7f62..611be5a0b8 100644
--- a/java/common.xml
+++ b/java/common.xml
@@ -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>
 
diff --git a/java/module.xml b/java/module.xml
index 96401f2178..290b88b014 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -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"/>
-- 
cgit v1.2.1