diff --git a/README.adoc b/README.adoc index c0d710c..ebe7576 100644 --- a/README.adoc +++ b/README.adoc @@ -35,7 +35,7 @@ can use the `DiscoveryClient` directly or via a `LoadBalancerClient`. == Building -:jdkversion: 1.7 +:jdkversion: 1.8 === Basic Compile and Test diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 51df093..ee6f6e2 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,16 +1,16 @@ |=== |Name | Default | Description -|spring.cloud.cloudfoundry.discovery.default-server-port | 80 | Port to use when no port is defined by ribbon. -|spring.cloud.cloudfoundry.discovery.enabled | true | Flag to indicate that discovery is enabled. -|spring.cloud.cloudfoundry.discovery.heartbeat-frequency | 5000 | Frequency in milliseconds of poll for heart beat. The client will poll on this frequency and broadcast a list of service ids. -|spring.cloud.cloudfoundry.discovery.internal-domain | apps.internal | Default internal domain when configured to use Native DNS service discovery. -|spring.cloud.cloudfoundry.discovery.order | 0 | Order of the discovery client used by `CompositeDiscoveryClient` for sorting available clients. -|spring.cloud.cloudfoundry.discovery.use-container-ip | false | Whether to resolve hostname when BOSH DNS is used. In order to use this feature, spring.cloud.cloudfoundry.discovery.use-dns must be true. -|spring.cloud.cloudfoundry.discovery.use-dns | false | Whether to use BOSH DNS for the discovery. In order to use this feature, your Cloud Foundry installation must support Service Discovery. +|spring.cloud.cloudfoundry.discovery.default-server-port | `80` | Port to use when no port is defined by ribbon. +|spring.cloud.cloudfoundry.discovery.enabled | `true` | Flag to indicate that discovery is enabled. +|spring.cloud.cloudfoundry.discovery.heartbeat-frequency | `5000` | Frequency in milliseconds of poll for heart beat. The client will poll on this frequency and broadcast a list of service ids. +|spring.cloud.cloudfoundry.discovery.internal-domain | `apps.internal` | Default internal domain when configured to use Native DNS service discovery. +|spring.cloud.cloudfoundry.discovery.order | `0` | Order of the discovery client used by `CompositeDiscoveryClient` for sorting available clients. +|spring.cloud.cloudfoundry.discovery.use-container-ip | `false` | Whether to resolve hostname when BOSH DNS is used. In order to use this feature, spring.cloud.cloudfoundry.discovery.use-dns must be true. +|spring.cloud.cloudfoundry.discovery.use-dns | `false` | Whether to use BOSH DNS for the discovery. In order to use this feature, your Cloud Foundry installation must support Service Discovery. |spring.cloud.cloudfoundry.org | | Organization name to initially target. |spring.cloud.cloudfoundry.password | | Password for user to authenticate and obtain token. -|spring.cloud.cloudfoundry.skip-ssl-validation | false | +|spring.cloud.cloudfoundry.skip-ssl-validation | `false` | |spring.cloud.cloudfoundry.space | | Space name to initially target. |spring.cloud.cloudfoundry.url | | URL of Cloud Foundry API (Cloud Controller). |spring.cloud.cloudfoundry.username | | Username to authenticate (usually an email address). diff --git a/pom.xml b/pom.xml index c8b1dff..135519b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.3.RELEASE @@ -19,8 +19,8 @@ 3.25.0.RELEASE cloudfoundry ${basedir} - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT + 2.2.8.BUILD-SNAPSHOT + 2.2.8.BUILD-SNAPSHOT diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index 8ccdfa4..9cab360 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.2.BUILD-SNAPSHOT + 2.3.3.RELEASE spring-cloud-cloudfoundry-dependencies