Author: rgardler
Date: Wed Feb 28 04:01:01 2007
New Revision: 512720
URL: http://svn.apache.org/viewvc?view=rev&rev=512720
Log:
- Use the "new" official apache repos (thanks David)
- remove some jars that are presnt in these "new" repos but not in the old ones
- change the chaperon dependency to one found in ibiblio as the original was
only available in one of the "old" repo's - need to verify this is in fact the
correct jar
Modified:
forrest/branches/ivyBuild/main/ivy.xml
forrest/branches/ivyBuild/tools/ivy/ivyconf.xml
Modified: forrest/branches/ivyBuild/main/ivy.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/ivyBuild/main/ivy.xml?view=diff&rev=512720&r1=512719&r2=512720
==============================================================================
--- forrest/branches/ivyBuild/main/ivy.xml (original)
+++ forrest/branches/ivyBuild/main/ivy.xml Wed Feb 28 04:01:01 2007
@@ -34,11 +34,15 @@
</publications>
<dependencies>
- <dependency org="apache" name="avalon-framework-impl" rev="4.3" />
+ <dependency org="avalon-framework" name="avalon-framework-impl" rev="4.3"
/>
<dependency org="apache" name="batik-all" rev="1.6"/>
<dependency org="apache" name="xmlbeans" rev="1.0.3"/>
<dependency org="castor" name="castor" rev="0.9.6"/>
+ <!-- FIXME: is this the right chaperon jar? We used to use the following,
but it
+ is only in people.apache.org/repository
<dependency org="chaperon" name="chaperon" rev="20040205"/>
+ -->
+ <dependency org="cocoon" name="cocoon-chaperon" rev="2.1.9"/>
<dependency org="net.sf.ehcache" name="ehcache" rev="1.2" />
</dependencies>
</ivy-module>
Modified: forrest/branches/ivyBuild/tools/ivy/ivyconf.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/ivyBuild/tools/ivy/ivyconf.xml?view=diff&rev=512720&r1=512719&r2=512720
==============================================================================
--- forrest/branches/ivyBuild/tools/ivy/ivyconf.xml (original)
+++ forrest/branches/ivyBuild/tools/ivy/ivyconf.xml Wed Feb 28 04:01:01 2007
@@ -19,19 +19,24 @@
<property name="local.repo.dir" value="${ivy.conf.dir}/repository" />
<property name="ibiblio-maven2-root"
value="http://www.ibiblio.org/maven2/"; />
- <property name="ibiblio-maven2-pattern"
+ <property name="ibiblio-maven2-pattern"
+
value="[organisation]/[artifact]/[revision]/[artifact]-[revision].[type]" />
+ <property name="ibiblio-maven2-pattern"
value="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" />
<conf defaultResolver="default" />
<resolvers>
- <chain name="default" returnFirst="true">
- <ivyrep name="ivyrep" ivyroot="http://ivyrep.jayasoft.org/"; />
- <ivyrep name="ivyrepsandbox"
- ivyroot="http://opensvn.csie.org/ivyrepsandbox/"; />
- <ibiblio name="apache"
- root="http://people.apache.org/repository"; />
- <ibiblio name="pache-snapshot" m2compatible="true"
- root="http://people.apache.org/maven-snapshot-repository"; />
+ <chain name="default" returnFirst="true">
+ <ibiblio name="apache-snapshot" m2compatible="true"
+ pattern="${apache-maven2-pattern}"
+
root="http://people.apache.org/repo/m2-snapshot-repository/"; />
+ <ibiblio name="maven2" m2compatible="true"
+ root="http://repo1.maven.org/maven2/"; />
+ <ibiblio name="apache-incubating" m2compatible="true"
+
root="http://people.apache.org/repo/m2-incubating-repository/"; />
+ <ivyrep name="ivyrep" ivyroot="http://ivyrep.jayasoft.org/"; />
+ <ivyrep name="ivyrepsandbox"
+ ivyroot="http://opensvn.csie.org/ivyrepsandbox/"; />
<ibiblio name="ibiblio-maven2" root="${ibiblio-maven2-root}"
pattern="${ibiblio-maven2-pattern}" m2compatible="true"
namespace="ibiblio-maven2" />
