Commit Graph

2038 Commits

Author SHA1 Message Date
spencergibb
281b9481a5 Adds antora extension and update ui version 2023-09-22 15:51:09 -04:00
spencergibb
5dca04dc37 Update maven to 3.9.0 2023-09-22 15:50:54 -04:00
Spencer Gibb
59a40db4f7 Antora migration (#2328)
* Migrate Structure

* Insert explicit ids for headers

* Remove unnecessary asciidoc attributes

* Copy default antora files

* Fix indentation for all pages

* Split files

* Generate a default navigation

* Remove includes

* Fix cross references

* Enable Section Summary TOC for small pages

* WIP

* Antora migration

---------

Co-authored-by: Marcin Grzejszczak <mgrzejszczak@vmware.com>
2023-09-19 12:42:15 -04:00
Ryan Baxter
46e529d181 Merge branch '4.0.x' 2023-09-15 12:41:31 -04:00
Tim te Beek
5565acf9a9 refactor: AssertJ best practices (#2315)
Use this link to re-run the recipe: https://app.moderne.io/recipes/builder/bGVuS?organizationId=RGVmYXVsdA%3D%3D

Co-authored-by: Moderne <team@moderne.io>
2023-09-15 12:40:48 -04:00
Ryan Baxter
7b6da4497c Updating maven wrapper 2023-09-08 18:29:48 -04:00
Ryan Baxter
4e46a5c02d Fixing includes in docs 2023-09-08 16:52:15 -04:00
Ryan Baxter
99429f9b62 Merge branch '4.0.x' 2023-09-08 16:48:40 -04:00
Ryan Baxter
6ebe5744d2 Fixing includes in docs 2023-09-08 16:46:01 -04:00
buildmaster
1034624fad Going back to snapshots 2023-08-10 02:04:32 +00:00
buildmaster
166de9865e Update SNAPSHOT to 4.1.0-M1 2023-08-10 02:02:15 +00:00
buildmaster
43a24a20cb Bumping versions to 4.0.5-SNAPSHOT after release 2023-07-27 20:20:11 +00:00
buildmaster
e5afed126f Going back to snapshots 2023-07-27 20:20:11 +00:00
buildmaster
eadab6fbd0 Update SNAPSHOT to 4.0.4 2023-07-27 20:16:35 +00:00
Ryan Baxter
20145a5a30 Merge branch '4.0.x' 2023-07-16 19:51:17 -04:00
Ryan Baxter
e9320b6a55 Merge branch '3.1.x' into 4.0.x 2023-07-16 19:18:19 -04:00
Ryan Baxter
3910fbff56 Fix IllegalArgumentException in equals and hashcodes. Fixes #2304 (#2307)
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
2023-07-16 19:14:22 -04:00
buildmaster
d1ec6e56fc Bumping versions 2023-06-30 14:09:46 +00:00
buildmaster
c3ba785495 Bumping versions to 3.1.9-SNAPSHOT after release 2023-06-29 11:18:59 +00:00
buildmaster
7fcb376610 Going back to snapshots 2023-06-29 11:18:59 +00:00
buildmaster
5f0b24ff60 Update SNAPSHOT to 3.1.8 2023-06-29 11:16:43 +00:00
Ryan Baxter
c017ff0d20 Merge branch '4.0.x' 2023-06-27 19:41:19 -04:00
Ryan Baxter
9810538bf5 Merge branch '4.0.x' of https://github.com/spring-cloud/spring-cloud-config into 4.0.x 2023-06-27 19:40:51 -04:00
Ryan Baxter
26d24a0281 Merge branch '3.1.x' into 4.0.x 2023-06-27 19:40:33 -04:00
Ryan Baxter
cfd8f209a8 Merge branch '3.1.x' of github.com:spring-cloud/spring-cloud-config into 3.1.x 2023-06-27 19:39:09 -04:00
Ryan Baxter
8e090b9713 Add documentation on additional request in config data flow. Fixes #2301 2023-06-27 19:39:06 -04:00
spencergibb
b64bfb3a87 Merge branch '3.1.x' into 4.0.x 2023-06-27 16:41:09 -04:00
spencergibb
5c259443e1 Specifies vault version in testcontainers 2023-06-27 16:24:34 -04:00
spencergibb
3ba9b75923 Merge branch '4.0.x' 2023-06-21 12:04:54 -04:00
spencergibb
101e918cba Updates to handle deprecated/removed setReadTimeout() method 2023-06-21 12:03:55 -04:00
spencergibb
a72b7c86ea formatting 2023-06-21 11:12:16 -04:00
buildmaster
57e2ff5918 Bumping versions 2023-06-17 13:46:03 +00:00
buildmaster
5bfc1577ba Bumping versions 2023-06-17 00:27:07 +00:00
Ryan Baxter
1f18b7076c Merge branch '4.0.x' 2023-06-16 16:18:32 -04:00
Ryan Baxter
04b6ec24fd Merge branch '3.1.x' into 4.0.x 2023-06-16 16:18:07 -04:00
Ryan Baxter
640d6d3fa8 Revert changes to adding profile specific logic (#2292)
Fixes #2279
Fixes #2289

See #2291

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
2023-06-16 16:07:24 -04:00
Ryan Baxter
55015eb34c Merge branch '4.0.x' 2023-06-16 15:40:43 -04:00
Ryan Baxter
d0d11f2595 Merge branch '3.1.x' into 4.0.x 2023-06-16 15:40:27 -04:00
Ryan Baxter
12597fef31 Initialize ConfigClientProperties instead of using whats in bootstrap. (#2282)
Fixes #2281

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
2023-06-16 15:37:22 -04:00
Ryan Baxter
161acaa8c8 Merge branch '4.0.x' 2023-06-16 15:35:55 -04:00
Ryan Baxter
65ff87702a Merge branch '3.1.x' into 4.0.x 2023-06-16 15:35:36 -04:00
Ryan Baxter
9f3ad4f04b Implement a better equals and hashcode method ConfigServerConfigDataResource (#2278)
Spring Boot keeps a list of ConfigDataResources and will call contains on the list to determine whether it should load the resource.  Our hashcode and equals methods were using variables in ConfigServerConfigDataResource which had no bearing on the configuration that would be loaded, so this change simplifies this to make sure two ConfigServerConnfigDataResources would be considered equal if they would end up making the same request to the config server for configuration.

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
2023-06-16 15:34:46 -04:00
Marcin Grzejszczak
2d1e7e9389 Merge branch '4.0.x' 2023-06-16 12:44:56 +02:00
Marcin Grzejszczak
9d7d7b3f5f Including Observability appendix only for non-release train docs 2023-06-16 12:44:23 +02:00
Kaveh Shamsi
c4edc5a4f3 Removes unnecessary @RunWith annotations (#2290) 2023-06-15 10:39:40 -04:00
Kaveh Shamsi
c9d11fffa6 Removes unnecessary @RunWith annotations (#2290) 2023-06-15 10:35:00 -04:00
buildmaster
a6c4e42103 Bumping versions 2023-06-15 10:34:13 +00:00
spencergibb
cdb87ff48a Updates to 4.1.0-SNAPSHOT
Updates to build 4.1.0-SNAPSHOT
2023-06-14 14:48:19 -04:00
Ryan Baxter
25bf685a27 Fixing merge conflicts 2023-06-14 14:23:38 -04:00
Ryan Baxter
ed0c170b41 Merge branch '3.1.x' 2023-06-14 14:23:22 -04:00