spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-26 11:39:14 +00:00
Code Issues Projects Releases Wiki Activity
44,881 Commits 28 Branches 395 Tags
911bd2bb05ec9fbdeb4fb2a7e1a85166cea21b94
Commit Graph
3672 Commits
Author SHA1 Message Date
Jake 8932de0fe2 Fix typo 
See gh-38241
 2023-11-07 10:07:14 +01:00
Moritz Halbritter fb1a4ba470 Merge branch '3.0.x' into 3.1.x 
Closes gh-38197
 2023-11-03 12:28:22 +01:00
Moritz Halbritter 6b69525291 Merge branch '2.7.x' into 3.0.x 
Closes gh-38196
 2023-11-03 12:28:11 +01:00
Moritz Halbritter 18f9dc9b94 Document that customizers are not applied to additional connectors 
Closes gh-38183
 2023-11-03 12:27:55 +01:00
Phillip Webb 683d791104 Merge branch '3.0.x' into 3.1.x 
Closes gh-38178
 2023-11-01 18:22:28 -07:00
Phillip Webb e5c8723dda Merge branch '2.7.x' into 3.0.x 
Closes gh-38177
 2023-11-01 18:22:06 -07:00
Phillip Webb eecb15d1ba Rename startDaemonAwaitThread() inside TomcatWebServer to match intent 
Closes gh-38155
 2023-11-01 18:21:36 -07:00
Andy Wilkinson 40ce6182a1 Merge branch '3.0.x' into 3.1.x 
Closes gh-38167
 2023-11-01 15:03:29 +00:00
Andy Wilkinson b7f00c1087 Merge branch '2.7.x' into 3.0.x 
Closes gh-38166
 2023-11-01 15:02:54 +00:00
Christoph Dreis 990afd844f Fix typos in method names 
See gh-38153
 2023-11-01 14:59:49 +00:00
Moritz Halbritter 607ed86edb Merge branch '3.0.x' into 3.1.x 2023-10-31 10:23:01 +01:00
Moritz Halbritter 3d4a9dd059 Polish StandardConfigDataResource 2023-10-31 09:49:01 +01:00
Moritz Halbritter e7c26b9410 Polish BeanDefinitionLoader 2023-10-31 09:49:01 +01:00
Phillip Webb 9f3afb3636 Merge branch '3.0.x' into 3.1.x 2023-10-19 23:21:20 -07:00
Phillip Webb 7c864804d5 Merge branch '2.7.x' into 3.0.x 2023-10-19 23:21:08 -07:00
Phillip Webb d47f8bf945 Update copyright year of changed files 2023-10-19 23:20:43 -07:00
Phillip Webb 1d456e09d2 Merge branch '3.0.x' into 3.1.x 
Closes gh-37966
 2023-10-19 21:12:52 -07:00
Phillip Webb a0b999c8b4 Merge branch '2.7.x' into 3.0.x 
Closes gh-37965
 2023-10-19 20:55:51 -07:00
Phillip Webb abdad1cabe Constently use assertThatExceptionOf... assertions 
Closes gh-37964
 2023-10-19 20:17:26 -07:00
Andy Wilkinson 226221073c Merge branch '3.0.x' into 3.1.x 
Closes gh-37941
 2023-10-18 18:39:29 +01:00
Andy Wilkinson a25472ab5b Merge branch '2.7.x' into 3.0.x 
Closes gh-37940
 2023-10-18 18:39:16 +01:00
Andy Wilkinson 817debb1ee Fix constructor binding with conversion to custom collection type 
Closes gh-37734
 2023-10-18 17:47:26 +01:00
Andy Wilkinson 9219fdc638 Merge branch '3.0.x' into 3.1.x 
Closes gh-37938
 2023-10-18 17:44:30 +01:00
Andy Wilkinson 865203f902 Merge branch '2.7.x' into 3.0.x 
Closes gh-37937
 2023-10-18 17:37:37 +01:00
Andy Wilkinson 04307aa7e0 Polish "Support @Order on [CommandLine|Application]Runner @Bean definitions" 
See gh-37905
 2023-10-18 17:16:48 +01:00
Tadaya Tsuyukubo 8ac597c245 Support @Order on [CommandLine|Application]Runner @Bean definitions 
Prior to this commit, `@Order` annotation on `@Bean` method was not
considered for `CommandLineRunner` and `ApplicationRunner`.

This commit introduces a `Runner` marker interface and uses it to
retrieve the runner beans. As a result, it enables the use of `@Order`
annotations on `@Bean` methods for both `CommandLineRunner` and
`ApplicationRunner`.

Signed-off-by: Tadaya Tsuyukubo <tadaya@ttddyy.net>

See gh-37905
 2023-10-18 17:15:15 +01:00
Andy Wilkinson 0c1b5d1295 Merge branch '3.0.x' into 3.1.x 
Closes gh-37883
 2023-10-13 16:39:02 +01:00
Andy Wilkinson e314e11985 Fix AOT processing of @MultipartConfig annotated @WebServlet 
Closes gh-37637
 2023-10-13 16:22:38 +01:00
Andy Wilkinson a4100e12ff Merge branch '3.0.x' into 3.1.x 
Closes gh-37661
 2023-10-03 11:05:51 +01:00
Andy Wilkinson 931584f8af Merge branch '2.7.x' into 3.0.x 
Closes gh-37659
 2023-10-03 10:28:51 +01:00
Johnny Lim c9932bb73a Use AssertJ's fail, not JUnit's 
This commit also updates Checkstyle to prevent use of JUnit's
assertions from being reintroduced.

See gh-37655
 2023-10-03 10:11:12 +01:00
Andy Wilkinson 1e4deed8ce Merge branch '3.0.x' into 3.1.x 
Closes gh-37635
 2023-09-29 18:36:09 +01:00
Andy Wilkinson 458418be29 Automatically register reflection hints for scanned WebListeners 
Closes gh-36008
 2023-09-29 18:09:36 +01:00
Andy Wilkinson 0368fc5678 Merge branch '3.0.x' into 3.1.x 
Closes gh-37600
 2023-09-27 12:38:21 +01:00
Andy Wilkinson 688a69b9b1 Prevent status messages from logging when Logback is being configured 
There's a window where the deny-all turbo filter has been removed but
Logback has not yet been configured. If any logging that would have
reached an appender is performed in this window, unwanted status
messages will be logged. This window can be closed by ensuring that
the turbo filter is in place while Logback is being configured.

Closes gh-34505
 2023-09-27 12:28:23 +01:00
Moritz Halbritter 02f71d8e95 Merge branch '3.0.x' into 3.1.x 
Closes gh-37570
 2023-09-25 11:39:29 +02:00
Moritz Halbritter b93ce92022 Merge branch '2.7.x' into 3.0.x 
Closes gh-37569
 2023-09-25 11:39:18 +02:00
Moritz Halbritter b266ade00c Prevent exception when loading optional config data locations 
Closes gh-35683
 2023-09-25 11:39:04 +02:00
Moritz Halbritter ddd666497d Merge branch '3.0.x' into 3.1.x 
Closes gh-37513
 2023-09-21 16:44:14 +02:00
Moritz Halbritter dc8e69cc8d Merge branch '2.7.x' into 3.0.x 
Closes gh-37512
 2023-09-21 16:44:05 +02:00
Johnny Lim b95092c621 Fix wrong mocking 
See gh-37492
 2023-09-21 16:42:43 +02:00
Andy Wilkinson e10ca23b41 Merge branch '3.0.x' into 3.1.x 
Closes gh-37484
 2023-09-20 10:56:20 +01:00
Andy Wilkinson 2a3d5c4e0e Tolerate parallel init of SLF4J 
Closes gh-37477
 2023-09-20 10:49:01 +01:00
Moritz Halbritter af244e1550 Start Threshold filters in DefaultLogbackConfiguration 
Closes gh-36741
 2023-09-18 14:11:09 +02:00
Moritz Halbritter 3900c0ad58 Merge branch '3.0.x' into 3.1.x 2023-09-18 09:53:07 +02:00
Moritz Halbritter 9a1e146c86 Polish PrivateKeyParserTests 2023-09-18 09:51:39 +02:00
Moritz Halbritter 0ba928bf2d Polish PemPrivateKeyParserTests 
Add tests for:
  - aes128 and aes256 encrypted keys
  - scrypt encrypted keys
  - des3 encrypted keys
  - encrypted EdDSA and XDH keys
 2023-09-18 09:31:08 +02:00
Moritz Halbritter 85e322b401 Merge branch '3.0.x' into 3.1.x 2023-09-15 15:39:41 +02:00
Moritz Halbritter 1b098951aa Merge branch '2.7.x' into 3.0.x 2023-09-15 15:39:28 +02:00
Moritz Halbritter 36629df416 Remove useless file 2023-09-15 15:39:18 +02:00