motiejus
/
jgit
1
Fork 0
Code Releases Activity

[Java 11] Remove dependency on javax.xml.bind package 

Replace javax.xml.bind.DatatypeConverter, that is not available any
more in Java 11 and later with Hex utility from non optional Bouncy
Castle library.

Bug: 540790
Change-Id: I9903c00ecc1a434e9795b8ba9267f02628fdc0e9
Signed-off-by: David Ostrovsky <david@ostrovsky.org>
This commit is contained in:
David Ostrovsky 2019-06-17 23:28:52 +02:00 committed by Matthias Sohn
parent e3bcfe56c7
commit 7607465006
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BUILD
View File

@ -1,12 +1,5 @@
package(default_visibility = ["//visibility:public"])
config_setting(
name = "jdk9",
values = {
"java_toolchain": "@bazel_tools//tools/jdk:toolchain_jdk9",
},
)
genrule(
name = "all",
testonly = 1,

4
org.eclipse.jgit/BUILD
View File

@ -14,10 +14,6 @@ RESOURCES = glob(["resources/**"])
java_library(
name = "jgit",
srcs = SRCS,
javacopts = select({
"//:jdk9": ["--add-modules=java.xml.bind"],
"//conditions:default": [],
}),
resource_strip_prefix = "org.eclipse.jgit/resources",
resources = RESOURCES,
deps = [

7
org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java
View File

@ -66,8 +66,8 @@
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.bind.DatatypeConverter;
import org.bouncycastle.util.encoders.Hex;
import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.util.Base64;
@ -301,7 +301,7 @@ interface Vals {
String DEFAULT_KEY_ALGO = JetS3tV2.ALGORITHM;
String DEFAULT_KEY_SIZE = Integer.toString(JetS3tV2.KEY_SIZE);
String DEFAULT_KEY_ITER = Integer.toString(JetS3tV2.ITERATIONS);
String DEFAULT_KEY_SALT = DatatypeConverter.printHexBinary(JetS3tV2.SALT);
String DEFAULT_KEY_SALT = Hex.toHexString(JetS3tV2.SALT);
String EMPTY = ""; //$NON-NLS-1$
@ -377,8 +377,7 @@ static abstract class SymmetricEncryption extends WalkEncryption
final byte[] salt;
try {
salt = DatatypeConverter
.parseHexBinary(keySalt.replaceAll(REGEX_WS, EMPTY));
salt = Hex.decode(keySalt.replaceAll(REGEX_WS, EMPTY));
} catch (Exception e) {
throw securityError(X_KEY_SALT + EMPTY + keySalt);
}