From c06cb9b0fb7bff76685a0ced97fa2e4e59e20b3a Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Fri, 8 Sep 2023 20:41:37 +0200 Subject: [PATCH 1/9] deps: update test dependencies * Wiremock 3 * Mockito 5.5 --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index d37c3af..3a1a53f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.stklcode.jvault jvault-connector - 1.1.5 + 1.1.6-SNAPSHOT jar @@ -61,7 +61,7 @@ org.mockito mockito-core - 5.4.0 + 5.5.0 test @@ -71,9 +71,9 @@ test - com.github.tomakehurst - wiremock-jre8 - 2.35.0 + org.wiremock + wiremock + 3.0.3 test @@ -316,7 +316,7 @@ org.owasp dependency-check-maven - 8.3.1 + 8.4.0 From 08e8c9f090be33c53f03225d3d1d14df7c5df562 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Wed, 27 Sep 2023 20:18:34 +0200 Subject: [PATCH 2/9] test against Vault 1.15.0 --- .drone.yml | 4 ++-- .github/workflows/ci.yml | 2 +- CHANGELOG.md | 3 +++ README.md | 2 +- .../de/stklcode/jvault/connector/HTTPVaultConnectorIT.java | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9221f8a..6d9e01a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: - name: setup-vault image: alpine:latest environment: - VAULT_VERSION: 1.14.0 + VAULT_VERSION: 1.15.0 commands: - wget -q -O vault_$${VAULT_VERSION}_linux_amd64.zip https://releases.hashicorp.com/vault/$${VAULT_VERSION}/vault_$${VAULT_VERSION}_linux_amd64.zip - wget -q -O - https://releases.hashicorp.com/vault/$${VAULT_VERSION}/vault_$${VAULT_VERSION}_SHA256SUMS | grep linux_amd64 | sha256sum -c @@ -40,7 +40,7 @@ steps: - name: unit-integration-tests image: maven:3-eclipse-temurin-17 environment: - VAULT_VERSION: 1.14.0 + VAULT_VERSION: 1.15.0 commands: - export PATH=.bin:$${PATH} - mvn -B -P integration-test verify diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf8ba4a..afe64ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: strategy: matrix: jdk: [ 11, 17, 20 ] - vault: [ '1.2.0', '1.11.12', '1.14.0' ] + vault: [ '1.2.0', '1.11.12', '1.15.0' ] include: - jdk: 17 vault: '1.11.12' diff --git a/CHANGELOG.md b/CHANGELOG.md index 144a259..b6ca930 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ ### Fix * Fixed JSON type conversion in `SecretResponse#get(String, Class)` (#67) +### Test +* Tested against Vault 1.2 to 1.15 + ## 1.1.4 (2023-06-15) diff --git a/README.md b/README.md index 29b8573..4c8adf0 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.2 to 1.14 +* Tested against Vault 1.2 to 1.15 ## Maven Artifact diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java index 1668119..54f7df1 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java @@ -51,7 +51,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; * @since 0.1 */ class HTTPVaultConnectorIT { - private static String VAULT_VERSION = "1.14.0"; // The vault version this test is supposed to run against. + private static String VAULT_VERSION = "1.15.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"; From 5e5143168e104eda8fe784525f66a77c84c81752 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sun, 15 Oct 2023 17:10:22 +0200 Subject: [PATCH 3/9] ci: build and test with JDK 21 --- .drone.yml | 6 +++--- .github/workflows/ci.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6d9e01a..226a505 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ name: default steps: - name: compile - image: maven:3-eclipse-temurin-17 + image: maven:3-eclipse-temurin-21 commands: - mvn -B clean compile when: @@ -14,7 +14,7 @@ steps: - fix/* - release/* - name: unit-tests - image: maven:3-eclipse-temurin-17 + image: maven:3-eclipse-temurin-21 commands: - mvn -B test when: @@ -38,7 +38,7 @@ steps: - main - release/* - name: unit-integration-tests - image: maven:3-eclipse-temurin-17 + image: maven:3-eclipse-temurin-21 environment: VAULT_VERSION: 1.15.0 commands: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index afe64ea..a6fd050 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - jdk: [ 11, 17, 20 ] + jdk: [ 11, 17, 21 ] vault: [ '1.2.0', '1.11.12', '1.15.0' ] include: - jdk: 17 From 2722a125e56988e8c7ad9cde43887bac13a97592 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Mon, 23 Oct 2023 18:17:41 +0200 Subject: [PATCH 4/9] deps: update jackson to 2.15.3 --- CHANGELOG.md | 6 ++++++ pom.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6ca930..d0e9802 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## unreleased + +### Dependencies +* Updated Jackson to 2.15.3 + + ## 1.1.5 (2023-08-19) ### Fix diff --git a/pom.xml b/pom.xml index 3a1a53f..43a2bc5 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ com.fasterxml.jackson.core jackson-databind - 2.15.2 + 2.15.3 From cc290f4defdb222694a0108924920c3b4e046cec Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Mon, 23 Oct 2023 18:18:24 +0200 Subject: [PATCH 5/9] deps: update test dependencies and Maven plugins --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 43a2bc5..a18571e 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ org.mockito mockito-core - 5.5.0 + 5.6.0 test @@ -73,19 +73,19 @@ org.wiremock wiremock - 3.0.3 + 3.2.0 test commons-io commons-io - 2.13.0 + 2.14.0 test nl.jqno.equalsverifier equalsverifier - 3.15.1 + 3.15.2 test @@ -176,12 +176,12 @@ org.jacoco jacoco-maven-plugin - 0.8.10 + 0.8.11 org.sonarsource.scanner.maven sonar-maven-plugin - 3.9.1.2184 + 3.10.0.2594 @@ -221,7 +221,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 11 @@ -316,7 +316,7 @@ org.owasp dependency-check-maven - 8.4.0 + 8.4.1 From 683052a8041c317f888ca29ede5ff715d675b6b5 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Mon, 23 Oct 2023 18:24:22 +0200 Subject: [PATCH 6/9] add basic .editorconfig --- .editorconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..ea91526 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,14 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +max_line_length = 120 +tab_width = 4 +trim_trailing_whitespace = true + +[{*.yaml,*.yml}] +indent_size = 2 From 1d9e1458bedb1308e220ff9acdb7e5ae510e280c Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Thu, 16 Nov 2023 18:25:37 +0100 Subject: [PATCH 7/9] deps: update test dependencies and Maven plugins --- pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index a18571e..3cdbcdf 100644 --- a/pom.xml +++ b/pom.xml @@ -55,13 +55,13 @@ org.junit.jupiter junit-jupiter - 5.10.0 + 5.10.1 test org.mockito mockito-core - 5.6.0 + 5.7.0 test @@ -73,19 +73,19 @@ org.wiremock wiremock - 3.2.0 + 3.3.1 test commons-io commons-io - 2.14.0 + 2.15.0 test nl.jqno.equalsverifier equalsverifier - 3.15.2 + 3.15.3 test @@ -111,7 +111,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.3.1 + 3.3.2 org.apache.maven.plugins @@ -121,7 +121,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 + 3.2.2 @{argLine} @@ -159,7 +159,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.2 @{argLine} @@ -221,7 +221,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.0 + 3.6.2 11 @@ -316,7 +316,7 @@ org.owasp dependency-check-maven - 8.4.1 + 8.4.2 From 02ae647002cd1f8f21836b18af5d275d73a4672c Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Thu, 16 Nov 2023 18:27:10 +0100 Subject: [PATCH 8/9] deps: update jackson to 2.16.0 --- CHANGELOG.md | 10 +++++----- pom.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0e9802..9e82bac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## unreleased ### Dependencies -* Updated Jackson to 2.15.3 +* Updated Jackson to 2.16.0 ## 1.1.5 (2023-08-19) @@ -180,7 +180,7 @@ Old builders will be removed in 1.0 * Added `entity_id`, `token_policies`, `token_type` and `orphan` flags to auth response * Added `entity_id`, `expire_time`, `explicit_max_ttl`, `issue_time`, `renewable` and `type` flags to token data * Added `explicit_max_ttl`, `period` and `entity_alias` flags to _Token_ model (#41) -* Added `enable_local_secret_ids`, `token_bound_cidrs`, `token_explicit_max_ttl`, `token_no_default_policy`, +* Added `enable_local_secret_ids`, `token_bound_cidrs`, `token_explicit_max_ttl`, `token_no_default_policy`, `token_num_uses`, `token_period` and `token_type` flags to _AppRole_ model * Minor dependency updates @@ -200,14 +200,14 @@ Old builders will be removed in 1.0 ## 0.8.2 (2019-10-20) ### Fixes -* Fixed token lookup (#31) +* Fixed token lookup (#31) ### Improvements * Updated dependencies ## 0.8.1 (2019-08-16) ### Fixes -* Removed compile dependency to JUnit library (#30) +* Removed compile dependency to JUnit library (#30) ### Improvements * Updated dependencies @@ -299,7 +299,7 @@ Old builders will be removed in 1.0 ### Fixes * `SecretResponse` does not throw NPE on `get(key)` and `getData()` -### Test +### Test * Tested against Vault 0.7.2 diff --git a/pom.xml b/pom.xml index 3cdbcdf..959f31a 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ com.fasterxml.jackson.core jackson-databind - 2.15.3 + 2.16.0 From 0f302af3e74b221ae5c368a8f764a28c32c48059 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sun, 26 Nov 2023 10:57:53 +0100 Subject: [PATCH 9/9] deps: update dependency-check-maven plugin to 9.0.0 --- pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 959f31a..7b4ff15 100644 --- a/pom.xml +++ b/pom.xml @@ -316,7 +316,10 @@ org.owasp dependency-check-maven - 8.4.2 + 9.0.0 + + ${env.NVD_API_KEY} +