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

FIX: Ivy buildnumber task does not find artifact in Sonatype Nexus repo (IVY-1069) 

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@783144 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maarten Coene 2009-06-09 21:27:58 +00:00
parent afc1dbf04e
commit ebb65f0dc2
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -89,6 +89,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
=====================================
- IMPROVEMENT: Pre and post retrieve artifact events (IVY-1084)
- FIX: Ivy buildnumber task does not find artifact in Sonatype Nexus repo (IVY-1069)
- FIX: Publish with SSH (sftp or ssh) prevents enclosing java process to terminate (IVY-1075)
- FIX: Ibiblio resolver throws IndexOutOfBoundsException when using snapshot versions with usepoms='false' (IVY-1028)
- FIX: Wrong BuildException messages (findmodules) (IVY-1056)

7
src/java/org/apache/ivy/core/IvyPatternHelper.java
View File

@ -206,6 +206,11 @@ public final class IvyPatternHelper {
}
public static String substituteTokens(String pattern, Map tokens) {
Map tokensCopy = new HashMap(tokens);
if (tokensCopy.containsKey(ORGANISATION_KEY) && !tokensCopy.containsKey(ORGANISATION_KEY2)) {
tokensCopy.put(ORGANISATION_KEY2, tokensCopy.get(ORGANISATION_KEY));
}
StringBuffer buffer = new StringBuffer();
char[] chars = pattern.toCharArray();
@ -265,7 +270,7 @@ public final class IvyPatternHelper {
}
String token = tokenBuffer.toString();
Object tokenValue = tokens.get(token);
Object tokenValue = tokensCopy.get(token);
String value = (tokenValue == null) ? null : tokenValue.toString();
if (insideOptionalPart) {