Author: xavier
Date: Fri Apr 4 07:40:20 2008
New Revision: 644725
URL: http://svn.apache.org/viewvc?rev=644725&view=rev
Log:
update ivy files with new conflict syntax (related to change with IVY-784)
Modified:
ant/ivy/core/trunk/doc/samples/ivy-sample-xslt.xml
ant/ivy/core/trunk/doc/samples/ivy-sample.xml
ant/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-different-revisions.xml
ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-225.xml
ant/ivy/core/trunk/test/repositories/2/mod10.1/ivy-1.2.xml
ant/ivy/core/trunk/test/repositories/2/mod4.1/ivy-4.4.xml
Modified: ant/ivy/core/trunk/doc/samples/ivy-sample-xslt.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/samples/ivy-sample-xslt.xml?rev=644725&r1=644724&r2=644725&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/samples/ivy-sample-xslt.xml (original)
+++ ant/ivy/core/trunk/doc/samples/ivy-sample-xslt.xml Fri Apr 4 07:40:20 2008
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="2.0">
<info organisation="myorg"
module="mymodule"
revision="myrev"
@@ -93,10 +93,9 @@
<include name="your.*" type="jar"/>
<include ext="xml"/>
<exclude name="toexclude"/>
- </dependency>
+ </dependency>
+
+ <conflict org="yourorg" module=".*" manager="all"/>
+ <conflict org="theirorg" module="theirmodule1" rev="1.0, 1.1"/>
</dependencies>
- <conflicts>
- <manager org="yourorg" module=".*" name="all"/>
- <manager org="theirorg" module="theirmodule1" rev="1.0, 1.1"/>
- </conflicts>
</ivy-module>
Modified: ant/ivy/core/trunk/doc/samples/ivy-sample.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/samples/ivy-sample.xml?rev=644725&r1=644724&r2=644725&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/samples/ivy-sample.xml (original)
+++ ant/ivy/core/trunk/doc/samples/ivy-sample.xml Fri Apr 4 07:40:20 2008
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="2.0">
<info organisation="myorg"
module="mymodule"
revision="myrev"
@@ -93,9 +93,8 @@
<include ext="xml"/>
<exclude name="toexclude"/>
</dependency>
+
+ <conflict org="yourorg" module=".*" manager="all"/>
+ <conflict org="theirorg" module="theirmodule1" rev="1.0, 1.1"/>
</dependencies>
- <conflicts>
- <manager org="yourorg" module=".*" name="all"/>
- <manager org="theirorg" module="theirmodule1" rev="1.0, 1.1"/>
- </conflicts>
</ivy-module>
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-different-revisions.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-different-revisions.xml?rev=644725&r1=644724&r2=644725&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-different-revisions.xml
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-different-revisions.xml
Fri Apr 4 07:40:20 2008
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="2.0">
<info organisation="apache"
module="different-revs"
revision="1.0"
@@ -26,8 +26,7 @@
<dependency org="org1" name="mod1.2" rev="2.0"/>
<dependency org="org1" name="mod1.1" rev="1.0"/>
<dependency org="org1" name="mod1.2" rev="1.+"/>
+
+ <conflict manager="all" />
</dependencies>
- <conflicts>
- <manager name="all" />
- </conflicts>
</ivy-module>
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-225.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-225.xml?rev=644725&r1=644724&r2=644725&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-225.xml
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-225.xml Fri
Apr 4 07:40:20 2008
@@ -16,14 +16,13 @@
specific language governing permissions and limitations
under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="2.0">
<info organisation="test" module="IVY-225" status="integration"
publication="20050202110000"/>
<dependencies>
<dependency org="org1" name="mod1.2" rev="1.1" />
<dependency org="org3" name="mod3.2" rev="1.4" />
<dependency org="org5" name="mod5.1" rev="4.2" />
+
+ <conflict manager="all" />
</dependencies>
- <conflicts>
- <manager name="all" />
- </conflicts>
</ivy-module>
Modified: ant/ivy/core/trunk/test/repositories/2/mod10.1/ivy-1.2.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/2/mod10.1/ivy-1.2.xml?rev=644725&r1=644724&r2=644725&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/repositories/2/mod10.1/ivy-1.2.xml (original)
+++ ant/ivy/core/trunk/test/repositories/2/mod10.1/ivy-1.2.xml Fri Apr 4
07:40:20 2008
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="2.0">
<info organisation="org10"
module="mod10.1"
revision="1.2"
@@ -26,8 +26,7 @@
<dependencies>
<dependency org="org1" name="mod1.2" rev="2.1"/>
<dependency org="org4" name="mod4.1" rev="4.3"/>
+
+ <conflict org="org1" module="mod1.2" rev="2.0"/>
</dependencies>
- <conflicts>
- <manager org="org1" module="mod1.2" rev="2.0"/>
- </conflicts>
</ivy-module>
Modified: ant/ivy/core/trunk/test/repositories/2/mod4.1/ivy-4.4.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/2/mod4.1/ivy-4.4.xml?rev=644725&r1=644724&r2=644725&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/repositories/2/mod4.1/ivy-4.4.xml (original)
+++ ant/ivy/core/trunk/test/repositories/2/mod4.1/ivy-4.4.xml Fri Apr 4
07:40:20 2008
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="2.0">
<info organisation="org4"
module="mod4.1"
revision="4.4"
@@ -26,8 +26,7 @@
<dependencies>
<dependency org="org1" name="mod1.2" rev="2.0"/>
<dependency org="org3" name="mod3.1" rev="1.1"/>
+
+ <conflict org="org1" module="mod1.2" rev="2.1"/>
</dependencies>
- <conflicts>
- <manager org="org1" module="mod1.2" rev="2.1"/>
- </conflicts>
</ivy-module>
