From 6302b9f9cdb742c39772ada5a7e5befbcbd103c5 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 11 Feb 2021 15:19:12 +0000 Subject: [PATCH] Going back to snapshots --- README.adoc | 2 +- docs/pom.xml | 4 +- docs/src/main/asciidoc/_configprops.adoc | 74 ++++++++++----------- pom.xml | 6 +- spring-cloud-starter-vault-config/pom.xml | 2 +- spring-cloud-vault-config-aws/pom.xml | 2 +- spring-cloud-vault-config-consul/pom.xml | 4 +- spring-cloud-vault-config-databases/pom.xml | 2 +- spring-cloud-vault-config-rabbitmq/pom.xml | 2 +- spring-cloud-vault-config/pom.xml | 2 +- spring-cloud-vault-dependencies/pom.xml | 4 +- 11 files changed, 52 insertions(+), 52 deletions(-) diff --git a/README.adoc b/README.adoc index 6386ed36..e18f4780 100644 --- a/README.adoc +++ b/README.adoc @@ -319,7 +319,7 @@ $ ./docs/src/main/ruby/generate_readme.sh > README.adoc This script requires ruby and the asciidoctor gem installed (`gem install asciidoctor`) -:jdkversion: 1.8 +:jdkversion: 1.7 === Basic Compile and Test diff --git a/docs/pom.xml b/docs/pom.xml index 54bdba91..5546f8f6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,12 +7,12 @@ org.springframework.cloud spring-cloud-vault-parent - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT .. spring-cloud-vault-docs - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT pom Spring Cloud Vault Config Docs diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index ab3c1dc1..d85f67c9 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,69 +1,69 @@ |=== |Name | Default | Description -|spring.cloud.vault.app-id.app-id-path | `app-id` | Mount path of the AppId authentication backend. +|spring.cloud.vault.app-id.app-id-path | app-id | Mount path of the AppId authentication backend. |spring.cloud.vault.app-id.network-interface | | Network interface hint for the "MAC_ADDRESS" UserId mechanism. -|spring.cloud.vault.app-id.user-id | `MAC_ADDRESS` | UserId mechanism. Can be either "MAC_ADDRESS", "IP_ADDRESS", a string or a class name. -|spring.cloud.vault.app-role.app-role-path | `approle` | Mount path of the AppRole authentication backend. +|spring.cloud.vault.app-id.user-id | MAC_ADDRESS | UserId mechanism. Can be either "MAC_ADDRESS", "IP_ADDRESS", a string or a class name. +|spring.cloud.vault.app-role.app-role-path | approle | Mount path of the AppRole authentication backend. |spring.cloud.vault.app-role.role | | Name of the role, optional, used for pull-mode. |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.application-name | application | Application name for AppId 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.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. |spring.cloud.vault.aws-ec2.role | | Name of the role, optional. -|spring.cloud.vault.aws-iam.aws-path | `aws` | Mount path of the AWS authentication backend. +|spring.cloud.vault.aws-iam.aws-path | aws | Mount path of the AWS authentication backend. |spring.cloud.vault.aws-iam.endpoint-uri | | STS server URI. @since 2.2 |spring.cloud.vault.aws-iam.role | | Name of the role, optional. Defaults to the friendly IAM name if not set. |spring.cloud.vault.aws-iam.server-name | | Name of the server used to set {@code X-Vault-AWS-IAM-Server-ID} header in the headers of login requests. -|spring.cloud.vault.azure-msi.azure-path | `azure` | Mount path of the Azure MSI authentication backend. +|spring.cloud.vault.azure-msi.azure-path | azure | Mount path of the Azure MSI authentication backend. |spring.cloud.vault.azure-msi.role | | Name of the role. -|spring.cloud.vault.config.lifecycle.enabled | `true` | Enable lifecycle management. +|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.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. -|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.enabled | `true` | Enable Vault config server. -|spring.cloud.vault.fail-fast | `false` | Fail fast if data cannot be obtained from Vault. -|spring.cloud.vault.gcp-gce.gcp-path | `gcp` | Mount path of the Kubernetes authentication backend. +|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. +|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.enabled | true | Enable Vault config server. +|spring.cloud.vault.fail-fast | false | Fail fast if data cannot be obtained from Vault. +|spring.cloud.vault.gcp-gce.gcp-path | gcp | Mount path of the Kubernetes authentication backend. |spring.cloud.vault.gcp-gce.role | | Name of the role against which the login is being attempted. |spring.cloud.vault.gcp-gce.service-account | | Optional service account id. Using the default id if left unconfigured. |spring.cloud.vault.gcp-iam.credentials.encoded-key | | The base64 encoded contents of an OAuth2 account private key in JSON format. |spring.cloud.vault.gcp-iam.credentials.location | | Location of the OAuth2 credentials private key.

Since this is a Resource, the private key can be in a multitude of locations, such as a local file system, classpath, URL, etc. -|spring.cloud.vault.gcp-iam.gcp-path | `gcp` | Mount path of the Kubernetes authentication backend. -|spring.cloud.vault.gcp-iam.jwt-validity | `15m` | Validity of the JWT token. +|spring.cloud.vault.gcp-iam.gcp-path | gcp | Mount path of the Kubernetes authentication backend. +|spring.cloud.vault.gcp-iam.jwt-validity | 15m | Validity of the JWT token. |spring.cloud.vault.gcp-iam.project-id | | Overrides the GCP project Id. |spring.cloud.vault.gcp-iam.role | | Name of the role against which the login is being attempted. |spring.cloud.vault.gcp-iam.service-account-id | | Overrides the GCP service account Id. -|spring.cloud.vault.generic.application-name | `application` | Application name to be used for the context. -|spring.cloud.vault.generic.backend | `secret` | Name of the default backend. -|spring.cloud.vault.generic.default-context | `application` | Name of the default context. -|spring.cloud.vault.generic.enabled | `true` | Enable the generic backend. -|spring.cloud.vault.generic.profile-separator | `/` | Profile-separator to combine application name and profile. -|spring.cloud.vault.host | `localhost` | Vault server host. -|spring.cloud.vault.kubernetes.kubernetes-path | `kubernetes` | Mount path of the Kubernetes authentication backend. +|spring.cloud.vault.generic.application-name | application | Application name to be used for the context. +|spring.cloud.vault.generic.backend | secret | Name of the default backend. +|spring.cloud.vault.generic.default-context | application | Name of the default context. +|spring.cloud.vault.generic.enabled | true | Enable the generic backend. +|spring.cloud.vault.generic.profile-separator | / | Profile-separator to combine application name and profile. +|spring.cloud.vault.host | localhost | Vault server host. +|spring.cloud.vault.kubernetes.kubernetes-path | kubernetes | Mount path of the Kubernetes authentication backend. |spring.cloud.vault.kubernetes.role | | Name of the role against which the login is being attempted. -|spring.cloud.vault.kubernetes.service-account-token-file | `/var/run/secrets/kubernetes.io/serviceaccount/token` | Path to the service account token file. -|spring.cloud.vault.kv.application-name | `application` | Application name to be used for the context. -|spring.cloud.vault.kv.backend | `secret` | Name of the default backend. -|spring.cloud.vault.kv.backend-version | `2` | Key-Value backend version. Currently supported versions are:

-|spring.cloud.vault.kv.default-context | `application` | Name of the default context. -|spring.cloud.vault.kv.enabled | `false` | Enable the kev-value backend. -|spring.cloud.vault.kv.profile-separator | `/` | Profile-separator to combine application name and profile. +|spring.cloud.vault.kubernetes.service-account-token-file | /var/run/secrets/kubernetes.io/serviceaccount/token | Path to the service account token file. +|spring.cloud.vault.kv.application-name | application | Application name to be used for the context. +|spring.cloud.vault.kv.backend | secret | Name of the default backend. +|spring.cloud.vault.kv.backend-version | 2 | Key-Value backend version. Currently supported versions are: +|spring.cloud.vault.kv.default-context | application | Name of the default context. +|spring.cloud.vault.kv.enabled | false | Enable the kev-value backend. +|spring.cloud.vault.kv.profile-separator | / | Profile-separator to combine application name and profile. |spring.cloud.vault.namespace | | Vault namespace (requires Vault Enterprise). |spring.cloud.vault.pcf.instance-certificate | | Path to the instance certificate (PEM). Defaults to {@code CF_INSTANCE_CERT} env variable. |spring.cloud.vault.pcf.instance-key | | Path to the instance key (PEM). Defaults to {@code CF_INSTANCE_KEY} env variable. -|spring.cloud.vault.pcf.pcf-path | `pcf` | Mount path of the Kubernetes authentication backend. +|spring.cloud.vault.pcf.pcf-path | pcf | Mount path of the Kubernetes authentication backend. |spring.cloud.vault.pcf.role | | Name of the role against which the login is being attempted. -|spring.cloud.vault.port | `8200` | Vault server port. -|spring.cloud.vault.read-timeout | `15000` | Read timeout. -|spring.cloud.vault.scheme | `https` | Protocol scheme. Can be either "http" or "https". -|spring.cloud.vault.ssl.cert-auth-path | `cert` | Mount path of the TLS cert authentication backend. +|spring.cloud.vault.port | 8200 | Vault server port. +|spring.cloud.vault.read-timeout | 15000 | Read timeout. +|spring.cloud.vault.scheme | https | Protocol scheme. Can be either "http" or "https". +|spring.cloud.vault.ssl.cert-auth-path | cert | Mount path of the TLS cert authentication backend. |spring.cloud.vault.ssl.key-store | | Trust store that holds certificates and private keys. |spring.cloud.vault.ssl.key-store-password | | Password used to access the key store. |spring.cloud.vault.ssl.trust-store | | Trust store that holds SSL certificates. diff --git a/pom.xml b/pom.xml index 2dec2c20..11d989ec 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.3.2.RELEASE + 2.3.1.RELEASE spring-cloud-vault-parent - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT pom Spring Cloud Vault @@ -42,7 +42,7 @@ UTF-8 - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT 4.5.13 4.4.14 3.14.9 diff --git a/spring-cloud-starter-vault-config/pom.xml b/spring-cloud-starter-vault-config/pom.xml index f631c45a..5ab78260 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 - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-aws/pom.xml b/spring-cloud-vault-config-aws/pom.xml index 117db2ed..91d4fed3 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 - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-consul/pom.xml b/spring-cloud-vault-config-consul/pom.xml index bff237a9..b010350e 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 - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT .. @@ -16,7 +16,7 @@ Spring Cloud Vault Config Consul support - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT diff --git a/spring-cloud-vault-config-databases/pom.xml b/spring-cloud-vault-config-databases/pom.xml index 8378a72a..074a7627 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 - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-rabbitmq/pom.xml b/spring-cloud-vault-config-rabbitmq/pom.xml index dc14afbc..7802014c 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 - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml index 5f4551d9..8e28b0c9 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 - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index 3e5cb813..10bcd6aa 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 - 2.3.2.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-vault-dependencies - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT pom Spring Cloud Vault Dependencies