Commit Graph

893 Commits

Author SHA1 Message Date
spencergibb
2dbbe2dced removes reference to config server 2020-12-20 13:41:09 -05:00
spencergibb
80fb075f4a Documents spring.config.import usage 2020-12-20 13:36:08 -05:00
spencergibb
aadfc625f2 Removes deprecated method use 2020-12-20 13:35:20 -05:00
spencergibb
5a1aa899f0 Removes deprecated interface 2020-12-20 13:16:52 -05:00
spencergibb
f69d814315 Reinstates ConsulServiceInstance with reference to HealthService.
This allows users to cast to ConsulServiceInstance and get any data they need that isn't exposed thru ServiceInstance interface.

Fixes gh-682
2020-12-20 13:15:24 -05:00
spencergibb
2f7844f41c Use BindHandler in ConsulConfigServerBootstrapper
Fixes gh-688
2020-12-20 12:00:26 -05:00
spencergibb
70a63018b2 Uses BindHandler if registered in bootstrap.
Spring Cloud Commons now creates a TextEncryptorBindHandler that can decrypt properties when using a Binder. This allows configuration read in ConfigData methods to be decrypted.

Fixes gh-688
2020-12-20 11:49:54 -05:00
Olga Maciaszek-Sharma
bc9f8ec39b Remove Ribbon references from docs. 2020-12-18 18:16:38 +01:00
spencergibb
c75a6c96bd Check if class is registered already.
In ConfigData promotion (promoting a bean from bootstrap to the application context) check to see if there is a bean of that name before registering again.

Fixes gh-687
2020-12-14 15:40:32 -05:00
buildmaster
be3ddb742e Going back to snapshots 2020-12-11 22:10:00 +00:00
buildmaster
dce1c76ca4 Update SNAPSHOT to 3.0.0-RC1 2020-12-11 22:08:47 +00:00
buildmaster
a66800b791 Going back to snapshots 2020-12-01 22:49:46 +00:00
buildmaster
e20b4c7c43 Update SNAPSHOT to 3.0.0-M6 2020-12-01 22:48:36 +00:00
Olga Maciaszek-Sharma
8d9686b16e Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-consul-binder/pom.xml
#	spring-cloud-consul-config/pom.xml
#	spring-cloud-consul-core/pom.xml
#	spring-cloud-consul-dependencies/pom.xml
#	spring-cloud-consul-discovery/pom.xml
#	spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClient.java
#	spring-cloud-consul-sample/pom.xml
#	spring-cloud-starter-consul-all/pom.xml
#	spring-cloud-starter-consul-bus/pom.xml
#	spring-cloud-starter-consul-config/pom.xml
#	spring-cloud-starter-consul-discovery/pom.xml
#	spring-cloud-starter-consul/pom.xml
2020-11-26 17:06:06 +01:00
bono007
782ad89aab Respect the 'spring.cloud.consul.discovery.server-list-query-tags' property during service instance lookup (#685)
Fixes gh-680
2020-11-26 16:53:44 +01:00
buildmaster
47065733d2 Bumping versions 2020-11-19 12:33:53 +00:00
buildmaster
6c9d9b94a8 Going back to snapshots 2020-11-17 20:44:56 +00:00
buildmaster
527f63d6e3 Update SNAPSHOT to 3.0.0-M5 2020-11-17 20:43:42 +00:00
buildmaster
0ac79714ed Bumping versions 2020-11-17 12:34:36 +00:00
buildmaster
58fdb0af98 Bumping versions to 2.2.6.BUILD-SNAPSHOT after release 2020-11-09 10:44:30 +00:00
buildmaster
10c09a64ac Going back to snapshots 2020-11-09 10:44:30 +00:00
buildmaster
6c6e4e3d63 Update SNAPSHOT to 2.2.5.RELEASE 2020-11-09 10:43:04 +00:00
spencergibb
16dc8c3c91 Polishes parseLocation 2020-10-16 15:28:06 -04:00
spencergibb
59e54402e6 Updates to use updated ConfigData apis 2020-10-16 15:22:00 -04:00
spencergibb
46f29724ad Updates to use updated ConfigData apis 2020-10-16 15:15:24 -04:00
spencergibb
b58dd4d80e Fixes broken tests.
Fixes gh-615
2020-10-09 21:03:40 -04:00
spencergibb
2ffbb39062 Unignores test 2020-10-09 20:29:40 -04:00
buildmaster
8015fe2218 Going back to snapshots 2020-10-03 14:00:36 +00:00
buildmaster
3369c2d6a7 Update SNAPSHOT to 3.0.0-M4 2020-10-03 13:59:12 +00:00
buildmaster
3213d76e5f Bumping versions 2020-09-29 12:33:56 +00:00
spencergibb
c56dfc47e8 formatting 2020-09-28 11:45:30 -04:00
spencergibb
f77192b569 Merge branch '2.2.x' 2020-09-28 11:44:17 -04:00
spencergibb
6d6d6fccac Merge branch 'gh-646-2.2.x' into 2.2.x 2020-09-28 11:40:26 -04:00
bono007
4a6d7027f0 Allow ConsulHealthIndicator to bypass the services query
Fixes gh-646
2020-09-28 11:39:38 -04:00
Jay Bryant
cb9facd416 Wording changes (#649)
Replacing some terms
2020-09-28 11:00:03 -04:00
spencergibb
1f124eb879 formatting 2020-09-22 13:42:48 -04:00
spencergibb
48a24d2c61 Registers and promotes ConsulDiscoveryClient if created 2020-09-22 12:29:33 -04:00
spencergibb
b113cdaf85 polish 2020-09-22 12:29:03 -04:00
spencergibb
c569cd9d0c run tests with random port 2020-09-22 11:19:19 -04:00
spencergibb
ce8eeca31f Skip config server bootstrapper if not on classpath 2020-09-22 09:43:28 -04:00
spencergibb
58818457f7 Fixes test name 2020-09-21 16:39:52 -04:00
spencergibb
5e7c2ba6ee Adds support for config discovery in ConfigData.
ConsulConfigServerBootstrapper.java is registered in spring.factories

The bootstrapper registers an ConfigServerInstanceProvider.Function that uses ConsulDiscoveryClient
2020-09-21 16:06:32 -04:00
spencergibb
c702c15be7 Removes deprecated constant 2020-09-21 11:34:27 -04:00
spencergibb
b7454c6302 Dedupes logic between ConfigData and PropertySourceLocator.
Moves logic common to the two implementations to ConsulPropertySources.java
2020-09-18 16:37:14 -04:00
buildmaster
deea57465e Bumping versions 2020-09-18 12:33:40 +00:00
spencergibb
7042018d42 Updates ConsulBootstrapper with more general helper. 2020-09-17 18:11:04 -04:00
spencergibb
a98cde9bdb Updates tests to ignore registering beans 2020-09-17 11:01:56 -04:00
Spencer Gibb
247f21cc05 Uses new Bootstrapper interface to allow config data customization. (#675) 2020-09-17 10:57:39 -04:00
spencergibb
249285ae11 Formatting 2020-09-17 10:53:40 -04:00
spencergibb
59507ee8bc Optimizes isResolvable() only bind with correct prefix. 2020-09-11 09:57:37 -04:00