Skip to content

Commit c0a8a30

Browse files
committed
Upgrade dependencies
* HttpClient 4.5.13 * HttpCore 4.4.14 * Jetty Reactive Httpclient 1.1.4 * Jackson Databind 2.12.0 * AWS SDK 1.11.916 * Google API Services v1-rev20201112-1.31.0 * Google Oauth 0.22.1 * BouncyCastle 1.67 * AssertJ 3.18.1 * JUnit 5.7.0 * Kotlin 1.4.21 * Kotlin Coroutines 1.4.2 * Mockito 3.6.28 * Spring Framework 5.3.2 * Spring Data 2020.0.2 * Spring Security 5.4.2 * Reactor Dysprosium 2020.0.2 Closes gh-607
1 parent 49d78f6 commit c0a8a30

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020

2121
<properties>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23-
<assertj-core.version>3.17.2</assertj-core.version>
23+
<assertj-core.version>3.18.1</assertj-core.version>
2424
<json-path.version>2.4.0</json-path.version>
2525
<junit.version>5.7.0</junit.version>
26-
<kotlin.version>1.3.72</kotlin.version>
27-
<kotlin-coroutines.version>1.3.8</kotlin-coroutines.version>
28-
<mockk.version>1.10.0</mockk.version>
29-
<mockito-core.version>3.5.10</mockito-core.version>
30-
<spring.version>5.2.9.RELEASE</spring.version>
31-
<spring-data-releasetrain.version>Neumann-SR3</spring-data-releasetrain.version>
32-
<spring-security-bom.version>5.4.0</spring-security-bom.version>
33-
<reactor.version>Dysprosium-SR12</reactor.version>
26+
<kotlin.version>1.4.21</kotlin.version>
27+
<kotlin-coroutines.version>1.4.2</kotlin-coroutines.version>
28+
<mockk.version>1.10.3-jdk8</mockk.version>
29+
<mockito-core.version>3.6.28</mockito-core.version>
30+
<spring.version>5.3.2</spring.version>
31+
<spring-data-bom.version>2020.0.2</spring-data-bom.version>
32+
<spring-security-bom.version>5.4.2</spring-security-bom.version>
33+
<reactor.version>2020.0.2</reactor.version>
3434
<java.version>1.8</java.version>
3535
<project.type>multi</project.type>
3636
<dist.id>spring-vault</dist.id>
@@ -135,8 +135,8 @@
135135

136136
<dependency>
137137
<groupId>org.springframework.data</groupId>
138-
<artifactId>spring-data-releasetrain</artifactId>
139-
<version>${spring-data-releasetrain.version}</version>
138+
<artifactId>spring-data-bom</artifactId>
139+
<version>${spring-data-bom.version}</version>
140140
<type>pom</type>
141141
<scope>import</scope>
142142
</dependency>

spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,8 @@ void shouldBatchDecryptWithWrongContext() {
557557
assertThat(decrypted.get(1).getCause()).isInstanceOf(VaultException.class);
558558
}
559559
catch (VaultException e) {
560-
assertThat(e).hasMessageContaining("error"); // Vault 1.6 behavior is different
560+
assertThat(e).hasMessageContaining("error"); // Vault 1.6 behavior is
561+
// different
561562
}
562563
}
563564

spring-vault-dependencies/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@
5757
</licenses>
5858

5959
<properties>
60-
<httpclient.version>4.5.12</httpclient.version>
61-
<httpcore.version>4.4.13</httpcore.version>
60+
<httpclient.version>4.5.13</httpclient.version>
61+
<httpcore.version>4.4.14</httpcore.version>
6262
<jetty-reactive-httpclient.version>1.1.4</jetty-reactive-httpclient.version>
63-
<netty.version>4.1.52.Final</netty.version>
63+
<netty.version>4.1.55.Final</netty.version>
6464
<okhttp3.version>3.14.9</okhttp3.version>
65-
<jackson-databind.version>2.11.2</jackson-databind.version>
66-
<aws-java-sdk.version>1.11.861</aws-java-sdk.version>
67-
<google-api-services-iam.version>v1-rev20200827-1.30.10</google-api-services-iam.version>
68-
<google-auth-library-oauth2-http.version>0.21.1</google-auth-library-oauth2-http.version>
69-
<bcpkix-jdk15on.version>1.66</bcpkix-jdk15on.version>
65+
<jackson-databind.version>2.12.0</jackson-databind.version>
66+
<aws-java-sdk.version>1.11.916</aws-java-sdk.version>
67+
<google-api-services-iam.version>v1-rev20201112-1.31.0</google-api-services-iam.version>
68+
<google-auth-library-oauth2-http.version>0.22.1</google-auth-library-oauth2-http.version>
69+
<bcpkix-jdk15on.version>1.67</bcpkix-jdk15on.version>
7070
</properties>
7171

7272
<dependencyManagement>

spring-vault-distribution/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@
360360
<projectVersion>${project.version}</projectVersion>
361361
<springVersion>${spring.version}</springVersion>
362362
<springDataVersion>
363-
${spring-data-releasetrain.version}
363+
${spring-data-bom.version}
364364
</springDataVersion>
365365
<allow-uri-read>true</allow-uri-read>
366366
<toclevels>4</toclevels>

src/main/asciidoc/reference/vault-repositories.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Then add the following to `pom.xml` dependencies section.
6262
<dependencies>
6363
<dependency>
6464
<groupId>org.springframework.data</groupId>
65-
<artifactId>spring-data-releasetrain</artifactId>
65+
<artifactId>spring-data-bom</artifactId>
6666
<version>{springDataVersion}</version>
6767
<scope>import</scope>
6868
<type>pom</type>

src/main/resources/changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Changes in version 2.3.0-RC1
1414
* Netty4ClientHttpRequestFactory left uninitialized causing IllegalArgumentException: SSLContext is null #597
1515
* Logger is not passed required parameter #599
1616
* Infinite loop when using rotating generic secrets without TTL #601
17+
* Upgrade dependencies #607
1718

1819
Changes in version 2.3.0-M1
1920
-----------------------------------------

0 commit comments

Comments
 (0)