diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-07-29 13:02:16 +0200 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-07-29 13:03:08 +0200 |
| commit | 4322dd26a3308b4991fce835d72cc7c0d6d5622e (patch) | |
| tree | 67c585772017419d8ed68fb352b75152b738bad1 | |
| parent | 87c42c1b3c6c8518de7bf824e9fd182b54c06ceb (diff) | |
| parent | 6cb39d145acbd535da00993cf8c200b16653ba71 (diff) | |
| download | jgit-4322dd26a3308b4991fce835d72cc7c0d6d5622e.tar.gz jgit-4322dd26a3308b4991fce835d72cc7c0d6d5622e.zip | |
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
[test] Create keystore with the keytool of the running JDK
Change-Id: Ic56f4f23c37432377be88e07d06c5ad75591d84f
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, // |