From bc1223e1a347800398faaee019995396fa481d80 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Tue, 10 Apr 2018 18:21:11 +0200 Subject: [PATCH 01/11] Test against 0.10.0 --- .travis.yml | 8 ++++---- README.md | 2 +- .../stklcode/jvault/connector/HTTPVaultConnectorTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17a6042..60958c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ addons: env: - PATH=$PATH:. before_script: - - wget https://releases.hashicorp.com/vault/0.9.6/vault_0.9.6_linux_amd64.zip - - wget -q -O - https://releases.hashicorp.com/vault/0.9.6/vault_0.9.6_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_0.9.6_linux_amd64.zip - - rm vault_0.9.6_linux_amd64.zip + - wget https://releases.hashicorp.com/vault/0.10.0/vault_0.10.0_linux_amd64.zip + - wget -q -O - https://releases.hashicorp.com/vault/0.10.0/vault_0.10.0_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_0.10.0_linux_amd64.zip + - rm vault_0.10.0_linux_amd64.zip cache: directories: - '$HOME/.m2/repository' diff --git a/README.md b/README.md index cedabb0..5972ddf 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject * Raw secret content or JSON decoding * SQL secret handling * Connector Factory with builder pattern -* Tested against Vault 0.9.6 +* Tested against Vault 0.10.0 ## Maven Artifact diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 40a9821..0348fd6 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; */ @EnableRuleMigrationSupport public class HTTPVaultConnectorTest { - private static final String VAULT_VERISON = "0.9.6"; // the vault version this test is supposed to run against + private static final String VAULT_VERISON = "0.10.0"; // the vault version this test is supposed to run against private static final String KEY = "81011a8061e5c028bd0d9503eeba40bd9054b9af0408d080cb24f57405c27a61"; private static final String TOKEN_ROOT = "d1bd50e2-587b-6e68-d80b-a9a507625cb7"; private static final String USER_VALID = "validUser"; From 47e7a3f4b0020c0000c5735129ae4cae78539a79 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Thu, 26 Apr 2018 20:44:52 +0200 Subject: [PATCH 02/11] Test against 0.10.1 --- .travis.yml | 8 ++++---- README.md | 2 +- .../stklcode/jvault/connector/HTTPVaultConnectorTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60958c2..ef41ab5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ addons: env: - PATH=$PATH:. before_script: - - wget https://releases.hashicorp.com/vault/0.10.0/vault_0.10.0_linux_amd64.zip - - wget -q -O - https://releases.hashicorp.com/vault/0.10.0/vault_0.10.0_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_0.10.0_linux_amd64.zip - - rm vault_0.10.0_linux_amd64.zip + - wget https://releases.hashicorp.com/vault/0.10.1/vault_0.10.1_linux_amd64.zip + - wget -q -O - https://releases.hashicorp.com/vault/0.10.1/vault_0.10.1_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_0.10.1_linux_amd64.zip + - rm vault_0.10.1_linux_amd64.zip cache: directories: - '$HOME/.m2/repository' diff --git a/README.md b/README.md index 5972ddf..357bdd2 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject * Raw secret content or JSON decoding * SQL secret handling * Connector Factory with builder pattern -* Tested against Vault 0.10.0 +* Tested against Vault 0.10.1 ## Maven Artifact diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 0348fd6..24cb8b8 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; */ @EnableRuleMigrationSupport public class HTTPVaultConnectorTest { - private static final String VAULT_VERISON = "0.10.0"; // the vault version this test is supposed to run against + private static final String VAULT_VERISON = "0.10.1"; // the vault version this test is supposed to run against private static final String KEY = "81011a8061e5c028bd0d9503eeba40bd9054b9af0408d080cb24f57405c27a61"; private static final String TOKEN_ROOT = "d1bd50e2-587b-6e68-d80b-a9a507625cb7"; private static final String USER_VALID = "validUser"; From 4dea8a1c5f1d00ccba04f1a092d61f335548b2e3 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sun, 10 Jun 2018 20:37:26 +0200 Subject: [PATCH 03/11] Test against 0.10.2 --- .travis.yml | 8 ++++---- README.md | 2 +- .../stklcode/jvault/connector/HTTPVaultConnectorTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef41ab5..8ff2183 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ addons: env: - PATH=$PATH:. before_script: - - wget https://releases.hashicorp.com/vault/0.10.1/vault_0.10.1_linux_amd64.zip - - wget -q -O - https://releases.hashicorp.com/vault/0.10.1/vault_0.10.1_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_0.10.1_linux_amd64.zip - - rm vault_0.10.1_linux_amd64.zip + - wget https://releases.hashicorp.com/vault/0.10.2/vault_0.10.2_linux_amd64.zip + - wget -q -O - https://releases.hashicorp.com/vault/0.10.2/vault_0.10.2_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_0.10.2_linux_amd64.zip + - rm vault_0.10.2_linux_amd64.zip cache: directories: - '$HOME/.m2/repository' diff --git a/README.md b/README.md index 357bdd2..529b020 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject * Raw secret content or JSON decoding * SQL secret handling * Connector Factory with builder pattern -* Tested against Vault 0.10.1 +* Tested against Vault 0.10.2 ## Maven Artifact diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 24cb8b8..153a752 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; */ @EnableRuleMigrationSupport public class HTTPVaultConnectorTest { - private static final String VAULT_VERISON = "0.10.1"; // the vault version this test is supposed to run against + private static final String VAULT_VERISON = "0.10.2"; // the vault version this test is supposed to run against private static final String KEY = "81011a8061e5c028bd0d9503eeba40bd9054b9af0408d080cb24f57405c27a61"; private static final String TOKEN_ROOT = "d1bd50e2-587b-6e68-d80b-a9a507625cb7"; private static final String USER_VALID = "validUser"; From 9e50190c02d64009ec6de91e7eb0494056eaefad Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Fri, 22 Jun 2018 20:26:42 +0200 Subject: [PATCH 04/11] Test against 0.10.3 --- .travis.yml | 8 ++++---- README.md | 2 +- .../stklcode/jvault/connector/HTTPVaultConnectorTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ff2183..39a6a19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ addons: env: - PATH=$PATH:. before_script: - - wget https://releases.hashicorp.com/vault/0.10.2/vault_0.10.2_linux_amd64.zip - - wget -q -O - https://releases.hashicorp.com/vault/0.10.2/vault_0.10.2_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_0.10.2_linux_amd64.zip - - rm vault_0.10.2_linux_amd64.zip + - wget https://releases.hashicorp.com/vault/0.10.3/vault_0.10.3_linux_amd64.zip + - wget -q -O - https://releases.hashicorp.com/vault/0.10.3/vault_0.10.3_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_0.10.3_linux_amd64.zip + - rm vault_0.10.3_linux_amd64.zip cache: directories: - '$HOME/.m2/repository' diff --git a/README.md b/README.md index 529b020..3c13b21 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject * Raw secret content or JSON decoding * SQL secret handling * Connector Factory with builder pattern -* Tested against Vault 0.10.2 +* Tested against Vault 0.10.3 ## Maven Artifact diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 153a752..8d7f85c 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; */ @EnableRuleMigrationSupport public class HTTPVaultConnectorTest { - private static final String VAULT_VERISON = "0.10.2"; // the vault version this test is supposed to run against + private static final String VAULT_VERISON = "0.10.3"; // the vault version this test is supposed to run against private static final String KEY = "81011a8061e5c028bd0d9503eeba40bd9054b9af0408d080cb24f57405c27a61"; private static final String TOKEN_ROOT = "d1bd50e2-587b-6e68-d80b-a9a507625cb7"; private static final String USER_VALID = "validUser"; From ce9cd9bbf175d37f8109b9b913713188d5b1bb5e Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Thu, 26 Jul 2018 20:10:06 +0200 Subject: [PATCH 05/11] Test against 0.10.4 --- .travis.yml | 8 ++++---- README.md | 2 +- .../stklcode/jvault/connector/HTTPVaultConnectorTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39a6a19..3596219 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ addons: env: - PATH=$PATH:. before_script: - - wget https://releases.hashicorp.com/vault/0.10.3/vault_0.10.3_linux_amd64.zip - - wget -q -O - https://releases.hashicorp.com/vault/0.10.3/vault_0.10.3_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_0.10.3_linux_amd64.zip - - rm vault_0.10.3_linux_amd64.zip + - wget https://releases.hashicorp.com/vault/0.10.4/vault_0.10.4_linux_amd64.zip + - wget -q -O - https://releases.hashicorp.com/vault/0.10.4/vault_0.10.4_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_0.10.4_linux_amd64.zip + - rm vault_0.10.4_linux_amd64.zip cache: directories: - '$HOME/.m2/repository' diff --git a/README.md b/README.md index 3c13b21..ab5306f 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject * Raw secret content or JSON decoding * SQL secret handling * Connector Factory with builder pattern -* Tested against Vault 0.10.3 +* Tested against Vault 0.10.4 ## Maven Artifact diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 8d7f85c..b51750f 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; */ @EnableRuleMigrationSupport public class HTTPVaultConnectorTest { - private static final String VAULT_VERISON = "0.10.3"; // the vault version this test is supposed to run against + private static final String VAULT_VERISON = "0.10.4"; // the vault version this test is supposed to run against private static final String KEY = "81011a8061e5c028bd0d9503eeba40bd9054b9af0408d080cb24f57405c27a61"; private static final String TOKEN_ROOT = "d1bd50e2-587b-6e68-d80b-a9a507625cb7"; private static final String USER_VALID = "validUser"; From 3db73a913a173a06290d151d7f88ab38d0250bfc Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Wed, 29 Aug 2018 11:45:37 +0200 Subject: [PATCH 06/11] Test against 0.11.0 --- .travis.yml | 8 ++++---- README.md | 2 +- .../stklcode/jvault/connector/HTTPVaultConnectorTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3596219..5bbd4d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ addons: env: - PATH=$PATH:. before_script: - - wget https://releases.hashicorp.com/vault/0.10.4/vault_0.10.4_linux_amd64.zip - - wget -q -O - https://releases.hashicorp.com/vault/0.10.4/vault_0.10.4_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_0.10.4_linux_amd64.zip - - rm vault_0.10.4_linux_amd64.zip + - wget https://releases.hashicorp.com/vault/0.11.0/vault_0.11.0_linux_amd64.zip + - wget -q -O - https://releases.hashicorp.com/vault/0.11.0/vault_0.11.0_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_0.11.0_linux_amd64.zip + - rm vault_0.11.0_linux_amd64.zip cache: directories: - '$HOME/.m2/repository' diff --git a/README.md b/README.md index ab5306f..95a1d99 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject * Raw secret content or JSON decoding * SQL secret handling * Connector Factory with builder pattern -* Tested against Vault 0.10.4 +* Tested against Vault 0.11.0 ## Maven Artifact diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index b51750f..5e1b419 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; */ @EnableRuleMigrationSupport public class HTTPVaultConnectorTest { - private static final String VAULT_VERISON = "0.10.4"; // the vault version this test is supposed to run against + private static final String VAULT_VERISON = "0.11.0"; // the vault version this test is supposed to run against private static final String KEY = "81011a8061e5c028bd0d9503eeba40bd9054b9af0408d080cb24f57405c27a61"; private static final String TOKEN_ROOT = "d1bd50e2-587b-6e68-d80b-a9a507625cb7"; private static final String USER_VALID = "validUser"; From ee9a6530d3903dfd493280365e8fa3d4dd14ff10 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sun, 9 Sep 2018 14:01:31 +0200 Subject: [PATCH 07/11] Test against 0.11.1 --- .travis.yml | 8 ++++---- README.md | 2 +- .../stklcode/jvault/connector/HTTPVaultConnectorTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bbd4d2..1dc9cdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ addons: env: - PATH=$PATH:. before_script: - - wget https://releases.hashicorp.com/vault/0.11.0/vault_0.11.0_linux_amd64.zip - - wget -q -O - https://releases.hashicorp.com/vault/0.11.0/vault_0.11.0_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_0.11.0_linux_amd64.zip - - rm vault_0.11.0_linux_amd64.zip + - wget https://releases.hashicorp.com/vault/0.11.1/vault_0.11.1_linux_amd64.zip + - wget -q -O - https://releases.hashicorp.com/vault/0.11.1/vault_0.11.1_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_0.11.1_linux_amd64.zip + - rm vault_0.11.1_linux_amd64.zip cache: directories: - '$HOME/.m2/repository' diff --git a/README.md b/README.md index 95a1d99..81b1f05 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject * Raw secret content or JSON decoding * SQL secret handling * Connector Factory with builder pattern -* Tested against Vault 0.11.0 +* Tested against Vault 0.11.1 ## Maven Artifact diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 5e1b419..6f6c89d 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; */ @EnableRuleMigrationSupport public class HTTPVaultConnectorTest { - private static final String VAULT_VERISON = "0.11.0"; // the vault version this test is supposed to run against + private static final String VAULT_VERISON = "0.11.1"; // the vault version this test is supposed to run against private static final String KEY = "81011a8061e5c028bd0d9503eeba40bd9054b9af0408d080cb24f57405c27a61"; private static final String TOKEN_ROOT = "d1bd50e2-587b-6e68-d80b-a9a507625cb7"; private static final String USER_VALID = "validUser"; From 6b1211d90fc7d74ff8e16c8b409dbb8d5e928735 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Wed, 28 Mar 2018 17:39:30 +0200 Subject: [PATCH 08/11] Modified test mocks for compatibility with JDK 10 build environments --- pom.xml | 29 +++++++------------ .../HTTPVaultConnectorOfflineTest.java | 22 ++++++++------ 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index d471d67..cc30146 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.stklcode.jvault connector - 0.7.1 + 0.7.2-SNAPSHOT jar @@ -29,7 +29,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.8.0 1.8 1.8 @@ -41,17 +41,17 @@ org.apache.maven.plugins maven-clean-plugin - 3.0.0 + 3.1.0 org.apache.maven.plugins maven-resources-plugin - 3.0.2 + 3.1.0 org.apache.maven.plugins maven-jar-plugin - 3.0.2 + 3.1.0 @@ -68,14 +68,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 - - - org.junit.platform - junit-platform-surefire-provider - 1.1.0 - - + 2.22.0 @@ -106,13 +99,13 @@ org.junit.jupiter junit-jupiter-engine - 5.1.0 + 5.3.0 test org.junit.jupiter junit-jupiter-migrationsupport - 5.1.0 + 5.3.0 org.hamcrest @@ -123,19 +116,19 @@ com.github.stefanbirkner system-rules - 1.17.1 + 1.17.2 test org.mockito mockito-core - 2.15.0 + 2.21.0 test org.mockito mockito-inline - 2.15.0 + 2.21.0 test diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorOfflineTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorOfflineTest.java index 1d09826..adc81c7 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorOfflineTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorOfflineTest.java @@ -60,7 +60,6 @@ import static org.mockito.Mockito.*; public class HTTPVaultConnectorOfflineTest { private static final String INVALID_URL = "foo:/\\1nv4l1d_UrL"; - private static HttpClientBuilder httpMockBuilder = mock(HttpClientBuilder.class); private static CloseableHttpClient httpMock = mock(CloseableHttpClient.class); private CloseableHttpResponse responseMock = mock(CloseableHttpResponse.class); @@ -76,7 +75,7 @@ public class HTTPVaultConnectorOfflineTest { * @return Mocked HTTP client builder. */ public static HttpClientBuilder create() { - return httpMockBuilder; + return new MockedHttpClientBuilder(); } @BeforeEach @@ -88,14 +87,8 @@ public class HTTPVaultConnectorOfflineTest { .make() .load(HttpClientBuilder.class.getClassLoader(), ClassReloadingStrategy.fromInstalledAgent()); - // Ignore SSL context settings. - when(httpMockBuilder.setSSLContext(null)).thenReturn(httpMockBuilder); - // Re-initialize HTTP mock to ensure fresh (empty) results. httpMock = mock(CloseableHttpClient.class); - - // Mock actual client creation. - when(httpMockBuilder.build()).thenReturn(httpMock); } /** @@ -466,7 +459,7 @@ public class HTTPVaultConnectorOfflineTest { private void setPrivate(Object target, String fieldName, Object value) { try { Field field = target.getClass().getDeclaredField(fieldName); - boolean accessible =field.isAccessible(); + boolean accessible = field.isAccessible(); field.setAccessible(true); field.set(target, value); field.setAccessible(accessible); @@ -480,4 +473,15 @@ public class HTTPVaultConnectorOfflineTest { when(responseMock.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), status, "")); when(responseMock.getEntity()).thenReturn(new StringEntity(body, type)); } + + /** + * Mocked {@link HttpClientBuilder} that always returns the mocked client. + */ + private static class MockedHttpClientBuilder extends HttpClientBuilder { + @Override + public CloseableHttpClient build() { + return httpMock; + } + } + } From 493e22e46b130b440cfd6d3339934bc682ec8b58 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sun, 9 Sep 2018 14:43:13 +0200 Subject: [PATCH 09/11] Update dependencies --- CHANGELOG.md | 4 ++++ pom.xml | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18f4095..de45255 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.7.2 [unreleased] +* [dependencies] Updated dependencies to fix vulnerabilities (i.e. CVE-2018-7489) +* [improvement] Build environment and tests now compatible with Java 10 + ## 0.7.1 [2018-03-17] * [improvement] Added automatic module name for JPMS compatibility * [dependencies] Minor dependency updates diff --git a/pom.xml b/pom.xml index cc30146..2b30270 100644 --- a/pom.xml +++ b/pom.xml @@ -78,22 +78,22 @@ org.apache.httpcomponents httpcore - 4.4.9 + 4.4.10 org.apache.httpcomponents httpclient - 4.5.5 + 4.5.6 com.fasterxml.jackson.core jackson-core - 2.9.4 + 2.9.6 com.fasterxml.jackson.core jackson-databind - 2.9.4 + 2.9.6 From 0193bebf0b86387a14b82451c57ba06827a69f2a Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sun, 9 Sep 2018 14:56:09 +0200 Subject: [PATCH 10/11] Fixed Sonarcloud quality gate badge [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81b1f05..c7f25b1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Java Vault Connector [![Build Status](https://travis-ci.org/stklcode/jvaultconnector.svg?branch=master)](https://travis-ci.org/stklcode/jvaultconnector) -[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=de.stklcode.jvault%3Aconnector)](https://sonarcloud.io/dashboard?id=de.stklcode.jvault%3Aconnector) +[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=de.stklcode.jvault%3Aconnector&metric=alert_status)](https://sonarcloud.io/dashboard?id=de.stklcode.jvault%3Aconnector) [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/stklcode/jvaultconnector/blob/master/LICENSE.txt) [![Maven Central](https://img.shields.io/maven-central/v/de.stklcode.jvault/connector.svg)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22de.stklcode.jvault%22%20AND%20a%3A%22connector%22) From 51d118786a8d756507fd0644dadd9941247a1f73 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Fri, 5 Oct 2018 19:37:37 +0200 Subject: [PATCH 11/11] Test against 0.11.2 --- .travis.yml | 8 ++++---- README.md | 2 +- .../stklcode/jvault/connector/HTTPVaultConnectorTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1dc9cdf..d5f500c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ addons: env: - PATH=$PATH:. before_script: - - wget https://releases.hashicorp.com/vault/0.11.1/vault_0.11.1_linux_amd64.zip - - wget -q -O - https://releases.hashicorp.com/vault/0.11.1/vault_0.11.1_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_0.11.1_linux_amd64.zip - - rm vault_0.11.1_linux_amd64.zip + - wget https://releases.hashicorp.com/vault/0.11.2/vault_0.11.2_linux_amd64.zip + - wget -q -O - https://releases.hashicorp.com/vault/0.11.2/vault_0.11.2_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_0.11.2_linux_amd64.zip + - rm vault_0.11.2_linux_amd64.zip cache: directories: - '$HOME/.m2/repository' diff --git a/README.md b/README.md index c7f25b1..5633707 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject * Raw secret content or JSON decoding * SQL secret handling * Connector Factory with builder pattern -* Tested against Vault 0.11.1 +* Tested against Vault 0.11.2 ## Maven Artifact diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 6f6c89d..44403a2 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; */ @EnableRuleMigrationSupport public class HTTPVaultConnectorTest { - private static final String VAULT_VERISON = "0.11.1"; // the vault version this test is supposed to run against + private static final String VAULT_VERISON = "0.11.2"; // the vault version this test is supposed to run against private static final String KEY = "81011a8061e5c028bd0d9503eeba40bd9054b9af0408d080cb24f57405c27a61"; private static final String TOKEN_ROOT = "d1bd50e2-587b-6e68-d80b-a9a507625cb7"; private static final String USER_VALID = "validUser";