diff --git a/README.adoc b/README.adoc index e6dc23b7..b368da2f 100644 --- a/README.adoc +++ b/README.adoc @@ -223,7 +223,7 @@ The refresh endpoint reports that the "sample" property changed. == Building -:jdkversion: 1.7 +:jdkversion: 1.8 === Basic Compile and Test diff --git a/docs/pom.xml b/docs/pom.xml index 2d73da69..055f8803 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 2.2.7.BUILD-SNAPSHOT + 2.2.7.RELEASE .. diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 595be92b..3ad76cdb 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,27 +1,29 @@ |=== |Name | Default | Description -|spring.cloud.config.allow-override | true | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true. -|spring.cloud.config.discovery.enabled | false | Flag to indicate that config server discovery is enabled (config server URL will be looked up via discovery). -|spring.cloud.config.discovery.service-id | configserver | Service id to locate config server. -|spring.cloud.config.enabled | true | Flag to say that remote configuration is enabled. Default true; -|spring.cloud.config.fail-fast | false | Flag to indicate that failure to connect to the server is fatal (default false). +|spring.cloud.config.allow-override | `true` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true. +|spring.cloud.config.discovery.enabled | `false` | Flag to indicate that config server discovery is enabled (config server URL will be looked up via discovery). +|spring.cloud.config.discovery.service-id | `configserver` | Service id to locate config server. +|spring.cloud.config.enabled | `true` | Flag to say that remote configuration is enabled. Default true; +|spring.cloud.config.fail-fast | `false` | Flag to indicate that failure to connect to the server is fatal (default false). |spring.cloud.config.headers | | Additional headers used to create the client request. |spring.cloud.config.label | | The label name to use to pull remote configuration properties. The default is set on the server (generally "master" for a git based server). +|spring.cloud.config.media-type | | The Accept header media type to send to config server. |spring.cloud.config.name | | Name of application used to fetch remote properties. -|spring.cloud.config.override-none | false | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. -|spring.cloud.config.override-system-properties | true | Flag to indicate that the external properties should override system properties. Default true. +|spring.cloud.config.override-none | `false` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. +|spring.cloud.config.override-system-properties | `true` | Flag to indicate that the external properties should override system properties. Default true. |spring.cloud.config.password | | The password to use (HTTP Basic) when contacting the remote server. -|spring.cloud.config.profile | default | The default profile to use when fetching remote configuration (comma-separated). Default is "default". -|spring.cloud.config.request-connect-timeout | 0 | timeout on waiting to connect to the Config Server. -|spring.cloud.config.request-read-timeout | 0 | timeout on waiting to read data from the Config Server. -|spring.cloud.config.retry.initial-interval | 1000 | Initial retry interval in milliseconds. -|spring.cloud.config.retry.max-attempts | 6 | Maximum number of attempts. -|spring.cloud.config.retry.max-interval | 2000 | Maximum interval for backoff. -|spring.cloud.config.retry.multiplier | 1.1 | Multiplier for next interval. -|spring.cloud.config.send-state | true | Flag to indicate whether to send state. Default true. +|spring.cloud.config.profile | `default` | The default profile to use when fetching remote configuration (comma-separated). Default is "default". +|spring.cloud.config.request-connect-timeout | `0` | timeout on waiting to connect to the Config Server. +|spring.cloud.config.request-read-timeout | `0` | timeout on waiting to read data from the Config Server. +|spring.cloud.config.retry.initial-interval | `1000` | Initial retry interval in milliseconds. +|spring.cloud.config.retry.max-attempts | `6` | Maximum number of attempts. +|spring.cloud.config.retry.max-interval | `2000` | Maximum interval for backoff. +|spring.cloud.config.retry.multiplier | `1.1` | Multiplier for next interval. +|spring.cloud.config.send-state | `true` | Flag to indicate whether to send state. Default true. +|spring.cloud.config.tls | | TLS properties. |spring.cloud.config.token | | Security Token passed thru to underlying environment repository. -|spring.cloud.config.uri | [http://localhost:8888] | The URI of the remote server (default http://localhost:8888). +|spring.cloud.config.uri | `[http://localhost:8888]` | The URI of the remote server (default http://localhost:8888). |spring.cloud.config.username | | The username to use (HTTP Basic) when contacting the remote server. |=== \ No newline at end of file diff --git a/pom.xml b/pom.xml index 635c2d4f..c3ccc6fe 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.2.7.BUILD-SNAPSHOT + 2.2.7.RELEASE pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.2.RELEASE @@ -27,7 +27,7 @@ config - 2.2.7.BUILD-SNAPSHOT + 2.2.7.RELEASE 1.11.52 v1-rev20191010-1.30.3 true diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index e3f65420..7b0fcdd8 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 2.2.7.BUILD-SNAPSHOT + 2.2.7.RELEASE .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 6814034f..60069d28 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 2.2.7.BUILD-SNAPSHOT + 2.2.7.RELEASE .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 370adf47..809fac3e 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE spring-cloud-config-dependencies - 2.2.7.BUILD-SNAPSHOT + 2.2.7.RELEASE pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 9690933c..6b311902 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 2.2.7.BUILD-SNAPSHOT + 2.2.7.RELEASE .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 1e802f4a..c1ff38ab 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 2.2.7.BUILD-SNAPSHOT + 2.2.7.RELEASE .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index c174798a..da96146b 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 2.2.7.BUILD-SNAPSHOT + 2.2.7.RELEASE .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 6f6d4626..9eaf900e 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 2.2.7.BUILD-SNAPSHOT + 2.2.7.RELEASE spring-cloud-starter-config - 2.2.7.BUILD-SNAPSHOT + 2.2.7.RELEASE spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud