natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge FIX for IVY-744 from trunk (r 630759) 

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.0.0-beta2@630760 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Xavier Hanin 2008-02-25 08:36:19 +00:00
parent 8112fdb447
commit 8554a2c34a
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.txt
View File

@ -21,7 +21,8 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
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 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
- 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)

2
RELEASE_NOTES
View File

@ -160,6 +160,7 @@ long, but Ivy couldn't be what it is without you!
Andrea Bernardo Ciddio
Mikkel Bjerg
Mirko Bulovic
Danno Ferrin
Benjamin Francisoud
Nicolas Lalevée
Markus M. May
@ -216,6 +217,7 @@ List of changes since Ivy 2.0.0-beta1:
- 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)

9
src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
View File

@ -146,15 +146,14 @@ public class PomModuleDescriptorBuilder {
});
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(*)");
}
});