diff --git a/README.adoc b/README.adoc index d2051d09d..1d505f0ff 100644 --- a/README.adoc +++ b/README.adoc @@ -244,7 +244,6 @@ spring.cloud.vault: uri: https://localhost:8200 connection-timeout: 5000 read-timeout: 15000 - config: spring.config.import: vault:// ---- ==== diff --git a/docs/pom.xml b/docs/pom.xml index ff3c1071e..324369bff 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,12 +7,12 @@ org.springframework.cloud spring-cloud-vault-parent - 4.0.2-SNAPSHOT + 4.0.2 .. spring-cloud-vault-docs - 4.0.2-SNAPSHOT + 4.0.2 jar Spring Cloud Vault Docs diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index f82e6bc64..c991a8dbf 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -9,7 +9,7 @@ |spring.cloud.vault.app-role.role-id | | The RoleId. |spring.cloud.vault.app-role.secret-id | | The SecretId. |spring.cloud.vault.application-name | `+++application+++` | Application name for AppId authentication. -|spring.cloud.vault.authentication | | +|spring.cloud.vault.authentication | | |spring.cloud.vault.aws-ec2.aws-ec2-path | `+++aws-ec2+++` | Mount path of the AWS-EC2 authentication backend. |spring.cloud.vault.aws-ec2.identity-document | `+++http://169.254.169.254/latest/dynamic/instance-identity/pkcs7+++` | URL of the AWS-EC2 PKCS7 identity document. |spring.cloud.vault.aws-ec2.nonce | | Nonce used for AWS-EC2 authentication. An empty nonce defaults to nonce generation. @@ -41,7 +41,7 @@ |spring.cloud.vault.config.lifecycle.enabled | `+++true+++` | Enable lifecycle management. |spring.cloud.vault.config.lifecycle.expiry-threshold | | The expiry threshold. {@link Lease} is renewed the given {@link Duration} before it expires. @since 2.2 |spring.cloud.vault.config.lifecycle.lease-endpoints | | Set the {@link LeaseEndpoints} to delegate renewal/revocation calls to. {@link LeaseEndpoints} encapsulates differences between Vault versions that affect the location of renewal/revocation endpoints. Can be {@link LeaseEndpoints#SysLeases} for version 0.8 or above of Vault or {@link LeaseEndpoints#Legacy} for older versions (the default). @since 2.2 -|spring.cloud.vault.config.lifecycle.lease-strategy | | Set the LeaseStrategy (DropOnError, RetainOnError, RetainOnIoError) to control error handling on lease renewal. since 4.0.4 +|spring.cloud.vault.config.lifecycle.lease-strategy | | Sets the {@link LeaseStrategy} to be used with {@link org.springframework.vault.core.lease.SecretLeaseContainer#setLeaseStrategy(LeaseStrategy)} to retain or drop tokens on renewal errors. @since 4.0.4 |spring.cloud.vault.config.lifecycle.min-renewal | | The time period that is at least required before renewing a lease. @since 2.2 |spring.cloud.vault.config.order | `+++0+++` | Used to set a {@link org.springframework.core.env.PropertySource} priority. This is useful to use Vault as an override on other property sources. @see org.springframework.core.PriorityOrdered |spring.cloud.vault.connection-timeout | `+++5000+++` | Connection timeout. @@ -61,7 +61,7 @@ |spring.cloud.vault.database.role | | Role name for credentials. |spring.cloud.vault.database.static-role | `+++false+++` | Enable static role usage. |spring.cloud.vault.database.username-property | `+++spring.datasource.username+++` | Target property for the obtained username. -|spring.cloud.vault.databases | | +|spring.cloud.vault.databases | | |spring.cloud.vault.discovery.enabled | `+++false+++` | Flag to indicate that Vault server discovery is enabled (vault server URL will be looked up via discovery). |spring.cloud.vault.discovery.service-id | `+++vault+++` | Service id to locate Vault. |spring.cloud.vault.elasticsearch.backend | `+++database+++` | Database backend path. @@ -138,4 +138,4 @@ |spring.cloud.vault.token | | Static vault token. Required if {@link #authentication} is {@code TOKEN}. |spring.cloud.vault.uri | | Vault URI. Can be set with scheme, host and port. -|=== +|=== \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8900792a6..0f80bda95 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.6 spring-cloud-vault-parent - 4.0.2-SNAPSHOT + 4.0.2 pom Spring Cloud Vault @@ -42,7 +42,7 @@ UTF-8 - 4.0.4-SNAPSHOT + 4.0.5 1.70 v1-rev20201112-1.31.0 diff --git a/spring-cloud-starter-vault-config/pom.xml b/spring-cloud-starter-vault-config/pom.xml index e657a7a6e..c083f2c03 100644 --- a/spring-cloud-starter-vault-config/pom.xml +++ b/spring-cloud-starter-vault-config/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.0.2-SNAPSHOT + 4.0.2 .. diff --git a/spring-cloud-vault-config-aws/pom.xml b/spring-cloud-vault-config-aws/pom.xml index a3e5ff769..7bb236537 100644 --- a/spring-cloud-vault-config-aws/pom.xml +++ b/spring-cloud-vault-config-aws/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.0.2-SNAPSHOT + 4.0.2 .. diff --git a/spring-cloud-vault-config-consul/pom.xml b/spring-cloud-vault-config-consul/pom.xml index 9f7075967..22e00c8c9 100644 --- a/spring-cloud-vault-config-consul/pom.xml +++ b/spring-cloud-vault-config-consul/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.0.2-SNAPSHOT + 4.0.2 .. @@ -16,7 +16,7 @@ Spring Cloud Vault Config Consul support - 4.0.3-SNAPSHOT + 4.0.4 diff --git a/spring-cloud-vault-config-databases/pom.xml b/spring-cloud-vault-config-databases/pom.xml index caf364528..9a4dfc183 100644 --- a/spring-cloud-vault-config-databases/pom.xml +++ b/spring-cloud-vault-config-databases/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.0.2-SNAPSHOT + 4.0.2 .. diff --git a/spring-cloud-vault-config-rabbitmq/pom.xml b/spring-cloud-vault-config-rabbitmq/pom.xml index 96a829aff..bd1d0f136 100644 --- a/spring-cloud-vault-config-rabbitmq/pom.xml +++ b/spring-cloud-vault-config-rabbitmq/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.0.2-SNAPSHOT + 4.0.2 .. diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml index 15eb038f6..5e6ec46f1 100644 --- a/spring-cloud-vault-config/pom.xml +++ b/spring-cloud-vault-config/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.0.2-SNAPSHOT + 4.0.2 .. diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index 36c42b860..4dd0c94a6 100644 --- a/spring-cloud-vault-dependencies/pom.xml +++ b/spring-cloud-vault-dependencies/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.0.4-SNAPSHOT + 4.0.6 spring-cloud-vault-dependencies - 4.0.2-SNAPSHOT + 4.0.2 pom Spring Cloud Vault Dependencies