diff --git a/pom.xml b/pom.xml index c5b0a8f9..c8da31cb 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,6 @@ spring-vault-dependencies spring-vault-core - spring-vault-repository spring-vault-distribution @@ -745,6 +744,7 @@ ${project.name} ${project.version} ${spring.version} + ${spring-data-releasetrain.version} true 3 true diff --git a/spring-vault-core/pom.xml b/spring-vault-core/pom.xml index 69cc7c7e..55ebc777 100644 --- a/spring-vault-core/pom.xml +++ b/spring-vault-core/pom.xml @@ -26,23 +26,12 @@ META-INF - - - - maven-jar-plugin - - - test-jar - - test-jar - - - - - + + + org.springframework spring-core @@ -68,6 +57,8 @@ jackson-databind + + org.springframework spring-webflux @@ -80,6 +71,22 @@ true + + + + org.springframework.data + spring-data-commons + true + + + + org.springframework.data + spring-data-keyvalue + true + + + + org.apache.httpcomponents httpclient @@ -111,8 +118,6 @@ true - - com.amazonaws aws-java-sdk-core @@ -129,6 +134,8 @@ + + org.springframework spring-test diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/configuration/EnableVaultRepositories.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/EnableVaultRepositories.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/configuration/EnableVaultRepositories.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/EnableVaultRepositories.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoriesRegistrar.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoriesRegistrar.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoriesRegistrar.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoriesRegistrar.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoryConfigurationExtension.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoryConfigurationExtension.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoryConfigurationExtension.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoryConfigurationExtension.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/configuration/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/package-info.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/configuration/package-info.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/package-info.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/AbstractVaultConverter.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/AbstractVaultConverter.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/AbstractVaultConverter.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/convert/AbstractVaultConverter.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapper.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapper.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapper.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapper.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/MappingVaultConverter.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/MappingVaultConverter.java similarity index 99% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/MappingVaultConverter.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/convert/MappingVaultConverter.java index 175e3155..dc8083df 100644 --- a/spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/MappingVaultConverter.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/MappingVaultConverter.java @@ -608,7 +608,7 @@ public class MappingVaultConverter extends AbstractVaultConverter { protected Map writeMapInternal(Map obj, Map bson, TypeInformation propertyType) { - for (Map.Entry entry : obj.entrySet()) { + for (Entry entry : obj.entrySet()) { Object key = entry.getKey(); Object val = entry.getValue(); diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/SecretDocument.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/SecretDocument.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/SecretDocument.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/convert/SecretDocument.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/SecretDocumentAccessor.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/SecretDocumentAccessor.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/SecretDocumentAccessor.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/convert/SecretDocumentAccessor.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/VaultConverter.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultConverter.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/VaultConverter.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultConverter.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/VaultTypeMapper.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultTypeMapper.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/VaultTypeMapper.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultTypeMapper.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/package-info.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/convert/package-info.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/convert/package-info.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/core/MappingVaultEntityInformation.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/core/MappingVaultEntityInformation.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/core/MappingVaultEntityInformation.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/core/MappingVaultEntityInformation.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/core/VaultEntityInformation.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/core/VaultEntityInformation.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/core/VaultEntityInformation.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/core/VaultEntityInformation.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/core/VaultKeyValueAdapter.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/core/VaultKeyValueAdapter.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/core/VaultKeyValueAdapter.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/core/VaultKeyValueAdapter.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/core/VaultKeyValueTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/core/VaultKeyValueTemplate.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/core/VaultKeyValueTemplate.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/core/VaultKeyValueTemplate.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/core/VaultQueryEngine.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/core/VaultQueryEngine.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/core/VaultQueryEngine.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/core/VaultQueryEngine.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/core/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/core/package-info.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/core/package-info.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/core/package-info.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntity.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntity.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntity.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntity.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/Secret.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/Secret.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/Secret.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/Secret.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/VaultMappingContext.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultMappingContext.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/VaultMappingContext.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultMappingContext.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentEntity.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentEntity.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentEntity.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentEntity.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentProperty.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentProperty.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentProperty.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentProperty.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/VaultSimpleTypes.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultSimpleTypes.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/VaultSimpleTypes.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultSimpleTypes.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/package-info.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/mapping/package-info.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/package-info.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/query/VaultPartTreeQuery.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultPartTreeQuery.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/query/VaultPartTreeQuery.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultPartTreeQuery.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/query/VaultQuery.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultQuery.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/query/VaultQuery.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultQuery.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/query/VaultQueryCreator.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultQueryCreator.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/query/VaultQueryCreator.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultQueryCreator.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/query/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/query/package-info.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/query/package-info.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/query/package-info.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/support/VaultRepositoryFactory.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/support/VaultRepositoryFactory.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/support/VaultRepositoryFactory.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/support/VaultRepositoryFactory.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/support/VaultRepositoryFactoryBean.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/support/VaultRepositoryFactoryBean.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/support/VaultRepositoryFactoryBean.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/support/VaultRepositoryFactoryBean.java diff --git a/spring-vault-repository/src/main/java/org/springframework/vault/repository/support/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/support/package-info.java similarity index 100% rename from spring-vault-repository/src/main/java/org/springframework/vault/repository/support/package-info.java rename to spring-vault-core/src/main/java/org/springframework/vault/repository/support/package-info.java diff --git a/spring-vault-repository/src/test/java/org/springframework/vault/repository/MultipleSpringDataModulesIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/MultipleSpringDataModulesIntegrationTests.java similarity index 98% rename from spring-vault-repository/src/test/java/org/springframework/vault/repository/MultipleSpringDataModulesIntegrationTests.java rename to spring-vault-core/src/test/java/org/springframework/vault/repository/MultipleSpringDataModulesIntegrationTests.java index e4a543ac..4dcb4b83 100644 --- a/spring-vault-repository/src/test/java/org/springframework/vault/repository/MultipleSpringDataModulesIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/repository/MultipleSpringDataModulesIntegrationTests.java @@ -31,6 +31,7 @@ import org.springframework.data.map.repository.config.EnableMapRepositories; import org.springframework.data.repository.CrudRepository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.vault.core.VaultIntegrationTestConfiguration; import org.springframework.vault.core.VaultTemplate; import org.springframework.vault.repository.MultipleSpringDataModulesIntegrationTests.MultipleModulesActiveTestConfiguration; import org.springframework.vault.repository.configuration.EnableVaultRepositories; diff --git a/spring-vault-repository/src/test/java/org/springframework/vault/repository/VaultRepositoryIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/VaultRepositoryIntegrationTests.java similarity index 98% rename from spring-vault-repository/src/test/java/org/springframework/vault/repository/VaultRepositoryIntegrationTests.java rename to spring-vault-core/src/test/java/org/springframework/vault/repository/VaultRepositoryIntegrationTests.java index 6b873662..11b2c227 100644 --- a/spring-vault-repository/src/test/java/org/springframework/vault/repository/VaultRepositoryIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/repository/VaultRepositoryIntegrationTests.java @@ -29,6 +29,7 @@ import org.springframework.data.domain.Sort; import org.springframework.data.repository.CrudRepository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.vault.core.VaultIntegrationTestConfiguration; import org.springframework.vault.core.VaultTemplate; import org.springframework.vault.repository.VaultRepositoryIntegrationTests.VaultRepositoryTestConfiguration; import org.springframework.vault.repository.configuration.EnableVaultRepositories; diff --git a/spring-vault-repository/src/test/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapperUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapperUnitTests.java similarity index 100% rename from spring-vault-repository/src/test/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapperUnitTests.java rename to spring-vault-core/src/test/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapperUnitTests.java diff --git a/spring-vault-repository/src/test/java/org/springframework/vault/repository/convert/MappingVaultConverterUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/convert/MappingVaultConverterUnitTests.java similarity index 100% rename from spring-vault-repository/src/test/java/org/springframework/vault/repository/convert/MappingVaultConverterUnitTests.java rename to spring-vault-core/src/test/java/org/springframework/vault/repository/convert/MappingVaultConverterUnitTests.java diff --git a/spring-vault-repository/src/test/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntityUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntityUnitTests.java similarity index 100% rename from spring-vault-repository/src/test/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntityUnitTests.java rename to spring-vault-core/src/test/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntityUnitTests.java diff --git a/spring-vault-repository/src/test/java/org/springframework/vault/repository/mapping/VaultMappingContextUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/mapping/VaultMappingContextUnitTests.java similarity index 100% rename from spring-vault-repository/src/test/java/org/springframework/vault/repository/mapping/VaultMappingContextUnitTests.java rename to spring-vault-core/src/test/java/org/springframework/vault/repository/mapping/VaultMappingContextUnitTests.java diff --git a/spring-vault-repository/src/test/java/org/springframework/vault/repository/query/VaultQueryCreatorUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/query/VaultQueryCreatorUnitTests.java similarity index 100% rename from spring-vault-repository/src/test/java/org/springframework/vault/repository/query/VaultQueryCreatorUnitTests.java rename to spring-vault-core/src/test/java/org/springframework/vault/repository/query/VaultQueryCreatorUnitTests.java diff --git a/spring-vault-repository/pom.xml b/spring-vault-repository/pom.xml deleted file mode 100644 index ffcc2e3c..00000000 --- a/spring-vault-repository/pom.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - 4.0.0 - - - org.springframework.vault - spring-vault-parent - 2.0.0.BUILD-SNAPSHOT - - - spring-vault-repository - Spring Vault Repository - Spring Vault Repository support - jar - - - spring.vault.repository - - - - - - ../src/main/resources - META-INF - - - - - - - org.springframework.vault - spring-vault-core - - - - org.springframework.vault - spring-vault-core - ${project.version} - test-jar - - - - org.springframework - spring-core - - - - org.springframework - spring-context - - - - org.springframework - spring-beans - - - - org.springframework - spring-web - - - - org.springframework.data - spring-data-commons - - - - org.springframework.data - spring-data-keyvalue - - - - com.fasterxml.jackson.core - jackson-databind - - - - org.apache.httpcomponents - httpclient - true - - - - org.apache.httpcomponents - httpcore - true - - - - org.projectlombok - lombok - 1.16.10 - true - - - - - - org.springframework - spring-test - test - - - - org.assertj - assertj-core - test - - - - com.jayway.jsonpath - json-path - test - - - - junit - junit - test - - - - org.mockito - mockito-core - test - - - - - - ch.qos.logback - logback-classic - 1.2.2 - test - - - - diff --git a/spring-vault-repository/src/test/java/org/springframework/vault/repository/VaultIntegrationTestConfiguration.java b/spring-vault-repository/src/test/java/org/springframework/vault/repository/VaultIntegrationTestConfiguration.java deleted file mode 100644 index 981f2eed..00000000 --- a/spring-vault-repository/src/test/java/org/springframework/vault/repository/VaultIntegrationTestConfiguration.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2017 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.vault.repository; - -import org.springframework.context.annotation.Configuration; -import org.springframework.vault.authentication.ClientAuthentication; -import org.springframework.vault.authentication.TokenAuthentication; -import org.springframework.vault.client.VaultEndpoint; -import org.springframework.vault.config.AbstractVaultConfiguration; -import org.springframework.vault.support.SslConfiguration; -import org.springframework.vault.util.Settings; - -/** - * Test configuration for Vault integration tests. - * - * @author Mark Paluch - */ -@Configuration -public class VaultIntegrationTestConfiguration extends AbstractVaultConfiguration { - - @Override - public VaultEndpoint vaultEndpoint() { - return new VaultEndpoint(); - } - - @Override - public ClientAuthentication clientAuthentication() { - return new TokenAuthentication(Settings.token()); - } - - @Override - public SslConfiguration sslConfiguration() { - return Settings.createSslConfiguration(); - } -} diff --git a/src/main/asciidoc/reference/dependencies.adoc b/src/main/asciidoc/reference/dependencies.adoc index 20156616..c8609a1e 100644 --- a/src/main/asciidoc/reference/dependencies.adoc +++ b/src/main/asciidoc/reference/dependencies.adoc @@ -11,15 +11,15 @@ defined. In a Maven project you would declare this dependency in the [source, xml, subs="verbatim,attributes"] ---- - - - org.springframework.vault - spring-vault-dependencies - {version} - import - pom - - + + + org.springframework.vault + spring-vault-dependencies + {version} + import + pom + + ---- ==== diff --git a/src/main/asciidoc/reference/getting-started.adoc b/src/main/asciidoc/reference/getting-started.adoc index b499dcda..8e124606 100644 --- a/src/main/asciidoc/reference/getting-started.adoc +++ b/src/main/asciidoc/reference/getting-started.adoc @@ -14,19 +14,19 @@ press Yes when prompted. Then enter a project and a package name such as `org.sp Then add the following to `pom.xml` dependencies section. -.Using the Spring Vault BOM +.Adding Spring Vault dependency ==== [source,xml,subs="verbatim,attributes"] ---- - + - - org.springframework.vault - spring-vault-core - {version} - + + org.springframework.vault + spring-vault-core + {version} + ---- @@ -39,11 +39,11 @@ Milestone repository to your maven `pom.xml` which is at the same level of your [source,xml] ---- - - spring-milestone - Spring Maven MILESTONE Repository - http://repo.spring.io/libs-milestone - + + spring-milestone + Spring Maven MILESTONE Repository + http://repo.spring.io/libs-milestone + ---- ==== @@ -57,11 +57,11 @@ Snapshot repository to your maven `pom.xml` which is at the same level of your ` [source,xml] ---- - - spring-snapshot - Spring Maven SNAPSHOT Repository - http://repo.spring.io/libs-snapshot - + + spring-snapshot + Spring Maven SNAPSHOT Repository + http://repo.spring.io/libs-snapshot + ---- ==== diff --git a/src/main/asciidoc/reference/vault-repositories.adoc b/src/main/asciidoc/reference/vault-repositories.adoc index 17cf5430..ae532d22 100644 --- a/src/main/asciidoc/reference/vault-repositories.adoc +++ b/src/main/asciidoc/reference/vault-repositories.adoc @@ -6,6 +6,8 @@ and delete. Vault repositories apply Spring Data's repository concept on top of A Vault repository exposes basic CRUD functionality and supports query derivation with predicates constraining the Id property, paging and sorting. +NOTE: Read more about Spring Data Repositories in the https://docs.spring.io/spring-data/commons/docs/current/reference/html/#repositories[Spring Data Commons reference documentation]. The reference documentation will give you an introduction to Spring Data repositories. + [[vault.repositories.usage]] == Usage @@ -45,7 +47,50 @@ public interface CredentialsRepository extends CrudRepository + + + org.springframework.vault + spring-data-releasetrain + {springDataVersion} + import + pom + + + + + + + + + + org.springframework.vault + spring-vault-core + {version} + + + + org.springframework.data + spring-data-keyvalue + + + + +---- +==== + + The thing we need in between to glue things together is the according Spring configuration. .JavaConfig for Vault Repositories