You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2014/11/10 20:42:15 UTC

svn commit: r1637962 - in /maven/shared/trunk/maven-repository-builder: pom.xml src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java src/main/java/org/apache/maven/shared/repository/utils/DigestUtils.java

Author: krosenvold
Date: Mon Nov 10 19:42:15 2014
New Revision: 1637962

URL: http://svn.apache.org/r1637962
Log:
[MSHARED-164] Replaced digestutils with commons-codec

Removed:
    maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/utils/DigestUtils.java
Modified:
    maven/shared/trunk/maven-repository-builder/pom.xml
    maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java

Modified: maven/shared/trunk/maven-repository-builder/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/pom.xml?rev=1637962&r1=1637961&r2=1637962&view=diff
==============================================================================
--- maven/shared/trunk/maven-repository-builder/pom.xml (original)
+++ maven/shared/trunk/maven-repository-builder/pom.xml Mon Nov 10 19:42:15 2014
@@ -94,6 +94,11 @@ under the License.
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.6</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-http-lightweight</artifactId>
       <version>1.0-beta-2</version>

Modified: maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java?rev=1637962&r1=1637961&r2=1637962&view=diff
==============================================================================
--- maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java (original)
+++ maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java Mon Nov 10 19:42:15 2014
@@ -52,7 +52,6 @@ import org.apache.maven.shared.artifact.
 import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter;
 import org.apache.maven.shared.repository.model.GroupVersionAlignment;
 import org.apache.maven.shared.repository.model.RepositoryInfo;
-import org.apache.maven.shared.repository.utils.DigestUtils;
 import org.apache.maven.shared.utils.io.FileUtils;
 import org.apache.maven.shared.utils.io.IOUtil;
 import org.codehaus.plexus.PlexusConstants;
@@ -66,11 +65,11 @@ import org.codehaus.plexus.logging.conso
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
 import java.lang.reflect.Field;
-import java.security.NoSuchAlgorithmException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -83,6 +82,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 
+import static org.apache.commons.codec.digest.DigestUtils.*;
+
 /**
  * @author Jason van Zyl
  * @plexus.component role="org.apache.maven.shared.repository.RepositoryAssembler" role-hint="default"
@@ -531,20 +532,17 @@ public class DefaultRepositoryAssembler
     private void writeChecksums( File file )
         throws IOException, RepositoryAssemblyException
     {
-        try
-        {
-            String md5 = DigestUtils.createChecksum( file, "MD5" );
-            String sha1 = DigestUtils.createChecksum( file, "SHA-1" );
-
-            FileUtils.fileWrite( new File( file.getParentFile(), file.getName() + ".md5" ).getAbsolutePath(),
-                                 md5.toLowerCase() );
-            FileUtils.fileWrite( new File( file.getParentFile(), file.getName() + ".sha1" ).getAbsolutePath(),
-                                 sha1.toLowerCase() );
-        }
-        catch ( NoSuchAlgorithmException e )
-        {
-            throw new RepositoryAssemblyException( "Unable to get write checksums: " + e.getMessage(), e );
-        }
+        FileInputStream data = new FileInputStream( file );
+        String md5 = md5Hex( data ).toUpperCase();
+        data.close();
+        FileInputStream data1 = new FileInputStream( file );
+        String sha1 = shaHex( data1 ).toUpperCase();
+        data1.close();
+
+        FileUtils.fileWrite( new File( file.getParentFile(), file.getName() + ".md5" ).getAbsolutePath(),
+                             md5.toLowerCase() );
+        FileUtils.fileWrite( new File( file.getParentFile(), file.getName() + ".sha1" ).getAbsolutePath(),
+                             sha1.toLowerCase() );
     }
 
     protected Map createGroupVersionAlignments( List versionAlignments )