Author: maartenc
Date: Tue Mar 30 19:59:33 2010
New Revision: 929238
URL: http://svn.apache.org/viewvc?rev=929238&view=rev
Log:
FIX: Transitive dependencies resolutions issue when eviction is triggered
(IVY-1178)
Added:
ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/
ant/ivy/core/trunk/test/repositories/IVY-1178/ivysettings.xml (with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modA/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modA/1.0/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modA/1.0/ivy-1.0.xml
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modA/1.0/modA-1.0.jar
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modB/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modB/1.0/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modB/1.0/ivy-1.0.xml
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modB/1.0/modB-1.0.jar
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modC/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modC/1.0/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modC/1.0/ivy-1.0.xml
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modC/1.0/modC-1.0.jar
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.0/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.0/ivy-1.0.xml
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.0/modD-1.0.jar
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.1/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.1/ivy-1.1.xml
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.1/modD-1.1.jar
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.0/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.0/ivy-1.0.xml
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.0/modE-1.0.jar
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.1/
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.1/ivy-1.1.xml
(with props)
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.1/modE-1.1.jar
(with props)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=929238&r1=929237&r2=929238&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Tue Mar 30 19:59:33 2010
@@ -117,6 +117,7 @@ for detailed view of each issue, please
- IMPROVEMENT: Trace a message when a property file referenced from the
settings doesn't exixts (IVY-1074)
- IMPROVEMENT: use defaultconf in combination with defaultconfmapping
(IVY-1135) (thanks to Jon Schneider)
+- FIX: Transitive dependencies resolutions issue when eviction is triggered
(IVY-1178)
- FIX: Can't deal with [VERSION] version pattern from Maven (IVY-1177) (thanks
to Richard Vowles)
- FIX: verbose/debug messages were not logged while running ivy:configure task
- FIX: ApacheURLLister does not allow directories not containing a dot on
Artifactory (IVY-1175) (thanks to Anders Jacobsson)
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java?rev=929238&r1=929237&r2=929238&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
Tue Mar 30 19:59:33 2010
@@ -746,8 +746,7 @@ public class ResolveEngine {
}
// now we can actually resolve this configuration dependencies
- DependencyDescriptor dd = node.getDependencyDescriptor();
- if (!isDependenciesFetched(node.getNode(), conf) && (dd == null ||
node.isTransitive())) {
+ if (!isDependenciesFetched(node.getNode(), conf) &&
node.isTransitive()) {
Collection dependencies = node.getDependencies(conf);
for (Iterator iter = dependencies.iterator(); iter.hasNext();) {
VisitNode dep = (VisitNode) iter.next();
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java?rev=929238&r1=929237&r2=929238&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java Tue
Mar 30 19:59:33 2010
@@ -214,11 +214,25 @@ public class VisitNode {
* @return true if current node is transitive and the parent configuration
is transitive.
*/
public boolean isTransitive() {
- return (data.isTransitive()
- && (
-
node.getDependencyDescriptor(getParentNode()).isTransitive()
- ||
node.hasAnyMergedUsageWithTransitiveDependency(rootModuleConf))
- && isParentConfTransitive());
+ if (node.isRoot()) {
+ // the root node is always considered transitive!
+ return true;
+ }
+
+ if (!data.isTransitive()) {
+ return false;
+ }
+
+ if (!isParentConfTransitive()) {
+ return false;
+ }
+
+ DependencyDescriptor dd =
node.getDependencyDescriptor(getParentNode());
+ if ((dd != null) && dd.isTransitive()) {
+ return true;
+ }
+
+ return node.hasAnyMergedUsageWithTransitiveDependency(rootModuleConf);
}
/**
Added: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml?rev=929238&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml
(added)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml Tue
Mar 30 19:59:33 2010
@@ -0,0 +1,28 @@
+<!--
+ 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="org.apache" module="ivy-test" />
+ <configurations>
+ <conf name="default" visibility="public" description="runtime
dependencies and master artifact can be used with this conf"/>
+ </configurations>
+ <dependencies>
+ <dependency org="myorg" name="modC" rev="1.0" />
+ <dependency org="myorg" name="modA" rev="1.0" />
+ </dependencies>
+</ivy-module>
Propchange:
ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/ivysettings.xml?rev=929238&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1178/ivysettings.xml (added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1178/ivysettings.xml Tue Mar 30
19:59:33 2010
@@ -0,0 +1,27 @@
+<!--
+ 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.
+-->
+<ivysettings>
+ <settings defaultResolver="local" />
+ <resolvers>
+ <filesystem name="local" >
+ <ivy
pattern="${ivy.settings.dir}/[organisation]/[module]/[revision]/ivy-[revision].xml"/>
+ <artifact
pattern="${ivy.settings.dir}/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ </resolvers>
+</ivysettings>
Propchange: ant/ivy/core/trunk/test/repositories/IVY-1178/ivysettings.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modA/1.0/ivy-1.0.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modA/1.0/ivy-1.0.xml?rev=929238&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modA/1.0/ivy-1.0.xml
(added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modA/1.0/ivy-1.0.xml
Tue Mar 30 19:59:33 2010
@@ -0,0 +1,28 @@
+<!--
+ 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="myorg" module="modA" revision="1.0" />
+ <configurations>
+ <conf name="default" visibility="public" description="runtime
dependencies and master artifact can be used with this conf" />
+ <conf name="optional" visibility="public" description="contains all
optional dependencies"/>
+ </configurations>
+ <dependencies>
+ <dependency org="myorg" name="modB" rev="1.0" />
+ </dependencies>
+</ivy-module>
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modA/1.0/ivy-1.0.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modA/1.0/modA-1.0.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modA/1.0/modA-1.0.jar?rev=929238&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modA/1.0/modA-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modB/1.0/ivy-1.0.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modB/1.0/ivy-1.0.xml?rev=929238&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modB/1.0/ivy-1.0.xml
(added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modB/1.0/ivy-1.0.xml
Tue Mar 30 19:59:33 2010
@@ -0,0 +1,27 @@
+<!--
+ 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="myorg" module="modB" revision="1.0" />
+ <configurations>
+ <conf name="default" visibility="public" description="runtime
dependencies and master artifact can be used with this conf" />
+ </configurations>
+ <dependencies>
+ <dependency org="myorg" name="modD" rev="1.0" transitive="false" />
+ </dependencies>
+</ivy-module>
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modB/1.0/ivy-1.0.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modB/1.0/modB-1.0.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modB/1.0/modB-1.0.jar?rev=929238&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modB/1.0/modB-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modC/1.0/ivy-1.0.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modC/1.0/ivy-1.0.xml?rev=929238&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modC/1.0/ivy-1.0.xml
(added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modC/1.0/ivy-1.0.xml
Tue Mar 30 19:59:33 2010
@@ -0,0 +1,27 @@
+<!--
+ 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="myorg" module="modC" revision="1.0" />
+ <configurations>
+ <conf name="default" visibility="public" description="runtime
dependencies and master artifact can be used with this conf"/>
+ </configurations>
+ <dependencies>
+ <dependency org="myorg" name="modD" rev="1.1" transitive="false" />
+ </dependencies>
+</ivy-module>
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modC/1.0/ivy-1.0.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modC/1.0/modC-1.0.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modC/1.0/modC-1.0.jar?rev=929238&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modC/1.0/modC-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.0/ivy-1.0.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.0/ivy-1.0.xml?rev=929238&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.0/ivy-1.0.xml
(added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.0/ivy-1.0.xml
Tue Mar 30 19:59:33 2010
@@ -0,0 +1,34 @@
+<!--
+ 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="myorg" module="modD" revision="1.0" />
+ <configurations>
+ <conf name="default" visibility="public" description="runtime
dependencies and master artifact can be used with this conf"
extends="runtime,master"/>
+ <conf name="master" visibility="public" description="contains only the
artifact published by this module itself, with no transitive dependencies"/>
+ <conf name="compile" visibility="public" description="this is the
default scope, used if none is specified. Compile dependencies are available in
all classpaths."/>
+ <conf name="provided" visibility="public" description="this is much
like compile, but indicates you expect the JDK or a container to provide it. It
is only available on the compilation classpath, and is not transitive."/>
+ <conf name="runtime" visibility="public" description="this scope
indicates that the dependency is not required for compilation, but is for
execution. It is in the runtime and test classpaths, but not the compile
classpath." extends="compile"/>
+ <conf name="test" visibility="private" description="this scope
indicates that the dependency is not required for normal use of the
application, and is only available for the test compilation and execution
phases." extends="runtime"/>
+ <conf name="system" visibility="public" description="this scope is
similar to provided except that you have to provide the JAR which contains it
explicitly. The artifact is always available and is not looked up in a
repository."/>
+ <conf name="sources" visibility="public" description="this
configuration contains the source artifact of this module, if any."/>
+ <conf name="javadoc" visibility="public" description="this
configuration contains the javadoc artifact of this module, if any."/>
+ <conf name="optional" visibility="public" description="contains all
optional dependencies"/>
+ </configurations>
+ <dependencies />
+</ivy-module>
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.0/ivy-1.0.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.0/modD-1.0.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.0/modD-1.0.jar?rev=929238&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.0/modD-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.1/ivy-1.1.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.1/ivy-1.1.xml?rev=929238&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.1/ivy-1.1.xml
(added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.1/ivy-1.1.xml
Tue Mar 30 19:59:33 2010
@@ -0,0 +1,36 @@
+<!--
+ 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="myorg" module="modD" revision="1.1" />
+ <configurations>
+ <conf name="default" visibility="public" description="runtime
dependencies and master artifact can be used with this conf"
extends="runtime,master"/>
+ <conf name="master" visibility="public" description="contains only the
artifact published by this module itself, with no transitive dependencies"/>
+ <conf name="compile" visibility="public" description="this is the
default scope, used if none is specified. Compile dependencies are available in
all classpaths."/>
+ <conf name="provided" visibility="public" description="this is much
like compile, but indicates you expect the JDK or a container to provide it. It
is only available on the compilation classpath, and is not transitive."/>
+ <conf name="runtime" visibility="public" description="this scope
indicates that the dependency is not required for compilation, but is for
execution. It is in the runtime and test classpaths, but not the compile
classpath." extends="compile"/>
+ <conf name="test" visibility="private" description="this scope
indicates that the dependency is not required for normal use of the
application, and is only available for the test compilation and execution
phases." extends="runtime"/>
+ <conf name="system" visibility="public" description="this scope is
similar to provided except that you have to provide the JAR which contains it
explicitly. The artifact is always available and is not looked up in a
repository."/>
+ <conf name="sources" visibility="public" description="this
configuration contains the source artifact of this module, if any."/>
+ <conf name="javadoc" visibility="public" description="this
configuration contains the javadoc artifact of this module, if any."/>
+ <conf name="optional" visibility="public" description="contains all
optional dependencies"/>
+ </configurations>
+ <dependencies>
+ <dependency org="myorg" name="modE" rev="1.1" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ </dependencies>
+</ivy-module>
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.1/ivy-1.1.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.1/modD-1.1.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.1/modD-1.1.jar?rev=929238&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modD/1.1/modD-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.0/ivy-1.0.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.0/ivy-1.0.xml?rev=929238&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.0/ivy-1.0.xml
(added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.0/ivy-1.0.xml
Tue Mar 30 19:59:33 2010
@@ -0,0 +1,22 @@
+<!--
+ 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="myorg" module="modE" revision="1.0" />
+ <dependencies />
+</ivy-module>
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.0/ivy-1.0.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.0/modE-1.0.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.0/modE-1.0.jar?rev=929238&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.0/modE-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.1/ivy-1.1.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.1/ivy-1.1.xml?rev=929238&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.1/ivy-1.1.xml
(added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.1/ivy-1.1.xml
Tue Mar 30 19:59:33 2010
@@ -0,0 +1,34 @@
+<!--
+ 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="myorg" module="modE" revision="1.1" />
+ <configurations>
+ <conf name="default" visibility="public" description="runtime
dependencies and master artifact can be used with this conf"
extends="runtime,master"/>
+ <conf name="master" visibility="public" description="contains only the
artifact published by this module itself, with no transitive dependencies"/>
+ <conf name="compile" visibility="public" description="this is the
default scope, used if none is specified. Compile dependencies are available in
all classpaths."/>
+ <conf name="provided" visibility="public" description="this is much
like compile, but indicates you expect the JDK or a container to provide it. It
is only available on the compilation classpath, and is not transitive."/>
+ <conf name="runtime" visibility="public" description="this scope
indicates that the dependency is not required for compilation, but is for
execution. It is in the runtime and test classpaths, but not the compile
classpath." extends="compile"/>
+ <conf name="test" visibility="private" description="this scope
indicates that the dependency is not required for normal use of the
application, and is only available for the test compilation and execution
phases." extends="runtime"/>
+ <conf name="system" visibility="public" description="this scope is
similar to provided except that you have to provide the JAR which contains it
explicitly. The artifact is always available and is not looked up in a
repository."/>
+ <conf name="sources" visibility="public" description="this
configuration contains the source artifact of this module, if any."/>
+ <conf name="javadoc" visibility="public" description="this
configuration contains the javadoc artifact of this module, if any."/>
+ <conf name="optional" visibility="public" description="contains all
optional dependencies"/>
+ </configurations>
+ <dependencies />
+</ivy-module>
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.1/ivy-1.1.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.1/modE-1.1.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.1/modE-1.1.jar?rev=929238&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ant/ivy/core/trunk/test/repositories/IVY-1178/myorg/modE/1.1/modE-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
