mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-09 10:06:13 +00:00
[FIXED JENKINS-18178] Reverting an inessential part of the fix of JENKINS-16301 since it broke some Maven builds.
Apparently the Maven 2 process factory fails to adequately insulate the Maven process from Jenkins library dependencies; if you specify a build extension that can override dependencies used by Jenkins core classes! A real fix would involve changing class loader delegation, since presumably similar bugs could still occur.
This commit is contained in:
1 parent
74d57de91b
commit
e0a3a1ddf5
3 files changed
+37
-3
No files matched your search
@@ -30,6 +30,7 @@ import edu.umd.cs.findbugs.annotations.SuppressWarnings;
|
||||
import hudson.Proc.LocalProc;
|
||||
import hudson.model.TaskListener;
|
||||
import hudson.os.PosixAPI;
|
||||
import hudson.util.IOException2;
|
||||
import hudson.util.QuotedStringTokenizer;
|
||||
import hudson.util.VariableResolver;
|
||||
import hudson.util.jna.WinIOException;
|
||||
@@ -72,6 +73,7 @@ import java.util.regex.Pattern;
|
||||
import hudson.util.jna.Kernel32Utils;
|
||||
|
||||
import static hudson.util.jna.GNUCLibrary.LIBC;
|
||||
import java.security.DigestInputStream;
|
||||
import org.apache.commons.codec.digest.DigestUtils;
|
||||
|
||||
/**
|
||||
@@ -554,11 +556,28 @@ public class Util {
|
||||
* @see DigestUtils#md5Hex(InputStream)
|
||||
*/
|
||||
public static String getDigestOf(InputStream source) throws IOException {
|
||||
try {
|
||||
MessageDigest md5 = MessageDigest.getInstance("MD5");
|
||||
|
||||
byte[] buffer = new byte[1024];
|
||||
DigestInputStream in =new DigestInputStream(source,md5);
|
||||
try {
|
||||
while(in.read(buffer)>=0)
|
||||
; // simply discard the input
|
||||
} finally {
|
||||
in.close();
|
||||
}
|
||||
return toHexString(md5.digest());
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
throw new IOException2("MD5 not installed",e); // impossible
|
||||
}
|
||||
/* JENKINS-18178: confuses Maven 2 runner
|
||||
try {
|
||||
return DigestUtils.md5Hex(source);
|
||||
} finally {
|
||||
source.close();
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
public static String getDigestOf(String text) {
|
||||
|
||||
Reference in new issue
Block a user