Author: maartenc
Date: Fri Feb 13 12:39:11 2009
New Revision: 744101
URL: http://svn.apache.org/viewvc?rev=744101&view=rev
Log:
FIX: Dependency Configuration Negation does not work (IVY-982)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=744101&r1=744100&r2=744101&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Fri Feb 13 12:39:11 2009
@@ -95,6 +95,7 @@
- IMPROVEMENT: Error message is not clear when specifying an invalid value for
checksums (IVY-977)
- IMPROVEMENT: catch AccessControlException on System.getProperties()
(IVY-1015)
+- FIX: Dependency Configuration Negation does not work (IVY-982)
- FIX: Ivy retrieve does not honor validate="false" from ivysettings (IVY-992)
- FIX: Snapshot issues when using ibiblio resolver with m2compatible is false
(IVY-1028)
- FIX: Ivy Standalone hangs after publishing to SSH resolver (IVY-1009)
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java?rev=744101&r1=744100&r2=744101&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
Fri Feb 13 12:39:11 2009
@@ -426,7 +426,12 @@
public void addDependencyConfiguration(String masterConf, String depConf) {
if ((md != null) && !"*".equals(masterConf) &&
!"%".equals(masterConf)) {
- Configuration config = md.getConfiguration(masterConf);
+ Configuration config;
+ if (masterConf.startsWith("!")) {
+ config = md.getConfiguration(masterConf.substring(1));
+ } else {
+ config = md.getConfiguration(masterConf);
+ }
if (config == null) {
throw new IllegalArgumentException("Cannot add dependency '" +
revId
+ "' to configuration '" + masterConf + "' of module "
