Commit Graph

32158 Commits

Author SHA1 Message Date
Stephane Nicoll 6c68f3652c Merge branch '2.4.x'
Closes gh-26186
2021-04-21 10:03:41 +02:00
Stephane Nicoll 8edeb2c7a9 Merge branch '2.3.x' into 2.4.x
Closes gh-26185
2021-04-21 10:03:32 +02:00
Stephane Nicoll 856e0d0535 Document that MeterFilters are only applied to a managed registry
Closes gh-25610
2021-04-21 10:02:57 +02:00
Stephane Nicoll d403103aac Merge branch '2.4.x'
Closes gh-26182
2021-04-20 17:58:30 +02:00
Stephane Nicoll 6fc803c5a2 Merge branch '2.3.x' into 2.4.x
Closes gh-26181
2021-04-20 17:58:14 +02:00
Stephane Nicoll 6f73fd6785 Upgrade to Testcontainers 1.15.3
Closes gh-26179
2021-04-20 17:05:58 +02:00
Andy Wilkinson 1116a3d0c5 Merge branch '2.4.x'
Closes gh-26178
2021-04-20 15:52:51 +01:00
Andy Wilkinson 289ede6541 Merge branch '2.3.x' into 2.4.x
Closes gh-26177
2021-04-20 15:52:26 +01:00
Andy Wilkinson 2dce3abe84 Use main branch when working with Homebrew tap's git repo
Closes gh-26173
2021-04-20 15:51:06 +01:00
Andy Wilkinson d1164c63f9 Merge branch '2.4.x'
Closes gh-26176
2021-04-20 15:47:50 +01:00
Andy Wilkinson be99f386a8 Merge branch '2.3.x' into 2.4.x
Closes gh-26175
2021-04-20 15:47:38 +01:00
Andy Wilkinson 9e5f738f7a Make relative file references in checkstyle.xml more robust
Closes gh-26174
2021-04-20 15:47:08 +01:00
Stephane Nicoll d881503a73 Merge branch '2.4.x'
Closes gh-26172
2021-04-20 15:12:39 +02:00
Stephane Nicoll 7cbae821b7 Merge branch '2.3.x' into 2.4.x
Closes gh-26171
2021-04-20 15:12:29 +02:00
Stephane Nicoll 823840dd21 Merge pull request #26167 from k163377
* pr/26167:
  Use new update site for Spring Java Format's Eclipse plugin

Closes gh-26167
2021-04-20 15:12:15 +02:00
wrongwrong 6ee72ff489 Use new update site for Spring Java Format's Eclipse plugin
See gh-26167
2021-04-20 15:11:03 +02:00
Andy Wilkinson b9348c6d28 Merge branch '2.4.x'
Closes gh-26169
2021-04-20 11:26:46 +01:00
Andy Wilkinson bc1a462143 Merge branch '2.3.x' into 2.4.x
Closes gh-26168
2021-04-20 11:19:10 +01:00
Andy Wilkinson 82198a99e0 Polish nohttp configuration
Closes gh-26166
2021-04-20 11:15:13 +01:00
Stephane Nicoll 55b9fc12c7 Merge branch '2.4.x'
Closes gh-26165
2021-04-20 10:23:57 +02:00
Stephane Nicoll 52543b84c1 Fix sourceType for spring.profiles.include
Closes gh-26163
2021-04-20 10:23:42 +02:00
Stephane Nicoll cf5334da35 Merge branch '2.4.x'
Closes gh-26164
2021-04-20 10:22:55 +02:00
Stephane Nicoll 2bd4ccce8a Document spring.profiles.group in configuration metadata
Closes gh-26127
2021-04-20 10:22:43 +02:00
Stephane Nicoll 6965e3db06 Merge pull request #26162 from izeye
* pr/26162:
  Fix broken assertions in tests

Closes gh-26162
2021-04-20 10:06:37 +02:00
izeye e53453c69c Fix broken assertions in tests
This commit also restores the HTTP response body
assertion that has been dropped in 5873ddd.

See gh-26162
2021-04-20 10:02:26 +02:00
Stephane Nicoll 57d35aba12 Merge branch '2.4.x'
Closes gh-26160
2021-04-19 17:09:45 +02:00
Stephane Nicoll 6bbd36c77a Merge branch '2.3.x' into 2.4.x
Closes gh-26159
2021-04-19 17:01:28 +02:00
Stephane Nicoll 57c199d4d1 Merge pull request #14928 from nicce
* pr/14928:
  Polish "Enhance multiple entity manager factories how-to"
  Enhance multiple entity manager factories how-to

Closes gh-14928
2021-04-19 17:01:09 +02:00
Stephane Nicoll 03b65f3260 Polish "Enhance multiple entity manager factories how-to"
See gh-14928
2021-04-19 16:59:31 +02:00
Niclas Fredriksson 0d9db46f68 Enhance multiple entity manager factories how-to
See gh-14928
2021-04-19 16:53:50 +02:00
Stephane Nicoll 531ee83c6a Merge branch '2.4.x'
Closes gh-26156
2021-04-19 14:33:17 +02:00
Stephane Nicoll 54613c77d4 Exclude beans with scheduled methods from global lazy init
This commit updates TaskSchedulingAutoConfiguration to contribute a
LazyInitializationExcludeFilter that processes beans that have
@Scheduled methods. This lets them be contributed to the context so
that scheduled methods are invoked as expected.

Closes gh-25315
2021-04-19 14:04:03 +02:00
Andy Wilkinson 177152e007 Merge branch '2.4.x'
Closes gh-26155
2021-04-19 10:24:25 +01:00
Andy Wilkinson aa9d0bc421 Merge pull request #26149 from vsriram92
* gh-26194:
  Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
  Use ConfigDataLocationResolvers' class loader to load resolver names

Closes gh-26149
2021-04-19 10:23:41 +01:00
Andy Wilkinson 0c30a5930d Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
See gh-26149
2021-04-19 10:23:27 +01:00
Sriram 4268f8da84 Use ConfigDataLocationResolvers' class loader to load resolver names
See gh-26149
2021-04-19 10:06:07 +01:00
Stephane Nicoll 221f36ba93 Add missing value provider metadata for SQL init resources
Closes gh-26154
2021-04-19 09:51:51 +02:00
Stephane Nicoll 661ff34dcd Merge pull request #26145 from izeye
* pr/26145:
  Update copyright year of changed file
  Polish

Closes gh-26145
2021-04-19 09:48:51 +02:00
Stephane Nicoll 548baf7914 Update copyright year of changed file
See gh-26145
2021-04-19 09:34:56 +02:00
izeye 996472b42d Polish
See gh-26145
2021-04-19 09:34:55 +02:00
Stephane Nicoll fea53294e4 Merge pull request #26150 from zuisong
* pr/26150:
  Fix wrong replacements for spring.datasource.[schema|data]

Closes gh-26150
2021-04-19 09:28:02 +02:00
zuisong 95a9f36ac1 Fix wrong replacements for spring.datasource.[schema|data]
See gh-26150
2021-04-19 09:27:24 +02:00
Stephane Nicoll 086d289636 Merge branch '2.4.x' 2021-04-16 09:51:44 +02:00
Stephane Nicoll d3ca939aa8 Merge branch '2.3.x' into 2.4.x 2021-04-16 09:51:30 +02:00
Stephane Nicoll a1a2f00b65 Upgrade CI to Docker 20.10.6
Closes gh-26118
2021-04-16 09:51:14 +02:00
Stephane Nicoll 23cd375e52 Upgrade CI to Docker 20.10.6
Closes gh-26119
2021-04-16 09:51:04 +02:00
Stephane Nicoll df3f026f3b Upgrade CI to Docker 20.10.6
Closes gh-26117
2021-04-16 09:38:32 +02:00
Stephane Nicoll 9f8c58b22b Merge pull request #25532 from katielevy1
* pr/25532:
  Polish contribution
  Polish KotlinConstructorParametersBinderTests

Closes gh-25532
2021-04-16 09:30:09 +02:00
Stephane Nicoll bac101647a Polish contribution
See gh-25532
2021-04-16 09:29:48 +02:00
katielevy1 bd9dd9d5eb Polish KotlinConstructorParametersBinderTests
See gh-25532
2021-04-16 09:22:45 +02:00