Commit Graph

236 Commits

Author SHA1 Message Date
spencergibb
b58dd4d80e Fixes broken tests.
Fixes gh-615
2020-10-09 21:03:40 -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
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
249285ae11 Formatting 2020-09-17 10:53:40 -04:00
spencergibb
e94f45663a Merge branch '2.2.x' 2020-09-09 12:54:47 -04:00
Spencer Gibb
50c74c9eba Testcontainers support (#624)
Testcontainers functionality is in ConsulTestcontainers

This allows for use either by an ApplicationContextInitializer or statically.

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
2020-09-09 12:41:56 -04:00
spencergibb
9d4b62858e Merge branch '2.2.x' 2020-07-06 17:57:50 -04:00
spencergibb
57d0a31517 Temporarily ignore tests 2020-05-26 10:36:46 -04:00
spencergibb
dcb083f3a8 Removes unused package 2020-05-22 15:14:35 -04:00
spencergibb
21b5f90402 Merge branch '2.2.x' 2020-05-22 15:12:48 -04:00
spencergibb
e70cc1e82f Deprecates joda time usage
Fixes gh-612
2020-05-22 15:09:39 -04:00
spencergibb
032ecbc48a Updates tests to check the cause 2020-05-22 15:08:35 -04:00
spencergibb
32aa3c9b8b Updates test to match cause rather than exception 2020-05-14 16:11:39 -04:00
Spencer Gibb
b15a063afe Merge branch '2.2.x' 2020-04-20 12:54:26 -04:00
Spencer Gibb
9f8c0dd8ef Makes disabling service registry by properties consistent. (#634)
Fixes gh-619
2020-04-20 12:53:18 -04:00
Spencer Gibb
6485240922 Removes tags as metadata.
See gh-630
2020-04-16 23:12:05 -04:00
Spencer Gibb
f67284561e Removes tags as metadata.
See gh-630
2020-04-16 22:58:52 -04:00
Spencer Gibb
62b3fa04aa Merge branch '2.2.x' 2020-04-16 10:38:57 -04:00
Spencer Gibb
ff3c3106ca Adds javadoc comment 2020-04-16 10:34:01 -04:00
Spencer Gibb
3e2357a5cb Use metadata if tags-as-metadata=false for config server
See gh-630
2020-04-10 15:23:37 -04:00
Spencer Gibb
c3f2367549 Removes tags as metadata.
Fixes gh-630
2020-04-09 16:21:50 -04:00
Spencer Gibb
d353d0cb2f Merge branch '2.2.x' 2020-04-09 15:31:39 -04:00
Spencer Gibb
f711bda1f8 Polishes consul metadata support 2020-04-09 15:14:15 -04:00
Bradley Barrett
4aab57f59d Add metadata and enableTagOverride properties for service registration 2020-04-09 11:53:55 -04:00
Spencer Gibb
6bbe82998d Adds support for metadata in a backwards compatible way.
fixes gh-575
2020-04-09 02:12:18 -04:00
Spencer Gibb
64549e267f Merge branch '2.2.x' 2020-04-09 01:24:36 -04:00
Spencer Gibb
cbd5e8f22b Replaces deprecations.
Mostly from ewcid consul-api.
2020-04-09 01:23:51 -04:00
Spencer Gibb
29730d55a1 Merge branch '2.2.x' 2020-03-18 18:37:35 -04:00
Spencer Gibb
f7c790dd27 Bumps to build 2.2.4.BUILD-SNAPSHOT
Adds joda time dep mgmt since boot 2.3 dropped it.

Updates deprecations to replacements
2020-03-18 18:29:36 -04:00
Spencer Gibb
b0849717a4 deregister service when test is done 2020-03-06 10:11:40 -05:00
Spencer Gibb
cbc947ab73 Ignores test 2020-01-21 18:33:14 -05:00
Spencer Gibb
5d2c19cc44 Updates to 3.0.0 and removes netflix maintenance mode projects. 2020-01-21 17:42:30 -05:00
Spencer Gibb
cbb2f4150b Removes joda-time.
fixes gh-301
2020-01-21 17:20:17 -05:00
Ryan Baxter
fd083ca874 Added proxyBeanMethods = false to configuration classes. Fixes #596 2019-11-14 20:15:04 -05:00
Tim Ysewyn
ef0b356d97 Added support for reactive service discovery 2019-10-02 16:40:34 +02:00
buildmaster
3d0346b95e Bumping versions 2019-09-24 12:34:49 +00:00
Varnson Fan
0fc8b2a98a Add consistency mode setting (#591)
* add consistency mode in ConsulDiscoveryProperties

* change default QueryParams to user setting

fixes gh-556
2019-09-23 12:41:40 -04:00
Varnson Fan
f7d57ee1c2 fix #492-add hostname in instanceid (#570) 2019-09-16 12:38:59 -04:00
Tim Ysewyn
a77dedff7d Merge branch '2.1.x' 2019-07-23 21:50:30 +02:00
Tim Ysewyn
9ec99fedca Merge branch '2.0.x' 2019-07-23 21:31:20 +02:00
Tim Ysewyn
8d74a85e79 Extracted heartbeat and catalog watch auto-configuration. (#574)
* Extracted heartbeat and catalog watch auto-configuration.
Needed in order to have those beans running in the correct application context when SC Config discovery is enabled.

* Moved heartbeat config to support package
2019-07-23 21:10:18 +02:00
Olga Maciaszek-Sharma
201f1fcc25 Merge branch '2.1.x'
# Conflicts:
#	pom.xml
#	spring-cloud-consul-dependencies/pom.xml
2019-05-08 16:44:31 +02:00
Spring Operator
2c92c64db8 URL Cleanup (#523)
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://www.apache.org/licenses/ with 1 occurrences migrated to:
  https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200).
* [ ] http://www.apache.org/licenses/LICENSE-2.0 with 115 occurrences migrated to:
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
2019-03-26 16:18:16 -04:00
Spring Operator
2330446a3b URL Cleanup (#522)
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://www.apache.org/licenses/ with 1 occurrences migrated to:
  https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200).
* [ ] http://www.apache.org/licenses/LICENSE-2.0 with 115 occurrences migrated to:
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
2019-03-26 16:17:41 -04:00
Spring Operator
ef3f7b2eda URL Cleanup (#519)
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://www.apache.org/licenses/ with 1 occurrences migrated to:
  https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200).
* [ ] http://www.apache.org/licenses/LICENSE-2.0 with 97 occurrences migrated to:
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
2019-03-26 16:17:13 -04:00