Skip to content

Commit 5585a40

Browse files
committed
Upgrade dependencies.
See gh-935
1 parent b005f4a commit 5585a40

File tree

3 files changed

+35
-20
lines changed

3 files changed

+35
-20
lines changed

pom.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,34 +22,34 @@
2222
<properties>
2323
<maven.antora-version>1.0.0-alpha.5</maven.antora-version>
2424
<antora.version>0.0.4</antora.version>
25-
<assertj-core.version>3.27.3</assertj-core.version>
26-
<aws-java-sdk.version>2.31.29</aws-java-sdk.version>
27-
<bcpkix-jdk18on.version>1.80</bcpkix-jdk18on.version>
28-
<errorprone.version>2.36.0</errorprone.version>
25+
<assertj-core.version>3.27.4</assertj-core.version>
26+
<aws-java-sdk.version>2.33.11</aws-java-sdk.version>
27+
<bcpkix-jdk18on.version>1.81</bcpkix-jdk18on.version>
28+
<errorprone.version>2.41.0</errorprone.version>
2929
<google-api-services-iam.version>v1-rev20221013-2.0.0
3030
</google-api-services-iam.version>
31-
<google-cloud-iamcredentials.version>2.60.0</google-cloud-iamcredentials.version>
32-
<google-auth-library-oauth2-http.version>1.33.1
31+
<google-cloud-iamcredentials.version>2.74.0</google-cloud-iamcredentials.version>
32+
<google-auth-library-oauth2-http.version>1.39.0
3333
</google-auth-library-oauth2-http.version>
3434
<httpclient5.version>5.5</httpclient5.version>
35-
<httpcore5.version>5.3.4</httpcore5.version>
35+
<httpcore5.version>5.3.5</httpcore5.version>
3636
<jackson-annotations.version>3.0-rc5</jackson-annotations.version>
37-
<jackson-core.version>3.0.0-rc5</jackson-core.version>
38-
<jackson-databind.version>3.0.0-rc5</jackson-databind.version>
37+
<jackson-core.version>3.0.0-rc9</jackson-core.version>
38+
<jackson-databind.version>3.0.0-rc9</jackson-databind.version>
3939
<jackson2-databind.version>2.19.0</jackson2-databind.version>
40-
<jetty-reactive-httpclient.version>4.0.10</jetty-reactive-httpclient.version>
40+
<jetty-reactive-httpclient.version>4.0.11</jetty-reactive-httpclient.version>
4141
<json-path.version>2.9.0</json-path.version>
42-
<junit.version>5.12.2</junit.version>
43-
<kotlin.version>2.2.0</kotlin.version>
42+
<junit.version>6.0.0-RC3</junit.version>
43+
<kotlin.version>2.2.20</kotlin.version>
4444
<kotlin-coroutines.version>1.10.2</kotlin-coroutines.version>
45-
<mockk.version>1.13.17</mockk.version>
46-
<mockito-core.version>5.17.0</mockito-core.version>
47-
<netty.version>4.2.3.Final</netty.version>
48-
<nullaway.version>0.12.3</nullaway.version>
45+
<mockk.version>1.14.5</mockk.version>
46+
<mockito-core.version>5.19.0</mockito-core.version>
47+
<netty.version>4.2.6.Final</netty.version>
48+
<nullaway.version>0.12.10</nullaway.version>
4949
<okhttp3.version>3.14.9</okhttp3.version>
5050
<spring.version>7.0.0-M9</spring.version>
5151
<spring-data-bom.version>2025.1.0-M6</spring-data-bom.version>
52-
<spring-security-bom.version>6.5.0</spring-security-bom.version>
52+
<spring-security-bom.version>7.0.0-M3</spring-security-bom.version>
5353
<reactor.version>2025.0.0-M5</reactor.version>
5454

5555
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

spring-vault-core/src/test/java/org/springframework/vault/support/CertificateBundleUnitTests.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package org.springframework.vault.support;
1717

18+
import java.io.IOException;
19+
import java.io.InputStream;
1820
import java.net.URL;
1921
import java.security.KeyFactory;
2022
import java.security.KeyStore;
@@ -26,6 +28,8 @@
2628
import org.junit.jupiter.params.provider.ValueSource;
2729
import tools.jackson.databind.ObjectMapper;
2830

31+
import org.springframework.util.StreamUtils;
32+
2933
import static org.assertj.core.api.Assertions.assertThat;
3034

3135
/**
@@ -159,9 +163,19 @@ void shouldCreateKeystore(String path) {
159163

160164
CertificateBundle loadCertificateBundle(String path) {
161165

162-
URL resource = getClass().getClassLoader().getResource(path);
166+
InputStream resource = getClass().getClassLoader().getResourceAsStream(path);
163167
assertThat(resource).as("Resource " + path).isNotNull();
164-
return this.OBJECT_MAPPER.readValue(resource, CertificateBundle.class);
168+
try {
169+
return this.OBJECT_MAPPER.readValue(resource, CertificateBundle.class);
170+
}
171+
finally {
172+
try {
173+
resource.close();
174+
}
175+
catch (IOException e) {
176+
throw new RuntimeException(e);
177+
}
178+
}
165179
}
166180

167181
}

spring-vault-core/src/test/java/org/springframework/vault/support/CertificateUnitTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ class CertificateUnitTests {
4040
@SuppressWarnings("unchecked")
4141
@BeforeEach
4242
void before() throws Exception {
43-
Map<String, String> data = this.OBJECT_MAPPER.readValue(getClass().getResource("/certificate.json"), Map.class);
43+
Map<String, String> data = this.OBJECT_MAPPER.readValue(getClass().getResourceAsStream("/certificate.json"),
44+
Map.class);
4445

4546
this.certificate = Certificate.of(data.get("serial_number"), data.get("certificate"), data.get("issuing_ca"),
4647
List.of(), 0L);

0 commit comments

Comments
 (0)