Author: maartenc
Date: Mon Apr 9 21:11:18 2012
New Revision: 1311446
URL: http://svn.apache.org/viewvc?rev=1311446&view=rev
Log:
Avoid warning about not setting the includeAntRuntime on compilation (merged
from trunk).
Modified:
ant/ivy/core/branches/2.3.x/ (props changed)
ant/ivy/core/branches/2.3.x/src/example/configurations/jdbc-example/build.xml
ant/ivy/core/branches/2.3.x/src/example/configurations/multi-projects/filter-framework/build.xml
ant/ivy/core/branches/2.3.x/src/example/configurations/multi-projects/myapp/build.xml
ant/ivy/core/branches/2.3.x/src/example/dependence/dependee/build.xml
ant/ivy/core/branches/2.3.x/src/example/dependence/depender/build.xml
ant/ivy/core/branches/2.3.x/src/example/dual/project/build.xml
ant/ivy/core/branches/2.3.x/src/example/go-ivy/build.xml
ant/ivy/core/branches/2.3.x/src/example/multi-project/common/common.xml
Propchange: ant/ivy/core/branches/2.3.x/
------------------------------------------------------------------------------
Merged /ant/ivy/core/trunk:r1311444
Modified:
ant/ivy/core/branches/2.3.x/src/example/configurations/jdbc-example/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/example/configurations/jdbc-example/build.xml?rev=1311446&r1=1311445&r2=1311446&view=diff
==============================================================================
---
ant/ivy/core/branches/2.3.x/src/example/configurations/jdbc-example/build.xml
(original)
+++
ant/ivy/core/branches/2.3.x/src/example/configurations/jdbc-example/build.xml
Mon Apr 9 21:11:18 2012
@@ -55,7 +55,7 @@
================================= -->
<target name="run.dev" depends="resolve" description="--> compile and run
the project">
<mkdir dir="${build.dir}" />
- <javac srcdir="${src.dir}" destdir="${build.dir}"
classpathref="lib.run.dev.id" />
+ <javac srcdir="${src.dir}" destdir="${build.dir}"
classpathref="lib.run.dev.id" includeAntRuntime="false"/>
<copy todir="${build.dir}">
<fileset dir="${src.dir}" includes="**/*.properties"></fileset>
</copy>
@@ -69,7 +69,7 @@
================================= -->
<target name="run.prod" depends="resolve" description="--> compile and run
the project">
<mkdir dir="${build.dir}" />
- <javac srcdir="${src.dir}" destdir="${build.dir}"
classpathref="lib.run.prod.id"/>
+ <javac srcdir="${src.dir}" destdir="${build.dir}"
classpathref="lib.run.prod.id" includeAntRuntime="false"/>
<copy todir="${build.dir}">
<fileset dir="${src.dir}" includes="**/*.properties"></fileset>
</copy>
Modified:
ant/ivy/core/branches/2.3.x/src/example/configurations/multi-projects/filter-framework/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/example/configurations/multi-projects/filter-framework/build.xml?rev=1311446&r1=1311445&r2=1311446&view=diff
==============================================================================
---
ant/ivy/core/branches/2.3.x/src/example/configurations/multi-projects/filter-framework/build.xml
(original)
+++
ant/ivy/core/branches/2.3.x/src/example/configurations/multi-projects/filter-framework/build.xml
Mon Apr 9 21:11:18 2012
@@ -54,7 +54,7 @@
<target name="build" depends="clean, resolve" description="--> compile and
jar project">
<mkdir dir="${build.dir}" />
<mkdir dir="${distrib.dir}"/>
- <javac srcdir="${src.dir}" destdir="${build.dir}"
classpathref="compile.path.id"/>
+ <javac srcdir="${src.dir}" destdir="${build.dir}"
classpathref="compile.path.id" includeAntRuntime="false"/>
<jar destfile="${distrib.dir}/filter-api.jar" >
<fileset dir="${build.dir}">
<include name="filter/*.class"/>
Modified:
ant/ivy/core/branches/2.3.x/src/example/configurations/multi-projects/myapp/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/example/configurations/multi-projects/myapp/build.xml?rev=1311446&r1=1311445&r2=1311446&view=diff
==============================================================================
---
ant/ivy/core/branches/2.3.x/src/example/configurations/multi-projects/myapp/build.xml
(original)
+++
ant/ivy/core/branches/2.3.x/src/example/configurations/multi-projects/myapp/build.xml
Mon Apr 9 21:11:18 2012
@@ -53,7 +53,7 @@
================================= -->
<target name="build" depends="resolve" description="--> compile the
project">
<mkdir dir="${build.dir}" />
- <javac srcdir="${src.dir}" destdir="${build.dir}"
classpathref="lib.path.id" />
+ <javac srcdir="${src.dir}" destdir="${build.dir}"
classpathref="lib.path.id" includeAntRuntime="false"/>
</target>
<!-- =================================
Modified: ant/ivy/core/branches/2.3.x/src/example/dependence/dependee/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/example/dependence/dependee/build.xml?rev=1311446&r1=1311445&r2=1311446&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/example/dependence/dependee/build.xml
(original)
+++ ant/ivy/core/branches/2.3.x/src/example/dependence/dependee/build.xml Mon
Apr 9 21:11:18 2012
@@ -57,7 +57,7 @@
================================= -->
<target name="compile" depends="resolve" description="--> description">
<mkdir dir="${classes.dir}" />
- <javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="lib.path.id" />
+ <javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="lib.path.id" includeAntRuntime="false"/>
</target>
<!-- =================================
Modified: ant/ivy/core/branches/2.3.x/src/example/dependence/depender/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/example/dependence/depender/build.xml?rev=1311446&r1=1311445&r2=1311446&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/example/dependence/depender/build.xml
(original)
+++ ant/ivy/core/branches/2.3.x/src/example/dependence/depender/build.xml Mon
Apr 9 21:11:18 2012
@@ -68,7 +68,7 @@
================================= -->
<target name="compile" depends="resolve" description="--> description">
<mkdir dir="${classes.dir}" />
- <javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="lib.path.id" />
+ <javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="lib.path.id" includeAntRuntime="false"/>
</target>
<!-- =================================
Modified: ant/ivy/core/branches/2.3.x/src/example/dual/project/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/example/dual/project/build.xml?rev=1311446&r1=1311445&r2=1311446&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/example/dual/project/build.xml (original)
+++ ant/ivy/core/branches/2.3.x/src/example/dual/project/build.xml Mon Apr 9
21:11:18 2012
@@ -55,7 +55,7 @@
================================= -->
<target name="run" depends="resolve" description="--> compile and run the
project">
<mkdir dir="${build.dir}" />
- <javac srcdir="${src.dir}" destdir="${build.dir}"
classpathref="lib.path.id" />
+ <javac srcdir="${src.dir}" destdir="${build.dir}"
classpathref="lib.path.id" includeAntRuntime="false"/>
<java classpathref="run.path.id" classname="example.Hello"/>
</target>
Modified: ant/ivy/core/branches/2.3.x/src/example/go-ivy/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/example/go-ivy/build.xml?rev=1311446&r1=1311445&r2=1311446&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/example/go-ivy/build.xml (original)
+++ ant/ivy/core/branches/2.3.x/src/example/go-ivy/build.xml Mon Apr 9
21:11:18 2012
@@ -86,7 +86,7 @@
<echo message="compiling..."/>
<mkdir dir="${build.dir}" />
- <javac srcdir="${src.dir}" destdir="${build.dir}"
classpathref="lib.path.id" />
+ <javac srcdir="${src.dir}" destdir="${build.dir}"
classpathref="lib.path.id" includeAntRuntime="false"/>
<echo>
We are now ready to execute our simple program with its dependency on
commons-lang.
Modified:
ant/ivy/core/branches/2.3.x/src/example/multi-project/common/common.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/example/multi-project/common/common.xml?rev=1311446&r1=1311445&r2=1311446&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/example/multi-project/common/common.xml
(original)
+++ ant/ivy/core/branches/2.3.x/src/example/multi-project/common/common.xml Mon
Apr 9 21:11:18 2012
@@ -99,7 +99,7 @@
================================= -->
<target name="compile" depends="resolve" description="--> compile the
project">
<mkdir dir="${classes.dir}" />
- <javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="lib.path.id" debug="true" />
+ <javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="lib.path.id" debug="true" includeAntRuntime="false"/>
</target>
<!-- =================================
