Author: maartenc
Date: Thu Sep 23 20:33:49 2010
New Revision: 1000613
URL: http://svn.apache.org/viewvc?rev=1000613&view=rev
Log:
Merged revision 1000609 from trunk.
Modified:
ant/ivy/core/branches/2.2.x/ (props changed)
ant/ivy/core/branches/2.2.x/CHANGES.txt
ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/util/url/ApacheURLLister.java
Propchange: ant/ivy/core/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 23 20:33:49 2010
@@ -1,4 +1,4 @@
/ant/ivy/core/branches/2.0.0:727187-727188,727520-732505
/ant/ivy/core/branches/2.0.0-rc2:707459-708717
/ant/ivy/core/branches/2.0.x:696803-698317
-/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-983820,983827-984586,984952,988337,988678,988691-988707,990621-991115,997391,997508-997517,997711-997931,999129,1000206,1000225,1000257-1000263
+/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-983820,983827-984586,984952,988337,988678,988691-988707,990621-991115,997391,997508-997517,997711-997931,999129,1000206,1000225,1000257-1000263,1000609
Modified: ant/ivy/core/branches/2.2.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/CHANGES.txt?rev=1000613&r1=1000612&r2=1000613&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.2.x/CHANGES.txt Thu Sep 23 20:33:49 2010
@@ -97,6 +97,7 @@ for detailed view of each issue, please
John Shields
Simon Steiner
Johan Stuyts
+ John Tinetti
Jason Trump
Tjeerd Verhagen
Richard Vowles
@@ -127,6 +128,7 @@ for detailed view of each issue, please
- IMPROVEMENT: ivy:makepom now accepts a list of configurations to include
(IVY-1005) (thanks to Jesper Pedersen)
- IMPROVEMENT: ivy:makepom can generate a <description> element in the pom
(IVY-1215) (thanks to Jesper Pedersen)
+- FIX: ApacheURLLister doesn't handle some truncated linknames properly
(IVY-1232) (thanks to John Tinetti)
- FIX: Ivy cannot handle Maven pom with parents depending back on theirselfs
(IVY-1225)
- FIX: artifactreport ant task doesn't honor log attribute (IVY-1212)
- FIX: XmlModuleDescriptorWriter does not write the transitive attribute
(IVY-1207) (thanks to Abel Muino)
Modified:
ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/util/url/ApacheURLLister.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/util/url/ApacheURLLister.java?rev=1000613&r1=1000612&r2=1000613&view=diff
==============================================================================
---
ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/util/url/ApacheURLLister.java
(original)
+++
ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/util/url/ApacheURLLister.java
Thu Sep 23 20:33:49 2010
@@ -163,6 +163,11 @@ public class ApacheURLLister {
if (!href.startsWith(text.substring(0, text.length() - 3))) {
continue;
}
+ } else if (text.endsWith("..>")) {
+ // text is probably truncated, we can only check if the href
starts with text
+ if (!href.startsWith(text.substring(0, text.length() - 6))) {
+ continue;
+ }
} else {
// text is not truncated, so it must match the url after
stripping optional
// trailing slashes
