diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-07-29 13:05:59 +0200 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-07-29 13:06:25 +0200 |
| commit | d6fab62f9ee28e8aa0157dbff90e667df52e4421 (patch) | |
| tree | 6a5bdb09908b04880557eb901e5f8fd4b0af52b5 | |
| parent | 5977260af6641b9a82491728d6fe0431b5cd5331 (diff) | |
| parent | e264a6419095c8311615b093ed5d4aa444ed1f59 (diff) | |
| download | jgit-d6fab62f9ee28e8aa0157dbff90e667df52e4421.tar.gz jgit-d6fab62f9ee28e8aa0157dbff90e667df52e4421.zip | |
Merge branch 'stable-5.4' into stable-5.5
* stable-5.4:
[test] Create keystore with the keytool of the running JDK
Change-Id: I5ff3dc1c771aeb33af39eb68f166c7282b478cf8
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| -rw-r--r-- | org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java index 9aef086b78..ba0138b81e 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java @@ -214,9 +214,12 @@ public class AppServer { tmpDir.deleteOnExit(); makePrivate(tmpDir); File keyStore = new File(tmpDir, "keystore.jks"); + File keytool = new File( + new File(new File(System.getProperty("java.home")), "bin"), + "keytool"); Runtime.getRuntime().exec( new String[] { - "keytool", // + keytool.getAbsolutePath(), // "-keystore", keyStore.getAbsolutePath(), // "-storepass", keyPassword, "-alias", hostName, // |