diff --git a/pom.xml b/pom.xml index 758baf17..c1c9f246 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 1.10.3-jdk8 3.8.0 5.3.20 - 2021.2.0 + 2021.2.1 5.4.5 2020.0.13 1.8 diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/PemObject.java b/spring-vault-core/src/main/java/org/springframework/vault/support/PemObject.java index a88ab9df..af491656 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/PemObject.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/PemObject.java @@ -287,12 +287,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(); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/repository/VaultKv2RepositoryIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/VaultKv2RepositoryIntegrationTests.java index 069b5377..76a1e946 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/repository/VaultKv2RepositoryIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/repository/VaultKv2RepositoryIntegrationTests.java @@ -142,7 +142,6 @@ class VaultKv2RepositoryIntegrationTests extends IntegrationTestSupport { } @Test - @Disabled("Until https://github.com/spring-projects/spring-vault/issues/701 is resolved") void deleteVersioned() { VersionedPerson person = new VersionedPerson();