Commit Graph

337 Commits

Author SHA1 Message Date
Spencer Gibb
8a8b02ecf9 Don't register with consul in bootstrap.
This allows the normal consul lifecycle to register and properly deregister when using config client discovery.

fixes gh-213
2016-09-13 08:26:15 -06:00
Marcin Grzejszczak
b4d70a3af1 Removed adoc footer 2016-09-07 18:01:10 +02:00
Marcin Grzejszczak
afdde6e90b Updating mvnw for all projects 2016-09-07 17:28:17 +02:00
Spencer Gibb
cd73c94d79 Revert "Update SNAPSHOT to 1.1.0.RC1"
This reverts commit 657e7f9926.
2016-09-07 07:09:59 -06:00
Spencer Gibb
657e7f9926 Update SNAPSHOT to 1.1.0.RC1 2016-09-07 07:08:00 -06:00
Spencer Gibb
af435dd506 Add {spring-cloud-version} 2016-08-30 09:59:05 -06:00
Spencer Gibb
9e87a782ce Upgrade to consul-api version 1.1.11
fixes gh-211
2016-08-26 15:36:52 -06:00
Spencer Gibb
ca440e74d8 Update to SNAPSHOT 2016-08-26 10:14:16 -06:00
Spencer Gibb
ee548d06d6 Update SNAPSHOT to 1.1.0.M1 2016-08-26 08:43:18 -06:00
Spencer Gibb
7c93f9d0e8 Support war deployments with discovery.
server.port must be set.

fixes gh-173
2016-08-25 14:07:50 -06:00
Spencer Gibb
7aa310c991 Document starters and bus.
fixes gh-39
fixes gh-25
2016-08-24 15:37:02 -06:00
Spencer Gibb
5b10cc4343 Document ConfigWatch.
Update defaults.

fixes gh-209
2016-08-24 15:16:34 -06:00
Spencer Gibb
76759998e5 Use configuration property for ConfigWatch waitTime 2016-08-24 15:15:48 -06:00
Marcin Grzejszczak
98941a4e6e Updating ghpages for all projects 2016-08-22 13:31:46 +02:00
Marcin Grzejszczak
e114d358a1 Updating ghpages for all projects 2016-08-19 11:45:51 +02:00
Marcin Grzejszczak
bd6fbb2e06 Updating ghpages for all projects 2016-08-18 13:14:32 +02:00
Dave Syer
1f4c90f172 Change repo URLs to https 2016-08-17 17:31:25 +01:00
Marcin Grzejszczak
aa0d864903 Updating ghpages for all projects 2016-08-17 12:44:28 +02:00
Marcin Grzejszczak
51cdd88f37 Deploying documentation to proper folder
What we're missing ATM is different documentation versions for different application versions. What this change does is that it's:

- finding out what is the current branch (e.g. 1.0.x)
- finding out out what is the name of the main adoc file (e.g. spring-cloud-sleuth)
- pulling the changes from gh-pages after checkout
- finding out what is the list of comma separated whitelisted branches (via the `docs.whitelisted.branches` prop)
- in gh-pages creating a folder with name of the branch  (e.g. /1.0.x)
copying all the docs/target/generated-docs/ to that folder
- if the branch from which we're calling the script is NOT master then we're changing the ${main.adoc}.html to index.html so that it's easier to access the docs (e.g. http://cloud.spring.io/spring-cloud-sleuth/1.0.x/)
2016-08-16 15:13:37 +02:00
Dave Syer
c599a0dfd0 Fix cloud foundry instance id refs 2016-07-27 11:38:26 +01:00
Dave Syer
013a04cfd7 Update README with new CLA link 2016-07-11 14:35:09 +01:00
Spencer Gibb
606233f8ba Update to s-c-build 1.2.0 2016-07-01 16:22:49 -06:00
Spencer Gibb
2d0728f8d3 Update to 1.1.0 2016-06-30 16:19:55 -06:00
Spencer Gibb
a184d62d10 Spring Cloud Consul Stream Binder
Uses consul events for a non-grouping stream binder.

Also enables spring-cloud-starter-consul-bus.

fixes gh-86
2016-06-30 16:19:55 -06:00
Spencer Gibb
cc54bcbd62 Update to SNAPSHOT 2016-06-30 16:09:39 -06:00
Spencer Gibb
ea20ef3986 Update SNAPSHOT to 1.0.2.RELEASE 2016-06-30 15:56:33 -06:00
Spencer Gibb
c2ff08b665 Remove @ConditionalOnBean
Doesn't make much sense, since it will be created in the parent class.

fixes gh-198
2016-06-14 17:45:40 -06:00
Dave Syer
c091bd24e9 Update readme script to handle local includes 2016-06-11 09:54:41 +01:00
Spencer Gibb
e1082b8cd7 Update to SNAPSHOT 2016-06-07 12:34:31 -06:00
Spencer Gibb
e7b7c31cf7 Update SNAPSHOT to 1.0.1.RELEASE 2016-06-07 12:27:35 -06:00
Spencer Gibb
4fd07d96ac Upgrade consul-api to 1.1.10
fixes gh-196
2016-06-07 11:54:20 -06:00
Spencer Gibb
0fe6039cac Merge pull request #195 from aantono/master
* pull195:
  Allow customized Management Port.
2016-06-07 11:34:46 -06:00
Alex Antonov
8bfa3f8828 Allow customized Management Port.
Added support for customized configuration of the Management Port.
(useful when running separate mgmt context inside docker, with 2 port
mappings)
2016-06-07 11:34:17 -06:00
Dave Syer
9231ae7f18 Update tp mvn 3.3.9 2016-06-04 09:14:39 +01:00
Spencer Gibb
0da575893d Merge pull request #166 from Fitzoh/master
* pull166:
  Adds configurable default service tag for queries.
2016-06-03 15:32:26 -06:00
Fitzgerald, Andrew
18456bccbf Adds configurable default service tag for queries. 2016-06-03 15:13:23 -06:00
Spencer Gibb
2b38a3c275 Merge pull request #191 from lowzj/rxjava-dependency
* rxjava-dependency:
  Use 'spring-cloud-starter-ribbon' directly.
2016-06-03 13:41:19 -06:00
lowzj
6e73cfa9da Use 'spring-cloud-starter-ribbon' directly.
Use dependency 'spring-cloud-starter-ribbon' instead of using
netflix.ribbon directly. This brings in the correct version of
'io.reactivex:rxjava' even in 'spring-cloud-dependencies' pom
is not used.

Removed spring-cloud-starter-archaius because it is brought in
by the ribbon starter.
2016-06-03 13:40:56 -06:00
Spencer Gibb
c6cdaa1362 Merge pull request #182 from bpgray/issue-181
* issue-181:
  reduce logging on ConfigWatch connection failure
2016-06-03 11:18:32 -06:00
Bill Gray
8206c2c923 reduce logging on ConfigWatch connection failure
fixes gh-181
2016-06-03 11:18:18 -06:00
Spencer Gibb
cf998fffae Merge pull request #190 from stephaneLeroy/fix-ttl-rate
* fix-ttl-rate:
  Improve Consul TTL Check management
2016-06-03 10:53:40 -06:00
Stéphane Leroy
650552dbab Improve Consul TTL Check management
Remove spring.cloud.consul.discovery.heartbeat.fixedRate property and use a TaskScheduler (with FixedRateTrigger) to send Consul checks

Fixes gh-189
2016-06-03 10:53:29 -06:00
Spencer Gibb
615db48fe7 Merge pull request #193 from imduffy15/patch-1
Fix example segment of code
2016-06-01 13:08:02 -06:00
Ian Duffy
01f28725e8 Fix example segment of code
The discovery client example code attempts to call a `getInstances` function on a non existing client, this should be `discoveryClient`
2016-06-01 19:52:48 +01:00
Dave Syer
ed246b7c2f Re-instate .settings.xml for Travis 2016-05-12 11:34:30 +01:00
Dave Syer
ab5d6f883c Update README and remove .settings.xml where appropriate 2016-05-12 10:47:36 +01:00
Marcin Grzejszczak
85a3f2b8aa Update runAcceptanceTests.sh 2016-05-11 14:30:45 +02:00
Dave Syer
039b1276a6 Update dependencies to their latest snapshot 2016-05-11 09:32:02 +01:00
Dave Syer
6fefb39f86 Update to 1.0.1 snapshots 2016-05-11 09:27:50 +01:00
Spencer Gibb
b4b0918c38 Update to snapshots 2016-05-10 14:55:14 -06:00