fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,518 Commits 22 Branches 339 Tags
Commit Graph

5081 Commits

Author SHA1 Message Date
Andy Wilkinson
9fa40adb45 Merge branch '3.3.x' into 3.4.x 
Closes gh-44303
 2025-02-17 11:01:31 +00:00
Andy Wilkinson
045fbee395 Document need for $ separator when auto-config is nested 
Closes gh-44298
 2025-02-17 11:00:29 +00:00
Stéphane Nicoll
2adbc24be1 Polish 2025-02-17 11:49:59 +01:00
Tran Ngoc Nhan
d212232d9d Implement RuntimeHintsRegistrar 
CLoses gh-44299
 2025-02-17 11:21:04 +01:00
Tran Ngoc Nhan
e982136f5e Implement RuntimeHintsRegistrar 
See gh-44266
 2025-02-17 11:09:29 +01:00
Stéphane Nicoll
e67c8b43a2 Merge branch '3.3.x' into 3.4.x 
Closes gh-44296
 2025-02-17 11:06:58 +01:00
Stéphane Nicoll
6aa0055e5e Polish "Do not auto-configure ViewResolver if spring-webmvc is absent" 
See gh-44259
 2025-02-17 11:01:23 +01:00
Dmytro Nosan
ac73766f9b Do not auto-configure ViewResolver if spring-webmvc is absent 
See gh-44259

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
 2025-02-17 11:01:07 +01:00
Andy Wilkinson
18db70533d Merge branch '3.3.x' into 3.4.x 
Closes gh-44215
 2025-02-11 12:31:07 +00:00
Andy Wilkinson
3e5929a446 Remove duplicate dispatcher servlet auto-config tests 
Closes gh-44207
 2025-02-11 12:19:45 +00:00
Andy Wilkinson
167dfd6bc9 Merge branch '3.3.x' into 3.4.x 
Closes gh-44193
 2025-02-10 11:09:12 +00:00
Andy Wilkinson
ea76e46faa Apply charset to Mustache's content type 
Fixes gh-44053
 2025-02-10 11:07:49 +00:00
Stéphane Nicoll
dc9aa6d168 Polish 
See gh-44034
 2025-01-31 17:04:33 +01:00
Brian Clozel
e01a23b1fe Merge branch '3.3.x' into 3.4.x 
Closes gh-
 2025-01-28 17:13:47 +01:00
Brian Clozel
817f466c12 Fix SSL file watcher for relative symlinks 
Prior to this commit, a change in gh-43586 unlocked the support for
symlinks: instead of watching the link itself which might never change,
this would watch the target file which is likely to change.

This could break with an `IllegalStateException` in case the symlink is
using a path relative to the link itself.

This commit ensures that the target is resolved against the current
link path to avoid incorrect watch operations.

Fixes gh-43966
 2025-01-28 16:35:09 +01:00
Johnny Lim
1e39af27d4 Fix Javadoc since for GsonProperties.Strictness 
See gh-43877

Signed-off-by: Johnny Lim <izeye@naver.com>
 2025-01-19 08:04:35 +01:00
Yanming Zhou
54c4716972 Improve ConditionalOnSingleCandidate's Javadoc 
See gh-43826

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-01-15 13:41:03 +01:00
Andy Wilkinson
1de3b5624f Merge branch '3.3.x' into 3.4.x 
Closes gh-43832
 2025-01-15 12:15:19 +00:00
Andy Wilkinson
0f94530e15 Polish "Polish PropertiesRedisConnectionDetails" 
See gh-43825
 2025-01-15 12:00:18 +00:00
Yanming Zhou
a18c2f8f7e Polish PropertiesRedisConnectionDetails 
See gh-43825

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-01-15 11:55:48 +00:00
Andy Wilkinson
d4c7013c8d Tolerate Gson 2.10 and earlier 
Closes gh-43442
 2025-01-14 17:00:25 +00:00
Phillip Webb
8c3e8605c2 Merge branch '3.3.x' into 3.4.x 2025-01-11 10:25:57 -08:00
Phillip Webb
b9efd591e5 Polish "Prevent redis pool to initialize in unit test" 
See gh-43774
 2025-01-11 10:25:46 -08:00
Stéphane Nicoll
e061bb4777 Merge branch '3.3.x' into 3.4.x 
Closes gh-43775
 2025-01-11 12:53:03 +01:00
Stéphane Nicoll
7b04cddf1d Polish "Prevent redis pool to initialize in unit test" 
See gh-43774
 2025-01-11 12:51:21 +01:00
He Zean
911a9a14ea Prevent redis pool to initialize in unit test 
See gh-43774

Signed-off-by: He Zean <realhezean@gmail.com>
 2025-01-11 12:50:46 +01:00
Stéphane Nicoll
97f9589404 Merge branch '3.3.x' 
Closes gh-43604
 2024-12-24 10:29:21 +01:00
Stéphane Nicoll
916705538e Polish "Add support for symlinks in FileWatcher" 
See gh-43586
 2024-12-24 10:22:52 +01:00
Tomasz Maciejewski
26ca3790b2 Add support for symlinks in FileWatcher 
This commit allows using symlinks for SSL certificate hot reloading.

See gh-43586
 2024-12-24 09:59:59 +01:00
Johnny Lim
81f67b13e6 Remove unused ScopedFooConfiguration in ConditionalOnMissingBeanTests 
See gh-43592
 2024-12-23 15:49:16 +01:00
Phillip Webb
ef431609ab Merge branch '3.3.x' 
Closes gh-43563
 2024-12-18 10:44:28 -08:00
Phillip Webb
ba916cb66e Allow KafkaProperties to build properties with empty bundle name 
Update `KafkaProperties` so that properties can still be built when
the bundle name has no text.

Fixes gh-43561
 2024-12-18 10:44:18 -08:00
Phillip Webb
4d6fc85c8e Merge branch '3.3.x' 2024-12-13 19:03:48 -08:00
Phillip Webb
45da43c6b4 Update copyright year of changed files 2024-12-13 19:03:43 -08:00
Johnny Lim
4d15ee5bf0 Polish 
See gh-43498
 2024-12-13 13:29:20 -08:00
Moritz Halbritter
8c20e6c1e9 Merge branch '3.3.x' 
Closes gh-43497
 2024-12-13 14:17:47 +01:00
Dmytro Nosan
1234409fbe Multiple WebFlux ResourceHandlerRegistrationCustomizer should be invoked 
Before this commit, only a single ResourceHandlerRegistrationCustomizer
was invoked. This commit adds functionality to have more
than one ResourceHandlerRegistrationCustomizers

See gh-43494
 2024-12-13 14:00:47 +01:00
Moritz Halbritter
61bab92231 Merge branch '3.3.x' 
Closes gh-43484
 2024-12-11 14:25:44 +01:00
Yanming Zhou
a964bbd8cb Polish variable name for consistency 
See gh-43483
 2024-12-11 14:25:19 +01:00
Phillip Webb
565ec07046 Merge branch '3.3.x' 
Closes gh-43448
 2024-12-09 09:46:47 -08:00
Phillip Webb
3338c22372 Restore build... methods that don't need an SSL bundle 
Restore `buildConsumerProperties()` and `buildProducerProperties()`
methods in `KafkaProperties` to make it more convenient to use them
without an SSL bundle.

Fixes gh-43300
 2024-12-09 09:43:13 -08:00
Phillip Webb
86b0c768e7 Fix annotation matching when using scoped proxies 
Update `OnBeanCondition` to check `isAutowireCandidate` on the original
bean of scoped proxy targets.

Fixes gh-43423
 2024-12-05 18:05:23 -08:00
Phillip Webb
916efb632c Merge branch '3.3.x' 2024-12-04 15:04:22 -08:00
Phillip Webb
9e7972a9b4 Polish code with code cleanup rules 2024-12-04 15:03:40 -08:00
Phillip Webb
3ddfd62f16 Prefer file resolution when loading SSL content 
Update `SslAutoConfiguration` so that the used resource loader prefers
file based resolution when paths are specified without a prefix. This
restores the behavior found in Spring Boot 3.3.

The `ApplicationResourceLoader` has been updated with a new `get` method
that accepts a `preferFileResolution` parameter. Unfortunately, we can't
directly influence the resource returned by the delegate
`ResourceLoader` since we can't override `getResourceByPath(...)`.
Instead we check if the returned type was likely to have been created
by a call to that method. If so, we change it to a `FileSystemResource`.

This approach should hopefully work with `DefaultResourceLoader` and
subclasses.

Fixes gh-43274
 2024-12-03 15:00:15 -08:00
Phillip Webb
7a4e071709 Polish 2024-12-03 14:45:25 -08:00
Phillip Webb
91778e9f96 Merge branch '3.3.x' 
Closes gh-43359
 2024-12-02 19:05:21 -08:00
Phillip Webb
b340c855c0 Prevent H2 console from causing early DataSource initialization 
Update `H2ConsoleAutoConfiguration` so that DataSource connection
logging occurs outside of the `ServletRegistrationBean`.

Fixes gh-43337
 2024-12-02 19:05:16 -08:00
Moritz Halbritter
ff9fde0ef4 Polish "Make UserDetailsServiceAutoConfiguration conditional on servlet app" 
See gh-43334
 2024-12-02 13:40:51 +01:00
BenchmarkingBuffalo
c5d41f1469 Make UserDetailsServiceAutoConfiguration conditional on servlet app 
See gh-43334
 2024-12-02 13:22:07 +01:00