Commit Graph

291 Commits

Author SHA1 Message Date
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
Spencer Gibb
ca9b92f98f Revert "Update SNAPSHOT to 1.0.0.RELEASE"
This reverts commit c29a544409.
2016-05-10 14:53:25 -06:00
Spencer Gibb
c29a544409 Update SNAPSHOT to 1.0.0.RELEASE 2016-05-10 14:50:18 -06:00
Dave Syer
c5a5c6bd98 Fix dependency order to nail spring-core version 2016-05-09 09:33:56 +01:00
Spencer Gibb
c4fb6b1cf8 More spring-core fixes 2016-05-06 11:32:24 -06:00
Dave Syer
c5b6aa57c1 Add explicit release disabled flag for artifactory for plugins 2016-05-06 18:09:41 +01:00
Dave Syer
a3f663ed35 Add explicit release disabled flag for artifactory in dependencies 2016-05-06 17:58:44 +01:00
Dave Syer
c2880bf6ea Add explicit release disabled flag for artifactory 2016-05-06 17:47:14 +01:00
Dave Syer
2808f07025 Switch parent of docs poms 2016-05-06 17:40:09 +01:00
Dave Syer
724340a26e Update parent to 1.1.0.RELEASE 2016-05-06 17:13:33 +01:00
Dave Syer
ca7d70f712 Tidy up dependencies a bit (and verify build with Boot 1.4) 2016-05-05 16:47:59 +01:00
Spencer Gibb
35fcf30a87 Merge pull request #179 from bpgray/log-deregister
log consul deregister calls
2016-04-27 13:24:07 -06:00
Bill Gray
bd50d543ba log consul deregister calls, for consistency with logging of consul register calls 2016-04-27 13:10:45 -06:00
Marcin Grzejszczak
e5780a3508 Unified the way e2e are executed 2016-04-26 17:33:47 +02:00
Spencer Gibb
5bf619ab02 Update to consul-api 1.1.9
fixes gh-174
2016-04-25 16:53:27 -06:00
Spencer Gibb
6e00f9ac5d set server.port 2016-04-25 16:53:05 -06:00
Marcin Grzejszczak
2234960ae5 Using unique identifiers for tests 2016-04-21 11:51:33 +02:00
Dave Syer
1f961b2091 Revert to snapshots 2016-04-18 14:51:14 +01:00
Dave Syer
bfea7109f8 Update to RC2 2016-04-18 14:50:45 +01:00
Dave Syer
fcd93f8e69 Add 8300 to port mapper 2016-04-18 14:46:30 +01:00
Spencer Gibb
bcad4ca683 Merge pull request #164 from jjathman/allow-passing-query-params
* allow-passing-query-params:
  Add the ability to pass along query parameters to Consul when discovering services. One potential use is for passing a different data center value than the default value.
2016-04-06 12:36:49 -06:00
Joseph Athman
4023dfbd30 Add the ability to pass along query parameters to Consul when discovering services. One potential use is for passing a different data center value than the default value. 2016-04-06 12:35:29 -06:00
Spencer Gibb
8d43d78959 Make dealing with catalog watch errors easier.
Uses logger to log errors. Adds ability to disable watch.

see gh-169
2016-04-06 11:58:13 -06:00
Spencer Gibb
ab8e25f5a7 Added RestTemplate to sample 2016-04-06 11:52:47 -06:00
Spencer Gibb
a78a567cce Implement ServiceInstance.getMetadata
Consul does not yet support metadata on services. Spring Cloud's `ServiceInstance` has a `Map<String, String> metadata` field. Spring Cloud Consul uses Consul tags to approximate metadata until Consul officially supports metadata. Tags with the form `key=value` will be split and used as a `Map` key and value respectively. Tags without the equal `=` sign, will be used as both the key and value.

fixes gh-162
2016-04-04 21:06:58 -06:00
Spencer Gibb
02d740fdf9 Prepare consul discovery to lookup configserver.
fixes gh-167
2016-04-04 10:57:02 -06:00
Spencer Gibb
e767c4e64f Fix broken test 2016-04-01 17:54:51 -06:00
Spencer Gibb
79c50f0fc5 Fix NPE if spring.application.name is not set. 2016-04-01 17:52:01 -06:00
Spencer Gibb
314b159a84 Revert "Update SNAPSHOT to milestone 1.0.0.RC1"
This reverts commit e4c066b0b7.
2016-03-23 10:24:27 -06:00
Spencer Gibb
e4c066b0b7 Update SNAPSHOT to milestone 1.0.0.RC1 2016-03-23 10:15:42 -06:00
Spencer Gibb
87e2ae8a44 Update mvnw to determine profile on mac and linux 2016-03-22 12:45:16 -06:00
Spencer Gibb
e4fb366009 Allow to not register a healthcheck.
Useful for development.
2016-03-21 15:05:06 -06:00
Spencer Gibb
a6803340c2 prove s.c.c.discovery.{hostname|ipAddress} work 2016-03-21 11:47:21 -06:00
Spencer Gibb
8db3c72c33 Allow s.c.c.d.register=false to disable registering.
fixes gh-155
2016-03-16 13:32:35 -06:00
Spencer Gibb
c6e7db055e Support .yaml extension for FILES format. 2016-03-11 16:16:40 -07:00
Spencer Gibb
373072182a Added FILES configuration format.
Useful for tools like git2consul that load files into individual keys in consul KV.

Fixes gh-152
2016-03-11 14:43:38 -07:00
Spencer Gibb
0f6319b88a Don't require ServerProperties for ConsulDiscoveryClient.
for apps not registering with consul (cli apps).

Fixes gh-149
2016-03-10 18:19:14 -07:00
Marcin Grzejszczak
b2e6f426d3 Added possibility to download consul without certificate check 2016-03-09 13:24:13 +01:00
Dave Syer
7d1b9c2c07 Fix mvnw script for milestones 2016-03-02 17:36:29 +00:00
Spencer Gibb
f99f61d89b Move o.s.c.util to o.s.c.commons.util 2016-03-02 10:28:31 -07:00
Spencer Gibb
1d8572d408 Only run auto config if consul and consul config is enabled. 2016-02-29 12:22:15 -07:00
Spencer Gibb
9a8ea16312 Only log ConfigWatch errors to trace if failFast=false.
fixes gh-145
2016-02-26 10:32:01 -07:00
Spencer Gibb
9ae832f643 failFast should be set in bootstrap.yml 2016-02-26 10:05:35 -07:00
Spencer Gibb
2212b9e31a If failFast=false only log warnings for config loading.
fixes gh-137
2016-02-25 10:30:34 -07:00
Spencer Gibb
3f3fccd01a Add the option to only query for services that are passing health checks. 2016-02-24 16:45:41 -07:00
Spencer Gibb
db62855c22 More efficient ServerListFilter.
Discovery now uses /v1/health/service/<serviceId> rather than /v1/catalog/service/<serviceId> which provides health checks.

HealthServiceServerListFilter now uses the health check to return only PASSING servers.

This eliminates extra calls to consul.

fixes gh-116
2016-02-24 16:36:58 -07:00
Dave Syer
abc1bcea66 Set -Pmilestone automatically based on pom version 2016-02-12 17:45:17 +00:00