Merge branch 'main' into develop

2023-11-26 11:04:17 +01:00 · 2023-11-26 11:04:17 +01:00 · 10965b01d6
commit 10965b01d6
parent 505d420fd6 0f302af3e7
7 changed files with 50 additions and 30 deletions
--- 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
--- a/.editorconfig
+++ 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
--- 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'
--- 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


--- 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
--- a/pom.xml
+++ b/pom.xml
@ -49,24 +49,24 @@
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
-            <version>2.15.2</version>
+            <version>2.16.0</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.datatype</groupId>
            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.15.2</version>
+            <version>2.16.0</version>
        </dependency>

        <dependency>
            <groupId>org.junit.jupiter</groupId>
            <artifactId>junit-jupiter</artifactId>
-            <version>5.10.0</version>
+            <version>5.10.1</version>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>org.mockito</groupId>
            <artifactId>mockito-core</artifactId>
-            <version>5.4.0</version>
+            <version>5.7.0</version>
            <scope>test</scope>
        </dependency>
        <dependency>
@ -76,21 +76,21 @@
            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
-            <version>2.35.0</version>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
+            <version>3.3.1</version>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
-            <version>2.13.0</version>
+            <version>2.15.0</version>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>nl.jqno.equalsverifier</groupId>
            <artifactId>equalsverifier</artifactId>
-            <version>3.15.1</version>
+            <version>3.15.3</version>
            <scope>test</scope>
        </dependency>
        <dependency>
@ -116,7 +116,7 @@
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.3.2</version>
                </plugin>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
@ -126,7 +126,7 @@
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.2</version>
                    <configuration>
                        <argLine>
                            @{argLine}
@ -164,7 +164,7 @@
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.2</version>
                    <configuration>
                        <argLine>
                            @{argLine}
@ -182,12 +182,12 @@
                <plugin>
                    <groupId>org.jacoco</groupId>
                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.10</version>
+                    <version>0.8.11</version>
                </plugin>
                <plugin>
                    <groupId>org.sonarsource.scanner.maven</groupId>
                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.9.1.2184</version>
+                    <version>3.10.0.2594</version>
                </plugin>
            </plugins>
        </pluginManagement>
@ -227,7 +227,7 @@
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.5.0</version>
+                        <version>3.6.2</version>
                        <configuration>
                            <source>11</source>
                        </configuration>
@ -322,7 +322,10 @@
                    <plugin>
                        <groupId>org.owasp</groupId>
                        <artifactId>dependency-check-maven</artifactId>
-                        <version>8.3.1</version>
+                        <version>9.0.0</version>
+                        <configuration>
+                            <nvdApiKey>${env.NVD_API_KEY}</nvdApiKey>
+                        </configuration>
                        <executions>
                            <execution>
                                <goals>
--- 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";