You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by th...@apache.org on 2008/03/13 00:27:31 UTC
svn commit: r636574 - in /labs/droids/trunk: ivy.xml tools/ivy/ivy-1.4.1.jar
tools/ivy/ivy-2.0.0-beta2.jar tools/ivy/ivy-build.xml tools/ivy/ivyconf.xml
tools/ivy/repository/
Author: thorsten
Date: Wed Mar 12 16:27:30 2008
New Revision: 636574
URL: http://svn.apache.org/viewvc?rev=636574&view=rev
Log:
Updating ivy to ivy-2.0.0-beta2.jar and removing obsolete lib rep
Added:
labs/droids/trunk/tools/ivy/ivy-2.0.0-beta2.jar (with props)
Removed:
labs/droids/trunk/tools/ivy/ivy-1.4.1.jar
labs/droids/trunk/tools/ivy/ivyconf.xml
labs/droids/trunk/tools/ivy/repository/
Modified:
labs/droids/trunk/ivy.xml
labs/droids/trunk/tools/ivy/ivy-build.xml
Modified: labs/droids/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/labs/droids/trunk/ivy.xml?rev=636574&r1=636573&r2=636574&view=diff
==============================================================================
--- labs/droids/trunk/ivy.xml (original)
+++ labs/droids/trunk/ivy.xml Wed Mar 12 16:27:30 2008
@@ -24,17 +24,14 @@
<artifact name="org.apache.droids" type="jar" ext="jar"/>
</publications>
<dependencies>
- <dependency org="springframework" name="springframework" rev="latest.release">
- <conf name="core"/>
- </dependency>
+ <dependency org="org.springframework" name="spring-core" rev="2.5.1"/>
<dependency org="stax" name="stax-api" rev="1.0.1"/>
<dependency org="stax" name="stax" rev="1.2.0"/>
- <dependency org="jwsdp" name="stax-utils" rev="20070224"/>
- <dependency org="apache" name="commons-logging" rev="1.0.4"/>
- <dependency org="apache" name="nekoHtml" rev="0.9.5"/>
- <dependency org="org/apache/httpcomponents" name="httpclient" rev="4.0-alpha4-SNAPSHOT"/>
+ <dependency org="net.java.dev.stax-utils" name="stax-utils" rev="20040917"/>
+ <dependency org="nekohtml" name="nekohtml" rev="1.9.6.1"/>
+ <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.0-alpha3"/>
<!-- Backport if you need a 1.4 lib -->
<dependency org="net.sf.retrotranslator" name="retrotranslator-transformer" rev="1.2.4"/>
<dependency org="net.sf.retrotranslator" name="retrotranslator-runtime" rev="1.2.4"/>
</dependencies>
-</ivy-module>
\ No newline at end of file
+</ivy-module>
Added: labs/droids/trunk/tools/ivy/ivy-2.0.0-beta2.jar
URL: http://svn.apache.org/viewvc/labs/droids/trunk/tools/ivy/ivy-2.0.0-beta2.jar?rev=636574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: labs/droids/trunk/tools/ivy/ivy-2.0.0-beta2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: labs/droids/trunk/tools/ivy/ivy-build.xml
URL: http://svn.apache.org/viewvc/labs/droids/trunk/tools/ivy/ivy-build.xml?rev=636574&r1=636573&r2=636574&view=diff
==============================================================================
--- labs/droids/trunk/tools/ivy/ivy-build.xml (original)
+++ labs/droids/trunk/tools/ivy/ivy-build.xml Wed Mar 12 16:27:30 2008
@@ -1,24 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:ivy="antlib:fr.jayasoft.ivy.ant" name="hello-ivy"
+<project xmlns:ivy="antlib:org.apache.ivy.ant" name="hello-ivy"
default="ivy.resolve">
<property file="build.properties"/>
<property name="project.build.dir" location="build"/>
- <!-- The ivy classpath -->
- <path id="ivy.classpath">
- <fileset dir="${ivy.repository.dir}">
- <include name="*.jar"/>
- </fileset>
- </path>
- <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
- uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.classpath"/>
- <target name="ivy.configure">
- <ivy:configure file="${ivy.repository.dir}/ivyconf.xml"/>
- </target>
<!-- =================================
target: resolve
================================= -->
- <target name="ivy.resolve" depends="ivy.configure"
+ <target name="ivy.resolve" depends="load-ivy"
description="--> retreive dependencies with ivy">
<ivy:retrieve/>
</target>
@@ -26,8 +15,16 @@
description="--> generates a report of dependencies">
<ivy:report todir="${build.dir}"/>
</target>
- <target name="ivy.init">
- <ivy:cachepath pathid="project.core.class.path" conf="default"/>
- </target>
-
-</project>
\ No newline at end of file
+ <target name="load-ivy">
+ <!-- try to load ivy here from home ivy dir, in case the user has not already dropped
+ it into ant's lib dir (note that the latter copy will always take precedence).
+ We will not fail as long as ivy home lib dir exists (it may be empty) and
+ ivy is in at least one of ant's lib dir or the ivy home lib dir. -->
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.repository.dir}" includes="*.jar"/>
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+
+ </target>
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org