You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by xa...@apache.org on 2008/02/25 09:36:22 UTC
svn commit: r630760 - in /ant/ivy/core/branches/2.0.0-beta2: CHANGES.txt
RELEASE_NOTES
src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
Author: xavier
Date: Mon Feb 25 00:36:19 2008
New Revision: 630760
URL: http://svn.apache.org/viewvc?rev=630760&view=rev
Log:
merge FIX for IVY-744 from trunk (r 630759)
Modified:
ant/ivy/core/branches/2.0.0-beta2/CHANGES.txt
ant/ivy/core/branches/2.0.0-beta2/RELEASE_NOTES
ant/ivy/core/branches/2.0.0-beta2/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
Modified: ant/ivy/core/branches/2.0.0-beta2/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.0-beta2/CHANGES.txt?rev=630760&r1=630759&r2=630760&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.0-beta2/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.0.0-beta2/CHANGES.txt Mon Feb 25 00:36:19 2008
@@ -21,7 +21,8 @@
Mirko Bulovic
Kristian Cibulskis
Andrea Bernardo Ciddio
- Benjamin Francisoud
+ Danno Ferrin
+ Benjamin Francisoud
Jacob Grydholt Jensen
Scott Goldstein
Pierre Hägnestrand
@@ -103,6 +104,7 @@
- FIX: Inherit depedencies defined in parent pom (IVY-683)
- FIX: Incorrect ivy from maven pom generation when classifier are user (IVY-714) (thanks to Ruslan Shevchenko)
- FIX: m2 incompatibility - IVY does not recognize property section(IVY-637)
+- FIX: Maven test scope not mapped to test conf (IVY-744) (thanks to Danno Ferrin)
- TASK: Remove cache attribute on Ant tasks (IVY-685)
Modified: ant/ivy/core/branches/2.0.0-beta2/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.0-beta2/RELEASE_NOTES?rev=630760&r1=630759&r2=630760&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.0-beta2/RELEASE_NOTES (original)
+++ ant/ivy/core/branches/2.0.0-beta2/RELEASE_NOTES Mon Feb 25 00:36:19 2008
@@ -160,6 +160,7 @@
Andrea Bernardo Ciddio
Mikkel Bjerg
Mirko Bulovic
+ Danno Ferrin
Benjamin Francisoud
Nicolas Lalevée
Markus M. May
@@ -216,6 +217,7 @@
- FIX: Inherit depedencies defined in parent pom (IVY-683)
- FIX: Incorrect ivy from maven pom generation when classifier are user (IVY-714) (thanks to Ruslan Shevchenko)
- FIX: m2 incompatibility - IVY does not recognize property section(IVY-637)
+- FIX: Maven test scope not mapped to test conf (IVY-744) (thanks to Danno Ferrin)
- TASK: Remove cache attribute on Ant tasks (IVY-685)
Modified: ant/ivy/core/branches/2.0.0-beta2/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.0-beta2/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java?rev=630760&r1=630759&r2=630760&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.0-beta2/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java (original)
+++ ant/ivy/core/branches/2.0.0-beta2/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java Mon Feb 25 00:36:19 2008
@@ -146,15 +146,14 @@
});
MAVEN2_CONF_MAPPING.put("test", new ConfMapper() {
public void addMappingConfs(DefaultDependencyDescriptor dd, boolean isOptional) {
- //optional/test doesn't make sense
- dd.addDependencyConfiguration("runtime", "compile(*)");
- dd.addDependencyConfiguration("runtime", "runtime(*)");
- dd.addDependencyConfiguration("runtime", "master(*)");
+ //optional doesn't make sense in the test scope
+ dd.addDependencyConfiguration("test", "runtime(*)");
+ dd.addDependencyConfiguration("test", "master(*)");
}
});
MAVEN2_CONF_MAPPING.put("system", new ConfMapper() {
public void addMappingConfs(DefaultDependencyDescriptor dd, boolean isOptional) {
- //optional/system doesn't make sense
+ //optional doesn't make sense in the system scope
dd.addDependencyConfiguration("system", "master(*)");
}
});