Ryan Baxter
ae24fcd922
Merge branch '3.1.x' into 4.0.x
2023-06-15 09:16:06 -04:00
Ryan Baxter
336877934f
Create ConsulFunction properly to avoid ClassNotFoundException
2023-06-15 08:53:16 -04:00
Ryan Baxter
a9b4d440c5
Upgrading spring-cloud-deployer version. Only used for tests
2023-06-13 17:18:49 -04:00
Ryan Baxter
ad9f8ee5e6
Fix compile errors
2023-06-13 16:57:50 -04:00
Ryan Baxter
843f18c201
Merge branch '3.1.x'
2023-06-13 16:57:32 -04:00
Ryan Baxter
cf29e78379
Implement new API in ConfigServerInstanceProvider.Function ( #819 )
...
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com >
2023-06-13 16:20:09 -04:00
buildmaster
80150dab17
Bumping versions
2023-05-26 16:48:11 +00:00
spencergibb
dbb395944f
Upgrade spring-cloud-deployer to 2.8.3
2023-05-26 12:42:17 -04:00
buildmaster
4c4e012857
Bumping versions
2023-04-28 19:09:50 +00:00
buildmaster
3b863f20b3
Bumping versions to 3.1.4-SNAPSHOT after release
2023-04-27 15:15:08 +00:00
buildmaster
df4af5a6b3
Going back to snapshots
2023-04-27 15:15:07 +00:00
buildmaster
0592883255
Update SNAPSHOT to 3.1.3
2023-04-27 15:13:04 +00:00
buildmaster
f9d1463880
Bumping versions
2023-03-30 08:42:25 +00:00
buildmaster
776fbe2489
Bumping versions to 4.0.3-SNAPSHOT after release
2023-03-28 15:34:35 +00:00
buildmaster
b96a92a7be
Going back to snapshots
2023-03-28 15:34:35 +00:00
buildmaster
51d6c3a2dd
Update SNAPSHOT to 4.0.2
2023-03-28 15:32:07 +00:00
spencergibb
4b5fec723e
Merge branch '3.1.x'
2023-03-15 15:19:26 -04:00
1993heqiang
9e594cbd9d
Polish spring-cloud-consul.adoc.
2023-03-15 15:18:49 -04:00
spencergibb
474f317b20
formatting
2023-03-14 14:53:03 -04:00
spencergibb
d5844963e0
Merge branch '3.1.x'
2023-03-14 14:50:50 -04:00
spencergibb
89eccb7b3a
formatting
2023-03-14 14:49:46 -04:00
spencergibb
1817f206a0
Merge branch '3.1.x'
2023-03-09 16:24:40 -05:00
zhenqiangyi
c6f768b28c
Modifies LogFactory Input parameter of getlog
...
Uses current class rather than copy paste class.
Fixes gh-767
2023-03-09 16:23:50 -05:00
spencergibb
35736bd1c5
Merge branch '3.1.x'
2023-03-09 16:21:04 -05:00
spencergibb
6b9dab1096
Reworks test, removes TestConsulClient.java
2023-03-09 16:20:24 -05:00
spencergibb
ae5178e032
Updates TtlSchedulerTests to use correct method.
...
See gh-770
2023-03-09 16:15:23 -05:00
spencergibb
5fd733669b
Merge branch '3.1.x'
2023-03-09 16:13:11 -05:00
spencergibb
0a9745189c
Adds test to verify token sent on agentCheckPass.
...
See gh-770
2023-03-09 16:10:01 -05:00
spencergibb
176da8654a
formattingˆ
2023-03-09 16:09:20 -05:00
liolay
226e08a8eb
add aclToken for agentCheckPass
2023-03-09 15:47:58 -05:00
Jonathan Schnéider
c5558cc597
polish: Use ObjectUtils#isEmpty(Object). ( #745 )
...
Co-authored-by: Moderne <team@moderne.io >
Co-authored-by: Spencer Gibb <spencer@gibb.us >
2023-03-09 15:42:04 -05:00
spencergibb
24b4c1adaa
Merge branch '3.1.x'
2023-03-09 15:19:01 -05:00
fanjiaqi
3447b576ff
Fixes ipv6 formatting in specific scenario
...
Use getHostAddress() when getHostName() might return a host name which
doesn't need brackets for formatting.
Fixes gh-807
2023-03-09 15:18:23 -05:00
spencergibb
ddb49cc911
Adapts test to new constructorsˆ
2023-03-09 15:10:03 -05:00
spencergibb
dab42d8b83
Merge branch '3.1.x'
2023-03-09 15:08:40 -05:00
spencergibb
6378b72526
Adds reregistration test with 404 status.
...
See gh-808
2023-03-09 15:07:18 -05:00
attermann
9bf9c44f3b
Added status code 404 to ReregistrationPredicate
...
Consul agent as of approximately v1.11.2 returns status code 404 on
agent health check instead of status code 500. This change resulted in
re-registration not taking place when expected. Adding status code 404 to
the ReregistrationPredicate enables re-registration with both older and
newer versions of Consul agent.
Fixes gh-808
2023-03-09 15:04:55 -05:00
spencergibb
46a122021f
Merge branch '3.1.x'
2023-03-09 14:33:36 -05:00
spencergibb
2c9bde3788
Updates to Testcontainers consul container.
...
Fixes gh-803
2023-03-09 14:33:23 -05:00
spencergibb
3bab74b998
Merge branch '3.1.x'
2023-03-09 14:15:27 -05:00
Tomas Forsman
bb8e674acb
Default to port zero when port is null
...
This is a change from consul 1.9->1.10
Fixes gh-760
Fixes gh-759
2023-03-09 14:11:29 -05:00
buildmaster
dda13262c4
Bumping versions
2023-03-09 08:36:33 +00:00
spencergibb
76cba3e13d
Merge branch '3.1.x'
2023-03-08 15:57:35 -05:00
spencergibb
5e0346c91e
If consul token is not set, default to CONSUL_TOKEN env var
...
This matches the behaviour of ConsulPropertySourceLocator which depends on ConsulConfigProperties that uses `@Value` which is not recognized in ConfigData.
Fixes gh-738
2023-03-08 15:53:46 -05:00
buildmaster
3868846d13
Bumping versions
2023-02-25 19:09:51 +00:00
spencergibb
310ccfb99c
Moves versions for apache httpclient/httpcore 4.x
...
Moves versions to parent dep mgmt
2023-02-15 15:22:34 -05:00
spencergibb
61528b421a
Adds versions for apache httpclient/httpcore 4.x
...
This was removed in boot 3.1 and required for consul-api
2023-02-15 15:18:58 -05:00
buildmaster
875e22b309
Bumping versions to 4.0.2-SNAPSHOT after release
2023-01-25 15:24:22 +00:00
buildmaster
5a480fdca2
Going back to snapshots
2023-01-25 15:24:21 +00:00
buildmaster
d24e49527f
Update SNAPSHOT to 4.0.1
2023-01-25 15:21:40 +00:00