diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8423b6aa..b5eda6cc 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -17,7 +17,6 @@ jobs: java: - 11 vault: - - 1.11.12 - 1.12.0 - 1.12.1 - 1.12.2 @@ -33,6 +32,7 @@ jobs: - 1.13.3 - 1.13.4 - 1.14.0 + - 1.14.1 - latest os: - ubuntu-latest diff --git a/build.gradle b/build.gradle index 4bebb356..92fef640 100644 --- a/build.gradle +++ b/build.gradle @@ -130,6 +130,11 @@ artifacts { archives javadocJar, sourcesJar } +java { + withSourcesJar() + withJavadocJar() +} + if (hasProperty("publish")) { publishing { diff --git a/src/main/java/io/github/jopenlibs/vault/SslConfig.java b/src/main/java/io/github/jopenlibs/vault/SslConfig.java index 78dc75a5..e2adc5e3 100644 --- a/src/main/java/io/github/jopenlibs/vault/SslConfig.java +++ b/src/main/java/io/github/jopenlibs/vault/SslConfig.java @@ -578,7 +578,7 @@ private SSLContext buildSslContextFromJks() throws VaultException { } try { - final SSLContext sslContext = SSLContext.getInstance("TLS"); + final SSLContext sslContext = SSLContext.getInstance("TLSv1.2"); sslContext.init(keyManagers, trustManagers, null); return sslContext; } catch (NoSuchAlgorithmException | KeyManagementException e) { @@ -643,7 +643,7 @@ private SSLContext buildSslContextFromPem() throws VaultException { keyManagers = keyManagerFactory.getKeyManagers(); } - final SSLContext sslContext = SSLContext.getInstance("TLS"); + final SSLContext sslContext = SSLContext.getInstance("TLSv1.2"); sslContext.init(keyManagers, trustManagers, null); return sslContext; } catch (CertificateException | IOException | NoSuchAlgorithmException | KeyStoreException | diff --git a/src/main/java/io/github/jopenlibs/vault/rest/Rest.java b/src/main/java/io/github/jopenlibs/vault/rest/Rest.java index 782789b0..8aa5d545 100644 --- a/src/main/java/io/github/jopenlibs/vault/rest/Rest.java +++ b/src/main/java/io/github/jopenlibs/vault/rest/Rest.java @@ -76,7 +76,7 @@ public class Rest { static { try { - DISABLED_SSL_CONTEXT = SSLContext.getInstance("TLS"); + DISABLED_SSL_CONTEXT = SSLContext.getInstance("TLSv1.2"); DISABLED_SSL_CONTEXT.init(null, new TrustManager[]{new X509TrustManager() { @Override public void checkClientTrusted(final X509Certificate[] x509Certificates, diff --git a/src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java b/src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java index 544da225..7c6f652f 100644 --- a/src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java +++ b/src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java @@ -52,14 +52,14 @@ public void readShouldReuseConnectionAfterSuccessfulRequestByHttp() throws Excep int readNum = 10; HttpClient httpClient = HttpClient.newBuilder() - .connectTimeout(Duration.of(5, ChronoUnit.SECONDS)) + .connectTimeout(Duration.of(10, ChronoUnit.SECONDS)) .build(); Logical vault = Vault.create(new VaultConfig() .httpClient(httpClient) .address("http://localhost:8999") .token(TOKEN) - .readTimeout(1) + .readTimeout(10) .engineVersion(1) .build()).logical();