Author: maartenc
Date: Fri Dec 25 23:54:14 2009
New Revision: 893901
URL: http://svn.apache.org/viewvc?rev=893901&view=rev
Log:
FIX: Ivy cannot parse alternate format for Maven MD5 files (IVY-1155)
Added:
ant/ivy/core/trunk/test/repositories/checksums/allright/allright-IVY-1155-1.0.jar
(with props)
ant/ivy/core/trunk/test/repositories/checksums/allright/allright-IVY-1155-1.0.jar.md5
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/util/ChecksumHelper.java
ant/ivy/core/trunk/test/repositories/checksums/allright/ivy-1.0.xml
ant/ivy/core/trunk/test/repositories/checksums/allright/ivy-1.0.xml.md5
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=893901&r1=893900&r2=893901&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Fri Dec 25 23:54:14 2009
@@ -102,6 +102,7 @@
- IMPROVEMENT: Trace a message when a property file referenced from the
settings doesn't exixts (IVY-1074)
- IMPROVEMENT: use defaultconf in combination with defaultconfmapping
(IVY-1135) (thanks to Jon Schneider)
+- FIX: Ivy cannot parse alternate format for Maven MD5 files (IVY-1155)
- FIX: Ivy does not close URL connection to ivy-report.xsl properly (IVY-1152)
- FIX: Artifact report throws NPE when artifact is not in cache (IVY-1150)
(thanks to Steve Jones)
- FIX: resolve fails for transitive relocated maven modules when the type of
the dependency was set to 'jar'
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/util/ChecksumHelper.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/util/ChecksumHelper.java?rev=893901&r1=893900&r2=893901&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/util/ChecksumHelper.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/util/ChecksumHelper.java Fri Dec
25 23:54:14 2009
@@ -63,6 +63,19 @@
int spaceIndex = csFileContent.indexOf(' ');
if (spaceIndex != -1) {
expected = csFileContent.substring(0, spaceIndex);
+
+ // IVY-1155: support some strange formats like this one:
+ //
http://repo2.maven.org/maven2/org/apache/pdfbox/fontbox/0.8.0-incubator/fontbox-0.8.0-incubator.jar.md5
+ if (expected.endsWith(":")) {
+ StringBuffer result = new StringBuffer();
+ char[] chars = csFileContent.substring(spaceIndex +
1).toCharArray();
+ for (int i = 0; i < chars.length; i++) {
+ if (!Character.isWhitespace(chars[i])) {
+ result.append(chars[i]);
+ }
+ }
+ expected = result.toString();
+ }
} else {
expected = csFileContent;
}
Added:
ant/ivy/core/trunk/test/repositories/checksums/allright/allright-IVY-1155-1.0.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/checksums/allright/allright-IVY-1155-1.0.jar?rev=893901&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ant/ivy/core/trunk/test/repositories/checksums/allright/allright-IVY-1155-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ant/ivy/core/trunk/test/repositories/checksums/allright/allright-IVY-1155-1.0.jar.md5
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/checksums/allright/allright-IVY-1155-1.0.jar.md5?rev=893901&view=auto
==============================================================================
---
ant/ivy/core/trunk/test/repositories/checksums/allright/allright-IVY-1155-1.0.jar.md5
(added)
+++
ant/ivy/core/trunk/test/repositories/checksums/allright/allright-IVY-1155-1.0.jar.md5
Fri Dec 25 23:54:14 2009
@@ -0,0 +1 @@
+allright-IVY-1155-1.0.jar: c6 72 cb e1 16 29 03 c3 c3 8c ce 53 47 9b 69 ad
\ No newline at end of file
Modified: ant/ivy/core/trunk/test/repositories/checksums/allright/ivy-1.0.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/checksums/allright/ivy-1.0.xml?rev=893901&r1=893900&r2=893901&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/repositories/checksums/allright/ivy-1.0.xml
(original)
+++ ant/ivy/core/trunk/test/repositories/checksums/allright/ivy-1.0.xml Fri Dec
25 23:54:14 2009
@@ -24,6 +24,7 @@
/>
<publications>
<artifact />
+ <artifact name="allright-IVY-1155" />
<artifact name="allright-with-path" />
<artifact name="allright-with-openssl" />
</publications>
Modified:
ant/ivy/core/trunk/test/repositories/checksums/allright/ivy-1.0.xml.md5
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/checksums/allright/ivy-1.0.xml.md5?rev=893901&r1=893900&r2=893901&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/repositories/checksums/allright/ivy-1.0.xml.md5
(original)
+++ ant/ivy/core/trunk/test/repositories/checksums/allright/ivy-1.0.xml.md5 Fri
Dec 25 23:54:14 2009
@@ -1 +1 @@
-e623dc9cd994a8b48e539882704afc54
\ No newline at end of file
+d60a4d715e3440514ab30c509f8678d4
\ No newline at end of file
