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

Prepare 3.0 development.

Browse Source 
Closes #666
This commit is contained in:
Mark Paluch
2021-09-27 14:23:09 +02:00
parent 67ea636651
commit 55f40c4c2e
5 changed files with 14 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>org.springframework.vault</groupId>
<artifactId>spring-vault-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<name>Spring Vault</name>
<description>Parent project for Spring Vault</description>
@@ -28,10 +28,10 @@
<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>2022.0.0-SNAPSHOT</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>
<java.version>17</java.version>
<project.type>multi</project.type>
<dist.id>spring-vault</dist.id>
<project.root>${basedir}</project.root>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.springframework.vault</groupId>
<artifactId>spring-vault-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -253,7 +253,7 @@
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<configuration>
<jvmTarget>${java.version}</jvmTarget>
<jvmTarget>11</jvmTarget>
<apiVersion>1.4</apiVersion>
<languageVersion>1.4</languageVersion>
</configuration>
@@ -371,26 +371,6 @@
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java18</artifactId>
<version>1.0</version>
</signature>
</configuration>
<executions>
<execution>
<id>enforce-java-8</id>
<phase>test</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
@@ -479,7 +459,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
<configuration>
<locale>en_US</locale>
<breakiterator>true</breakiterator>
@@ -547,16 +527,10 @@
<version>1.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.18</version>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>1.5.7.1</version>
<version>2.2.1</version>
</plugin>
<plugin>
@@ -586,7 +560,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.1.0</version>
<version>1.2.7</version>
</plugin>
<plugin>

2
spring-vault-core/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.vault</groupId>
<artifactId>spring-vault-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>spring-vault-core</artifactId>

2
spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java
View File

@@ -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<Object> converters = new ArrayList<>();
converters.add(CustomToStringConverter.INSTANCE);
converters.addAll(JodaTimeConverters.getConvertersToRegister());
STORE_CONVERTERS = Collections.unmodifiableList(converters);
STORE_CONVERSIONS = StoreConversions.of(VaultSimpleTypes.HOLDER, STORE_CONVERTERS);

8
spring-vault-dependencies/pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>org.springframework.vault</groupId>
<artifactId>spring-vault-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>spring-vault-dependencies</name>
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.springframework.vault</groupId>
<artifactId>spring-vault-core</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -176,7 +176,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
<executions>
<execution>
<goals>
@@ -189,7 +189,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.1.0</version>
<version>1.2.7</version>
<inherited>false</inherited>
<executions>
<execution>

2
spring-vault-distribution/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.vault</groupId>
<artifactId>spring-vault-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>