incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1387032 - in /incubator/easyant/core/trunk: module.ivy src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
Date Tue, 18 Sep 2012 08:03:18 GMT
Author: jlboudart
Date: Tue Sep 18 08:03:18 2012
New Revision: 1387032

URL: http://svn.apache.org/viewvc?rev=1387032&view=rev
Log:
Upgrade to ivy-2.3.0-rc1

Modified:
    incubator/easyant/core/trunk/module.ivy
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java

Modified: incubator/easyant/core/trunk/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/module.ivy?rev=1387032&r1=1387031&r2=1387032&view=diff
==============================================================================
--- incubator/easyant/core/trunk/module.ivy (original)
+++ incubator/easyant/core/trunk/module.ivy Tue Sep 18 08:03:18 2012
@@ -31,7 +31,7 @@
         <dependency org="org.apache.ant" name="ant-testutil" rev="1.8.2" conf="test->default"
transitive="false" />
 
         <dependency org="org.apache.ant" name="ant" rev="1.8.2" conf="default->default"/>
-        <dependency org="org.apache.ivy" name="ivy" rev="2.3.0-r1201268" conf="default->core"/>
+        <dependency org="org.apache.ivy" name="ivy" rev="2.3.0-rc1" conf="default->default"/>
         <dependency org="ant-contrib" name="ant-contrib" rev="1.0b2" conf="default->default"/>
         <dependency org="commons-cli" name="commons-cli" rev="1.2" conf="default->default"/>
         <!-- ivy uses a different namespace to reference ant -->

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java?rev=1387032&r1=1387031&r2=1387032&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
(original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
Tue Sep 18 08:03:18 2012
@@ -135,7 +135,7 @@ public class DefaultEasyAntXmlModuleDesc
             if (name.equals(easyantPrefix + ":bindtarget") && State.EXTRA_INFO ==
getState()) {
                 bindTargetStarted(attributes);
             }
-            
+
         }
 
         @Override
@@ -465,8 +465,9 @@ public class DefaultEasyAntXmlModuleDesc
          *            a string that represents what we should extends
          * @param parent
          *            an other module descriptor
+         * @throws ParseException
          */
-        protected void mergeWithOtherModuleDescriptor(List extendTypes, ModuleDescriptor
parent) {
+        protected void mergeWithOtherModuleDescriptor(List extendTypes, ModuleDescriptor
parent) throws ParseException {
             super.mergeWithOtherModuleDescriptor(extendTypes, parent);
             if (parent.getParser() instanceof DefaultEasyAntXmlModuleDescriptorParser) {
                 DefaultEasyAntXmlModuleDescriptorParser parser = (DefaultEasyAntXmlModuleDescriptorParser)
parent



Mime
View raw message