You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/01/02 00:14:08 UTC
svn commit: r730635 - in /maven/components/trunk: ./
maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Author: bentmann
Date: Thu Jan 1 15:14:07 2009
New Revision: 730635
URL: http://svn.apache.org/viewvc?rev=730635&view=rev
Log:
[MNG-1349] openssl checksums are not accepted by maven
o Merged from r730631
Modified:
maven/components/trunk/ (props changed)
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Propchange: maven/components/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 1 15:14:07 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC:680477
-/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785
+/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
/maven/components/trunk:688587-696625,696644-699681
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=730635&r1=730634&r2=730635&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Thu Jan 1 15:14:07 2009
@@ -800,8 +800,9 @@
// remove whitespaces at the end
expectedChecksum = expectedChecksum.trim();
- // check for 'MD5 (name) = CHECKSUM'
- if ( expectedChecksum.startsWith( "MD5" ) )
+ // check for 'ALGO (name) = CHECKSUM' like used by openssl
+ if ( expectedChecksum.regionMatches( true, 0, "MD", 0, 2 )
+ || expectedChecksum.regionMatches( true, 0, "SHA", 0, 3 ) )
{
int lastSpacePos = expectedChecksum.lastIndexOf( ' ' );
expectedChecksum = expectedChecksum.substring( lastSpacePos + 1 );