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:13:17 UTC
svn commit: r730634 - in /maven/components/branches/maven-2.1.x: ./
maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Author: bentmann
Date: Thu Jan 1 15:13:14 2009
New Revision: 730634
URL: http://svn.apache.org/viewvc?rev=730634&view=rev
Log:
[MNG-1349] openssl checksums are not accepted by maven
o Merged from r730631
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 1 15:13:14 2009
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,708790-728809,728834
-/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461
+/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
/maven/components/trunk:720001,721902,726845,729292
Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=730634&r1=730633&r2=730634&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Thu Jan 1 15:13:14 2009
@@ -279,7 +279,7 @@
// TODO: shouldn't need a file intermediatary - improve wagon to take a stream
File temp = File.createTempFile( "maven-artifact", null );
temp.deleteOnExit();
- FileUtils.fileWrite( temp.getAbsolutePath(), (String) sums.get( extension ) );
+ FileUtils.fileWrite( temp.getAbsolutePath(), "UTF-8", (String) sums.get( extension ) );
wagon.put( temp, remotePath + "." + extension );
}
@@ -692,13 +692,14 @@
tempChecksumFile.deleteOnExit();
wagon.get( remotePath + checksumFileExtension, tempChecksumFile );
- String expectedChecksum = FileUtils.fileRead( tempChecksumFile );
+ String expectedChecksum = FileUtils.fileRead( tempChecksumFile, "UTF-8" );
// 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 );