From 639d0e3c5b996893e831ab9a301c8045dd238e48 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Mon, 29 Mar 2021 18:56:24 +0200 Subject: [PATCH] Jackson 2.12.2, test against Vault 1.7.0 --- .drone.yml | 10 +++++----- .travis.yml | 4 ++-- CHANGELOG.md | 3 ++- README.md | 2 +- pom.xml | 8 ++++---- .../jvault/connector/HTTPVaultConnectorTest.java | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index e7b3bf0..b0f1e6c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,12 +25,12 @@ steps: - name: unit-integration-tests image: maven:3-jdk-11 environment: - VAULT_VERSION: 1.6.3 + VAULT_VERSION: 1.7.0 commands: - - curl -s -o vault_1.6.3_linux_amd64.zip https://releases.hashicorp.com/vault/1.6.3/vault_1.6.3_linux_amd64.zip - - curl -s https://releases.hashicorp.com/vault/1.6.3/vault_1.6.3_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_1.6.3_linux_amd64.zip - - rm vault_1.6.3_linux_amd64.zip + - curl -s -o vault_1.7.0_linux_amd64.zip https://releases.hashicorp.com/vault/1.7.0/vault_1.7.0_linux_amd64.zip + - curl -s https://releases.hashicorp.com/vault/1.7.0/vault_1.7.0_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_1.7.0_linux_amd64.zip + - rm vault_1.7.0_linux_amd64.zip - mv vault /bin/ - mvn -B resources:testResources compiler:testCompile surefire:test when: diff --git a/.travis.yml b/.travis.yml index a397bfe..72c31a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ addons: secure: "sM9OfX5jW764pn9cb2LSXArnXucKMws+eGeg5NnZxHRcGYt4hpBKLSregBSsBNzUoWVj0zNzPCpnh+UQvgxQzUerOqwEdjTBpy3SNPaxSn7UpoSg+Wz3aUmL9ugmx01b51/wMG4UCHEwTZt2tpgTPVtw8K6uSO78e0dSICCBHDnRcdQwOjMEQHIJJ/qHVRwuy/MzLCAP3W1JPZlsphZg9QsFyhB4hW97dE90joZezfocQIv2xI/r6k+BLz0pY6MxYCul0RiDumaiaej0CPvEJI/uSu//BAQjUdHw+mQgnKUYIbrn2ONOviwNfwdr94JyoZEN2B6zASUmNLjPf4AbIojDeyS+CrpQpm17EVm/Qk/Ds+Xra4PPPIcsZhiWzV0KoDUz9xLfXuRJ526VT5tDPiaeI7oETf0+8l+JIS1b399FyqHi7smzjpvC6GuKflQrbuHK4MuKzDh7WTHiqokGG4SS0wOQIaaHB3dfdwwQzPh6IM24e8CETxh3DjMeqUTU4DWmv5po55jZ934TtxVQvVN78bTG9O0zS9u+JmRY04OZ+OaXuFam6MfMUFQi0EPZzdGul/oWSibGUu3bNfVEBp60CnJwYNM/dKG6U7pJthLHvSwiQFOdKzHZ+l1jZJ4gPaXaIGqpwqVGr28ntqA/El1rytPixr2driE6bYMt5jw=" env: - - PATH=$PATH:. VAULT_VERSION=1.6.3 ANALYSIS=false + - PATH=$PATH:. VAULT_VERSION=1.7.0 ANALYSIS=false cache: directories: @@ -18,7 +18,7 @@ jobs: include: - jdk: openjdk8 - jdk: openjdk11 - env: PATH=$PATH:. VAULT_VERSION=1.6.3 ANALYSIS=true + env: PATH=$PATH:. VAULT_VERSION=1.7.0 ANALYSIS=true - jdk: openjdk16 before_script: diff --git a/CHANGELOG.md b/CHANGELOG.md index 946994a..2865ffb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,10 @@ ### Improvements * Use pre-sized map objects for fixed-size payloads +* Minor dependency updates ### Test -* Tested against Vault 1.6.3 +* Tested against Vault 1.7.0 ## 0.9.2 (2021-01-24) diff --git a/README.md b/README.md index feed706..0e36721 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject * SQL secret handling * KV v1 and v2 support * Connector Factory with builder pattern -* Tested against Vault 1.6.3 +* Tested against Vault 1.7.0 ## Maven Artifact diff --git a/pom.xml b/pom.xml index 5e5f197..623afbd 100644 --- a/pom.xml +++ b/pom.xml @@ -111,13 +111,13 @@ com.fasterxml.jackson.core jackson-databind - 2.12.1 + 2.12.2 org.junit.jupiter junit-jupiter - 5.7.0 + 5.7.1 test @@ -129,13 +129,13 @@ org.mockito mockito-core - 3.7.7 + 3.8.0 test org.mockito mockito-inline - 3.7.7 + 3.8.0 test diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 0958db5..5a99b02 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -54,7 +54,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; */ @Tag("online") class HTTPVaultConnectorTest { - private static String VAULT_VERSION = "1.6.3"; // the vault version this test is supposed to run against + private static String VAULT_VERSION = "1.7.0"; // the vault version this test is supposed to run against private static final String KEY1 = "E38bkCm0VhUvpdCKGQpcohhD9XmcHJ/2hreOSY019Lho"; private static final String KEY2 = "O5OHwDleY3IiPdgw61cgHlhsrEm6tVJkrxhF6QAnILd1"; private static final String KEY3 = "mw7Bm3nbt/UWa/juDjjL2EPQ04kiJ0saC5JEXwJvXYsB";