ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r778767 - in /ant/ivy/core/trunk/test/repositories/1/org20: ./ mod20.1/ mod20.1/ivys/ mod20.2/ mod20.2/ivys/ mod20.3/ mod20.3/ivys/ mod20.4/ mod20.4/ivys/
Date Tue, 26 May 2009 15:49:48 GMT
Author: xavier
Date: Tue May 26 15:49:48 2009
New Revision: 778767

URL: http://svn.apache.org/viewvc?rev=778767&view=rev
Log:
FIX: transitive dependencies and conflict management (IVY-1083)

Added:
    ant/ivy/core/trunk/test/repositories/1/org20/
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/ivy-1.0.xml   (with props)
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/ivy-1.1.xml   (with props)
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.2/
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.2/ivys/
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.2/ivys/ivy-1.0.xml   (with props)
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.3/
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.3/ivys/
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.3/ivys/ivy-1.0.xml   (with props)
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.4/
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.4/ivys/
    ant/ivy/core/trunk/test/repositories/1/org20/mod20.4/ivys/ivy-1.0.xml   (with props)

Added: ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/ivy-1.0.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/ivy-1.0.xml?rev=778767&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/ivy-1.0.xml (added)
+++ ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/ivy-1.0.xml Tue May 26 15:49:48
2009
@@ -0,0 +1,30 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="1.0">
+	<info organisation="org20"
+	       module="mod20.1"
+	       revision="1.0"
+	       status="integration"
+	       publication="20090526110000"
+	/>
+	<publications/>
+	<dependencies>
+		<dependency org="org1" name="mod1.2" rev="1.0"/>
+	</dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/ivy-1.0.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/ivy-1.1.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/ivy-1.1.xml?rev=778767&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/ivy-1.1.xml (added)
+++ ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/ivy-1.1.xml Tue May 26 15:49:48
2009
@@ -0,0 +1,30 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="1.0">
+	<info organisation="org20"
+	       module="mod20.1"
+	       revision="1.1"
+	       status="integration"
+	       publication="20090526110000"
+	/>
+	<publications/>
+	<dependencies>
+		<dependency org="org1" name="mod1.2" rev="1.0"/>
+	</dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/1/org20/mod20.1/ivys/ivy-1.1.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/1/org20/mod20.2/ivys/ivy-1.0.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/1/org20/mod20.2/ivys/ivy-1.0.xml?rev=778767&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/1/org20/mod20.2/ivys/ivy-1.0.xml (added)
+++ ant/ivy/core/trunk/test/repositories/1/org20/mod20.2/ivys/ivy-1.0.xml Tue May 26 15:49:48
2009
@@ -0,0 +1,30 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="1.0">
+	<info organisation="org20"
+	       module="mod20.2"
+	       revision="1.0"
+	       status="integration"
+	       publication="20090526110000"
+	/>
+	<publications/>
+	<dependencies>
+		<dependency name="mod20.1" rev="1.1" transitive="false" />
+	</dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/1/org20/mod20.2/ivys/ivy-1.0.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/1/org20/mod20.3/ivys/ivy-1.0.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/1/org20/mod20.3/ivys/ivy-1.0.xml?rev=778767&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/1/org20/mod20.3/ivys/ivy-1.0.xml (added)
+++ ant/ivy/core/trunk/test/repositories/1/org20/mod20.3/ivys/ivy-1.0.xml Tue May 26 15:49:48
2009
@@ -0,0 +1,30 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="1.0">
+	<info organisation="org20"
+	       module="mod20.3"
+	       revision="1.0"
+	       status="integration"
+	       publication="20090526110000"
+	/>
+	<publications/>
+	<dependencies>
+		<dependency name="mod20.1" rev="1.0" />
+	</dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/1/org20/mod20.3/ivys/ivy-1.0.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/1/org20/mod20.4/ivys/ivy-1.0.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/1/org20/mod20.4/ivys/ivy-1.0.xml?rev=778767&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/1/org20/mod20.4/ivys/ivy-1.0.xml (added)
+++ ant/ivy/core/trunk/test/repositories/1/org20/mod20.4/ivys/ivy-1.0.xml Tue May 26 15:49:48
2009
@@ -0,0 +1,31 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="1.0">
+	<info organisation="org20"
+	       module="mod20.4"
+	       revision="1.0"
+	       status="integration"
+	       publication="20090526110000"
+	/>
+	<publications/>
+	<dependencies>
+		<dependency name="mod20.3" rev="1.0" />
+		<dependency name="mod20.2" rev="1.0" />
+	</dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/1/org20/mod20.4/ivys/ivy-1.0.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message