diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-07-29 13:03:56 +0200 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-07-29 13:04:26 +0200 |
| commit | 3dea2b37ecc5fa50f32679a97ce8dcd45ac2ab32 (patch) | |
| tree | d64daf6d49014ddec58fa2dfe5b36805085c88b0 | |
| parent | 8e52e30b927974cb2d1bd62ba6348fde33ab832c (diff) | |
| parent | 4322dd26a3308b4991fce835d72cc7c0d6d5622e (diff) | |
| download | jgit-3dea2b37ecc5fa50f32679a97ce8dcd45ac2ab32.tar.gz jgit-3dea2b37ecc5fa50f32679a97ce8dcd45ac2ab32.zip | |
Merge branch 'stable-5.2' into stable-5.3
* stable-5.2:
[test] Create keystore with the keytool of the running JDK
Change-Id: I981de862c614986a7b443fed1cce7b895b758682
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, // |