From 8ea17c318a4141d0e978f7fb733455a08ce0f5db Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Fri, 24 Jun 2022 15:27:48 +0200
Subject: [PATCH] Upgrade to Spring Data 2021.2.1.

Closes gh-701
---
 pom.xml                                            |  2 +-
 .../springframework/vault/support/PemObject.java   | 14 ++++++++------
 .../VaultKv2RepositoryIntegrationTests.java        |  1 -
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 758baf17..c1c9f246 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<mockk.version>1.10.3-jdk8</mockk.version>
 		<mockito-core.version>3.8.0</mockito-core.version>
 		<spring.version>5.3.20</spring.version>
-		<spring-data-bom.version>2021.2.0</spring-data-bom.version>
+		<spring-data-bom.version>2021.2.1</spring-data-bom.version>
 		<spring-security-bom.version>5.4.5</spring-security-bom.version>
 		<reactor.version>2020.0.13</reactor.version>
 		<java.version>1.8</java.version>
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();