Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Framework 6.0 M5.

Browse Source 
Closes gh-715
This commit is contained in:
Mark Paluch
2022-07-15 08:46:17 +02:00
parent 557bc13df5
commit 623d6cc38f
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -27,7 +27,7 @@
<kotlin-coroutines.version>1.6.2</kotlin-coroutines.version>
<mockk.version>1.10.3-jdk8</mockk.version>
<mockito-core.version>3.8.0</mockito-core.version>
<spring.version>6.0.0-SNAPSHOT</spring.version>
<spring.version>6.0.0-M5</spring.version>
<spring-data-bom.version>2022.0.0-M4</spring-data-bom.version>
<spring-security-bom.version>5.4.5</spring-security-bom.version>
<reactor.version>2020.0.13</reactor.version>

14
spring-vault-core/src/main/java/org/springframework/vault/support/PemObject.java
View File

@@ -276,12 +276,14 @@ public class PemObject {
enum PemObjectType {
CERTIFICATE_REQUEST("CERTIFICATE REQUEST"), NEW_CERTIFICATE_REQUEST("NEW CERTIFICATE REQUEST"),
CERTIFICATE("CERTIFICATE"), TRUSTED_CERTIFICATE("TRUSTED CERTIFICATE"), X509_CERTIFICATE("X509 CERTIFICATE"),
X509_CRL("X509 CRL"), PKCS7("PKCS7"), CMS("CMS"), ATTRIBUTE_CERTIFICATE("ATTRIBUTE CERTIFICATE"),
EC_PARAMETERS("EC PARAMETERS"), PUBLIC_KEY("PUBLIC KEY"), RSA_PUBLIC_KEY("RSA PUBLIC KEY"),
RSA_PRIVATE_KEY("RSA PRIVATE KEY"), EC_PRIVATE_KEY("EC PRIVATE KEY"),
ENCRYPTED_PRIVATE_KEY("ENCRYPTED PRIVATE KEY"), PRIVATE_KEY("PRIVATE KEY");
CERTIFICATE_REQUEST("CERTIFICATE REQUEST"), NEW_CERTIFICATE_REQUEST("NEW CERTIFICATE REQUEST"), CERTIFICATE(
"CERTIFICATE"), TRUSTED_CERTIFICATE("TRUSTED CERTIFICATE"), X509_CERTIFICATE(
"X509 CERTIFICATE"), X509_CRL("X509 CRL"), PKCS7("PKCS7"), CMS("CMS"), ATTRIBUTE_CERTIFICATE(
"ATTRIBUTE CERTIFICATE"), EC_PARAMETERS(
"EC PARAMETERS"), PUBLIC_KEY("PUBLIC KEY"), RSA_PUBLIC_KEY(
"RSA PUBLIC KEY"), RSA_PRIVATE_KEY("RSA PRIVATE KEY"), EC_PRIVATE_KEY(
"EC PRIVATE KEY"), ENCRYPTED_PRIVATE_KEY(
"ENCRYPTED PRIVATE KEY"), PRIVATE_KEY("PRIVATE KEY");
// cache
private static final PemObjectType[] constants = values();

4
spring-vault-core/src/test/java/org/springframework/vault/annotation/LeaseAwareVaultPropertySourceIntegrationTests.java
View File

@@ -89,7 +89,7 @@ class LeaseAwareVaultPropertySourceIntegrationTests {
}
catch (Exception e) {
assertThat(e).hasRootCauseInstanceOf(VaultPropertySourceNotFoundException.class)
.hasMessageContaining("Vault location [unknown] not resolvable");
.hasRootCauseMessage("Vault location [unknown] not resolvable");
}
}
@@ -103,7 +103,7 @@ class LeaseAwareVaultPropertySourceIntegrationTests {
}
catch (Exception e) {
assertThat(e).hasRootCauseInstanceOf(VaultPropertySourceNotFoundException.class)
.hasMessageContaining("Vault location [unknown] not resolvable");
.hasRootCauseMessage("Vault location [unknown] not resolvable");
}
}

8
spring-vault-core/src/test/java/org/springframework/vault/client/VaultResponsesUnitTests.java
View File

@@ -39,7 +39,7 @@ class VaultResponsesUnitTests {
HttpStatusCodeException cause = new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Bad Request");
VaultException vaultException = VaultResponses.buildException(cause);
assertThat(vaultException).hasMessageContaining("Status 400 Bad Request;").hasCause(cause);
assertThat(vaultException).hasMessageContaining("Status 400 Bad Request").hasCause(cause);
}
@Test
@@ -49,7 +49,7 @@ class VaultResponsesUnitTests {
"{\"errors\":[\"some-error\"]}".getBytes(), StandardCharsets.US_ASCII);
VaultException vaultException = VaultResponses.buildException(cause);
assertThat(vaultException).hasMessageContaining("Status 400 Bad Request: some-error;").hasCause(cause);
assertThat(vaultException).hasMessageContaining("Status 400 Bad Request: some-error").hasCause(cause);
}
@Test
@@ -58,7 +58,7 @@ class VaultResponsesUnitTests {
HttpStatusCodeException cause = new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Bad Request");
VaultException vaultException = VaultResponses.buildException(cause, "sys/path");
assertThat(vaultException).hasMessageContaining("Status 400 Bad Request [sys/path];").hasCause(cause);
assertThat(vaultException).hasMessageContaining("Status 400 Bad Request [sys/path]").hasCause(cause);
}
@Test
@@ -68,7 +68,7 @@ class VaultResponsesUnitTests {
"{\"errors\":[\"some-error\"]}".getBytes(), StandardCharsets.US_ASCII);
VaultException vaultException = VaultResponses.buildException(cause, "sys/path");
assertThat(vaultException).hasMessageContaining("Status 400 Bad Request [sys/path]: some-error;")
assertThat(vaultException).hasMessageContaining("Status 400 Bad Request [sys/path]: some-error")
.hasCause(cause);
}