diff --git a/pom.xml b/pom.xml index c6ef3edd..4e7a96f2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.springframework.vault spring-vault-parent - 2.4.0-SNAPSHOT + 3.0.0-SNAPSHOT Spring Vault Parent project for Spring Vault @@ -28,10 +28,10 @@ 1.10.3-jdk8 3.8.0 5.3.20 - 2021.2.0 + 2022.0.0-SNAPSHOT 5.4.5 2020.0.13 - 1.8 + 17 multi spring-vault ${basedir} @@ -108,7 +108,7 @@ org.springframework.vault spring-vault-dependencies - 2.4.0-SNAPSHOT + 3.0.0-SNAPSHOT import pom @@ -253,7 +253,7 @@ kotlin-maven-plugin ${kotlin.version} - ${java.version} + 11 1.4 1.4 @@ -371,26 +371,6 @@ - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.codehaus.mojo.signature - java18 - 1.0 - - - - - enforce-java-8 - test - - check - - - - org.codehaus.mojo flatten-maven-plugin @@ -479,7 +459,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 en_US true @@ -547,16 +527,10 @@ 1.6 - - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.18 - - org.asciidoctor asciidoctor-maven-plugin - 1.5.7.1 + 2.2.1 @@ -586,7 +560,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.1.0 + 1.2.7 diff --git a/spring-vault-core/pom.xml b/spring-vault-core/pom.xml index ffecba9e..0c33a798 100644 --- a/spring-vault-core/pom.xml +++ b/spring-vault-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.vault spring-vault-parent - 2.4.0-SNAPSHOT + 3.0.0-SNAPSHOT spring-vault-core diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java index ddde74b8..4ea7e0e5 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java @@ -25,7 +25,6 @@ import java.util.Set; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.GenericConverter; -import org.springframework.data.convert.JodaTimeConverters; import org.springframework.data.convert.WritingConverter; import org.springframework.lang.Nullable; import org.springframework.vault.repository.mapping.VaultSimpleTypes; @@ -51,7 +50,6 @@ public class VaultCustomConversions extends org.springframework.data.convert.Cus List converters = new ArrayList<>(); converters.add(CustomToStringConverter.INSTANCE); - converters.addAll(JodaTimeConverters.getConvertersToRegister()); STORE_CONVERTERS = Collections.unmodifiableList(converters); STORE_CONVERSIONS = StoreConversions.of(VaultSimpleTypes.HOLDER, STORE_CONVERTERS); diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml index 30f91ed2..40b286d9 100644 --- a/spring-vault-dependencies/pom.xml +++ b/spring-vault-dependencies/pom.xml @@ -4,7 +4,7 @@ org.springframework.vault spring-vault-dependencies - 2.4.0-SNAPSHOT + 3.0.0-SNAPSHOT pom spring-vault-dependencies @@ -78,7 +78,7 @@ org.springframework.vault spring-vault-core - 2.4.0-SNAPSHOT + 3.0.0-SNAPSHOT @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 @@ -189,7 +189,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.1.0 + 1.2.7 false diff --git a/spring-vault-distribution/pom.xml b/spring-vault-distribution/pom.xml index 0f1847b9..d35b6871 100644 --- a/spring-vault-distribution/pom.xml +++ b/spring-vault-distribution/pom.xml @@ -13,7 +13,7 @@ org.springframework.vault spring-vault-parent - 2.4.0-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml