This commit is contained in:
Pavel Gonchukov 2021-03-19 13:31:03 +01:00
parent 5043301a95
commit 206cb319cd
No known key found for this signature in database
GPG key ID: AA78DD4317B862F7
2 changed files with 8 additions and 5 deletions

5
dist/setup/index.js generated vendored
View file

@ -11092,7 +11092,10 @@ function setupMaven(opts) {
}); });
const p12Path = path.join(certDir, 'certificate.p12'); const p12Path = path.join(certDir, 'certificate.p12');
fs.writeFileSync(p12Path, Buffer.from(opts.keystore, 'base64')); fs.writeFileSync(p12Path, Buffer.from(opts.keystore, 'base64'));
core.exportVariable('MAVEN_OPTS', `-Djavax.net.ssl.keyStore=${p12Path} -Djavax.net.ssl.keyStoreType=pkcs12 -Djavax.net.ssl.keyStorePassword=${opts.password}`); // core.exportVariable(
// 'MAVEN_OPTS',
// `-Djavax.net.ssl.keyStore=${p12Path} -Djavax.net.ssl.keyStoreType=pkcs12 -Djavax.net.ssl.keyStorePassword=${opts.password}`
// );
yield exec.exec(path.join(opts.javaPath, 'bin/keytool'), [ yield exec.exec(path.join(opts.javaPath, 'bin/keytool'), [
'-importcert', '-importcert',
'-cacerts', '-cacerts',

View file

@ -60,10 +60,10 @@ export async function setupMaven(opts: MavenOpts): Promise<void> {
const p12Path = path.join(certDir, 'certificate.p12'); const p12Path = path.join(certDir, 'certificate.p12');
fs.writeFileSync(p12Path, Buffer.from(opts.keystore, 'base64')); fs.writeFileSync(p12Path, Buffer.from(opts.keystore, 'base64'));
core.exportVariable( // core.exportVariable(
'MAVEN_OPTS', // 'MAVEN_OPTS',
`-Djavax.net.ssl.keyStore=${p12Path} -Djavax.net.ssl.keyStoreType=pkcs12 -Djavax.net.ssl.keyStorePassword=${opts.password}` // `-Djavax.net.ssl.keyStore=${p12Path} -Djavax.net.ssl.keyStoreType=pkcs12 -Djavax.net.ssl.keyStorePassword=${opts.password}`
); // );
await exec.exec(path.join(opts.javaPath, 'bin/keytool'), [ await exec.exec(path.join(opts.javaPath, 'bin/keytool'), [
'-importcert', '-importcert',