diff --git a/pom.xml b/pom.xml index dd696bca..d28c6a5d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,17 +20,17 @@ UTF-8 - 3.17.2 + 3.18.1 2.4.0 5.7.0 - 1.3.72 - 1.3.8 - 1.10.0 - 3.5.10 - 5.2.9.RELEASE - Neumann-SR3 - 5.4.0 - Dysprosium-SR12 + 1.4.21 + 1.4.2 + 1.10.3-jdk8 + 3.6.28 + 5.3.2 + 2020.0.2 + 5.4.2 + 2020.0.2 1.8 multi spring-vault @@ -135,8 +135,8 @@ org.springframework.data - spring-data-releasetrain - ${spring-data-releasetrain.version} + spring-data-bom + ${spring-data-bom.version} pom import diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java index 1e668ba9..d3b3338d 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java @@ -557,7 +557,8 @@ class VaultTransitTemplateIntegrationTests extends IntegrationTestSupport { assertThat(decrypted.get(1).getCause()).isInstanceOf(VaultException.class); } catch (VaultException e) { - assertThat(e).hasMessageContaining("error"); // Vault 1.6 behavior is different + assertThat(e).hasMessageContaining("error"); // Vault 1.6 behavior is + // different } } diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml index d42354ae..d2577bc1 100644 --- a/spring-vault-dependencies/pom.xml +++ b/spring-vault-dependencies/pom.xml @@ -57,16 +57,16 @@ - 4.5.12 - 4.4.13 + 4.5.13 + 4.4.14 1.1.4 - 4.1.52.Final + 4.1.55.Final 3.14.9 - 2.11.2 - 1.11.861 - v1-rev20200827-1.30.10 - 0.21.1 - 1.66 + 2.12.0 + 1.11.916 + v1-rev20201112-1.31.0 + 0.22.1 + 1.67 diff --git a/spring-vault-distribution/pom.xml b/spring-vault-distribution/pom.xml index 67e03d4e..cd24f5a5 100644 --- a/spring-vault-distribution/pom.xml +++ b/spring-vault-distribution/pom.xml @@ -360,7 +360,7 @@ ${project.version} ${spring.version} - ${spring-data-releasetrain.version} + ${spring-data-bom.version} true 4 diff --git a/src/main/asciidoc/reference/vault-repositories.adoc b/src/main/asciidoc/reference/vault-repositories.adoc index b768d515..4dac8757 100644 --- a/src/main/asciidoc/reference/vault-repositories.adoc +++ b/src/main/asciidoc/reference/vault-repositories.adoc @@ -62,7 +62,7 @@ Then add the following to `pom.xml` dependencies section. org.springframework.data - spring-data-releasetrain + spring-data-bom {springDataVersion} import pom diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt index 726a77cc..504e2d93 100644 --- a/src/main/resources/changelog.txt +++ b/src/main/resources/changelog.txt @@ -14,6 +14,7 @@ Changes in version 2.3.0-RC1 * Netty4ClientHttpRequestFactory left uninitialized causing IllegalArgumentException: SSLContext is null #597 * Logger is not passed required parameter #599 * Infinite loop when using rotating generic secrets without TTL #601 +* Upgrade dependencies #607 Changes in version 2.3.0-M1 -----------------------------------------