Maarten, I see you removed the automatic download of ivy.jar from antoine web site. Was it on purpose?
Xavier On 1/8/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
Author: maartenc Date: Mon Jan 8 14:16:35 2007 New Revision: 494222 URL: http://svn.apache.org/viewvc?view=rev&rev=494222 Log: IVY-365: Set javac includeantruntime to false and declare explicitely JUnit and Ant dependencies IVY-162: ivy.xml doesn't contain all the dependencies Modified: incubator/ivy/trunk/build.xml incubator/ivy/trunk/ivy.xml Modified: incubator/ivy/trunk/build.xml URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/build.xml?view=diff&rev=494222&r1=494221&r2=494222 ============================================================================== --- incubator/ivy/trunk/build.xml (original) +++ incubator/ivy/trunk/build.xml Mon Jan 8 14:16:35 2007 @@ -19,8 +19,6 @@ <mkdir dir="${ivy.jar.dir}"/> <!-- download Ivy from web site so that it can be used even without any special installation --> <!-- use a non standard location during migration to apache --> - <get src=" http://people.apache.org/~antoine/ivy/ivy-${ivy.install.version}.jar"; - dest="${ivy.jar.file}" usetimestamp="true"/> </target> <target name="init-ivy" depends="download-ivy"> @@ -101,7 +99,7 @@ DEPENDENCY MNGT, COMPILATION AND JAR ================================================================= --> <target name="resolve" depends="init-ivy, prepare" unless=" no.resolve"> - <ivy:retrieve conf="default" /> + <ivy:retrieve conf="default,test" /> </target> <target name="build" depends="resolve"> @@ -110,7 +108,8 @@ classpathref="build.classpath" source="${ivy.minimum.javaversion}" target="${ivy.minimum.javaversion}" - debug="${debug.mode}"/> + debug="${debug.mode}" + includeantruntime="no"/> </target> <target name="jar" depends="build, default-version"> @@ -196,7 +195,8 @@ classpathref="run.classpath" source="${ivy.minimum.javaversion}" target="${ivy.minimum.javaversion}" - debug="${debug.mode}"/> + debug="${debug.mode}" + includeantruntime="no"/> <copy todir="${test.build.dir}"> <fileset dir="${test.dir}"> <exclude name="**/*.java"/> @@ -294,7 +294,7 @@ <zipfileset dir="${src.dir}/org/apache/ivy/xml" includes="ivy.xsd" fullpath="ivy-${build.version}/ivy.xsd"/> <zipfileset dir="${basedir}" includes="ivy.xml" fullpath="ivy-${build.version}/ivy.xml"/> - <zipfileset dir="${lib.dir}" prefix="ivy-${ build.version}/lib"/> + <zipfileset dir="${lib.dir}" prefix="ivy-${ build.version}/lib" excludes="junit*.jar,ant*.jar" /> <zipfileset dir="${artifacts.build.dir}" includes="ivy.jar" fullpath="ivy-${build.version}/ivy-${build.version }.jar"/> <zipfileset dir="${artifacts.build.dir}" includes="ivy-core.jar" fullpath="ivy-${build.version}/ivy-core-${ build.version}.jar"/> </zip> Modified: incubator/ivy/trunk/ivy.xml URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/ivy.xml?view=diff&rev=494222&r1=494221&r2=494222 ============================================================================== --- incubator/ivy/trunk/ivy.xml (original) +++ incubator/ivy/trunk/ivy.xml Mon Jan 8 14:16:35 2007 @@ -12,16 +12,19 @@ <conf name="sftp" extends="core" description="core + optional SFTP support" /> <conf name="standalone" extends="core" description="to launch in standalone mode (from command line)"/> <conf name="default" description="full ivy with all dependencies"/> + <conf name="test" description="dependencies used for junit testing ivy" visibility="private" /> </configurations> <publications> <artifact name="ivy" type="jar" conf="default"/> <artifact name="ivy-core" type="jar" conf="core"/> </publications> <dependencies> + <dependency org="apache" name="ant" rev="1.6.5" conf="default"/> <dependency org="apache" name="commons-httpclient" rev=" 3.0" conf="default,httpclient->default"/> <dependency org="apache" name="commons-cli" rev="1.0" conf="default,standalone->default"/> <dependency org="apache" name="oro" rev="2.0.8" conf="default,oro->default"/> <dependency org="apache" name="commons-vfs" rev="20060920" conf="vfs->default;default,webdav->webdav" /> <dependency org="jcraft" name="jsch" rev="0.1.25" conf="default,sftp->default" /> + <dependency org="junit" name="junit" rev="3.8.2" conf="test->default" /> </dependencies> </ivy-module>
