incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1360906 - in /incubator/easyant/core/trunk: ivysettings.xml src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml
Date Thu, 12 Jul 2012 20:13:48 GMT
Author: jlboudart
Date: Thu Jul 12 20:13:48 2012
New Revision: 1360906

URL: http://svn.apache.org/viewvc?rev=1360906&view=rev
Log:
Move easyant public repository definition to default ivysettings configuration

Modified:
    incubator/easyant/core/trunk/ivysettings.xml
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml

Modified: incubator/easyant/core/trunk/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/ivysettings.xml?rev=1360906&r1=1360905&r2=1360906&view=diff
==============================================================================
--- incubator/easyant/core/trunk/ivysettings.xml (original)
+++ incubator/easyant/core/trunk/ivysettings.xml Thu Jul 12 20:13:48 2012
@@ -15,7 +15,6 @@
    limitations under the License.
 -->
 <ivysettings>
-    <property name="apache.easyant.public.url" value="http://repository.easyant.org/apache-easyant"/>
     <include file="${ivy.settings.dir}/repository/third-party-lib/third-party-ivysettings.xml"/>
     <include url="${easyant.extra.ivysettings.url}"/>
     <settings defaultResolver="main"/>
@@ -30,10 +29,8 @@
             <!-- core modules provided by easyant full distribution -->
             <resolver ref="easyant-core-modules"/>
             <resolver ref="easyant-shared-modules"/>
-            <url name="apache-easyant-plugins">
-                <ivy pattern="${apache.easyant.public.url}/[organization]/[module]/[revision]/[type]s/ivy-[revision].xml"
/>
-                <artifact pattern="${apache.easyant.public.url}/[organization]/[module]/[revision]/[type]s/[module](-[classifier])-[revision].[ext]"
/>
-            </url>
+            <!-- easyant public repository -->
+            <resolver ref="apache-easyant-plugins"/>
             <!-- extra modules provided by easyant full distribution -->
             <resolver ref="easyant-extra-modules" />
             <resolver ref="third-party-lib" />

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml?rev=1360906&r1=1360905&r2=1360906&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml
(original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml
Thu Jul 12 20:13:48 2012
@@ -15,6 +15,7 @@
    limitations under the License.
 -->
 <ivysettings>
+    <property name="apache.easyant.public.url" value="http://repository.easyant.org/apache-easyant"/>
     <settings defaultResolver="easyant-default-chain"/>
     <caches defaultCacheDir="${user.home}/.easyant/easyant-cache" useOrigin="true" />
     <resolvers>
@@ -26,10 +27,16 @@
             <ivy pattern="${user.home}/.easyant/repository/easyant-shared-modules/[organisation]/[module]/[revision]/[module].ivy"/>
             <artifact pattern="${user.home}/.easyant/repository/easyant-shared-modules/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
         </filesystem>
+        <url name="apache-easyant-plugins">
+            <ivy pattern="${apache.easyant.public.url}/[organization]/[module]/[revision]/[type]s/ivy-[revision].xml"
/>
+            <artifact pattern="${apache.easyant.public.url}/[organization]/[module]/[revision]/[type]s/[module](-[classifier])-[revision].[ext]"
/>
+        </url>
+        
         <ibiblio name="public-maven" m2compatible="true"/> 
         <chain name="easyant-default-chain" returnFirst="true">
             <resolver ref="easyant-core-modules" />
             <resolver ref="easyant-shared-modules"/>
+            <resolver ref="apache-easyant-plugins"/>
             <resolver ref="public-maven"/>
         </chain>
     </resolvers>



Mime
View raw message