diff --git a/.drone.yml b/.drone.yml
index 9221f8a..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:
@@ -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
@@ -38,9 +38,9 @@ steps:
- main
- release/*
- name: unit-integration-tests
- image: maven:3-eclipse-temurin-17
+ image: maven:3-eclipse-temurin-21
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/.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
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf8ba4a..a6fd050 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,8 +5,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- jdk: [ 11, 17, 20 ]
- vault: [ '1.2.0', '1.11.12', '1.14.0' ]
+ jdk: [ 11, 17, 21 ]
+ 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 749743f..8622edf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@
### Improvements
* Parse timestamps as `ZonedDateTime` instead of `String` representation
+### Dependencies
+* Updated Jackson to 2.16.0
+
## 1.1.5 (2023-08-19)
@@ -13,7 +16,7 @@
* Fixed JSON type conversion in `SecretResponse#get(String, Class)` (#67)
### Test
-* Tested against Vault 1.2.0 to 1.14.0
+* Tested against Vault 1.2 to 1.15
## 1.1.4 (2023-06-15)
@@ -183,7 +186,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
@@ -203,14 +206,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
@@ -302,7 +305,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/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/pom.xml b/pom.xml
index fc797ad..6abf654 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,24 +49,24 @@
com.fasterxml.jackson.core
jackson-databind
- 2.15.2
+ 2.16.0
com.fasterxml.jackson.datatype
jackson-datatype-jsr310
- 2.15.2
+ 2.16.0
org.junit.jupiter
junit-jupiter
- 5.10.0
+ 5.10.1
test
org.mockito
mockito-core
- 5.4.0
+ 5.7.0
test
@@ -76,21 +76,21 @@
test
- com.github.tomakehurst
- wiremock-jre8
- 2.35.0
+ org.wiremock
+ wiremock
+ 3.3.1
test
commons-io
commons-io
- 2.13.0
+ 2.15.0
test
nl.jqno.equalsverifier
equalsverifier
- 3.15.1
+ 3.15.3
test
@@ -116,7 +116,7 @@
org.apache.maven.plugins
maven-clean-plugin
- 3.3.1
+ 3.3.2
org.apache.maven.plugins
@@ -126,7 +126,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
- 3.1.2
+ 3.2.2
@{argLine}
@@ -164,7 +164,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 3.1.2
+ 3.2.2
@{argLine}
@@ -182,12 +182,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
@@ -227,7 +227,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.5.0
+ 3.6.2
11
@@ -322,7 +322,10 @@
org.owasp
dependency-check-maven
- 8.3.1
+ 9.0.0
+
+ ${env.NVD_API_KEY}
+
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";