Andy Wilkinson
d044eaf69d
Merge branch '2.7.x'
...
Closes gh-31221
2022-05-31 11:21:52 +01:00
Andy Wilkinson
7f291f8da0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31220
2022-05-31 11:14:08 +01:00
Andy Wilkinson
348662b15e
Remove unused deduceFromApplicationContext and supporting code
...
Closes gh-31218
2022-05-31 10:57:22 +01:00
Andy Wilkinson
1ba1eff63a
Merge branch '2.7.x'
2022-05-30 19:22:45 +01:00
Andy Wilkinson
430040415b
Merge branch '2.6.x' into 2.7.x
2022-05-30 19:22:37 +01:00
Andy Wilkinson
0b6c147a87
Polish
2022-05-30 19:22:30 +01:00
Andy Wilkinson
12465ea6b7
Merge branch '2.7.x'
...
Closes gh-31214
2022-05-30 18:24:12 +01:00
Andy Wilkinson
d1420b6abb
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31213
2022-05-30 18:24:00 +01:00
Andy Wilkinson
da8dafe138
Make afterResolve hook used by bootJar and bootWar more robust
...
Previously, ResolvedDependencies used hasError on
ResolvedConfiguration to check that it was safe to work with all
of the resolved configuration's artifacts and their files. This
check is not sufficient as errors can still occur later on.
This commit updates ResolvedDependencies to use a lenient
configuration, thereby avoiding any problems that may be caused by
errors that occur after the hasError check.
Closes gh-30586
2022-05-30 18:19:47 +01:00
Andy Wilkinson
85ad4fd4b4
Merge branch '2.7.x'
...
Closes gh-31212
2022-05-30 17:17:26 +01:00
Andy Wilkinson
70bcade232
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31211
2022-05-30 17:16:53 +01:00
Andy Wilkinson
419ac26e0d
Use conventions for source and encoding of aggregatedJavadoc
...
Closes gh-31210
2022-05-30 17:15:45 +01:00
Stephane Nicoll
b2e63db57f
Merge branch '2.7.x'
...
Closes gh-31209
2022-05-30 15:14:23 +02:00
Stephane Nicoll
dd437c4cf4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31208
2022-05-30 15:14:08 +02:00
Stephane Nicoll
51893c4bba
Merge pull request #31197 from 1993heqiang
...
* pr/31197:
Upgrade copyright year of changed files
Polish "Remove boxing"
Closes gh-31197
2022-05-30 15:14:00 +02:00
Stephane Nicoll
ad1214c972
Upgrade copyright year of changed files
...
See gh-31197
2022-05-30 15:13:12 +02:00
heqiang
3a0ab01066
Polish "Remove boxing"
...
See gh-31197
2022-05-30 15:02:58 +02:00
Stephane Nicoll
a27427b977
Merge branch '2.7.x'
...
Closes gh-31207
2022-05-30 14:57:57 +02:00
Stephane Nicoll
95dad34482
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31206
2022-05-30 14:57:45 +02:00
Stephane Nicoll
35fb4f4bd3
Merge pull request #31203 from matei-cernaianu
...
* pr/31203:
Fix "spring.factories" typos in database initialization documentation
Closes gh-31203
2022-05-30 14:57:35 +02:00
Matei Cernăianu
eb8b9e17c5
Fix "spring.factories" typos in database initialization documentation
...
See gh-31203
2022-05-30 14:55:15 +02:00
Andy Wilkinson
d354c03e63
Merge branch '2.7.x'
...
Closes gh-31191
2022-05-27 15:58:57 +01:00
Andy Wilkinson
682ac53f32
Ensure that config processor runs with only AutoConfiguration
...
Fixes gh-31186
2022-05-27 15:58:00 +01:00
Andy Wilkinson
f433d250e1
Merge branch '2.7.x'
...
Closes gh-31189
2022-05-27 11:14:40 +01:00
Andy Wilkinson
d2397bd34e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31188
2022-05-27 11:14:29 +01:00
Andy Wilkinson
83e8c039b3
Add application/wasm to MIME mappings
...
Closes gh-30885
2022-05-27 11:14:04 +01:00
Andy Wilkinson
a659e89dd4
Merge branch '2.7.x'
...
Closes gh-31187
2022-05-27 10:50:48 +01:00
Andy Wilkinson
f160185be3
Merge pull request #31145 from youribonnaffe
...
* gh-31145:
Remove mimepull dependency
Closes gh-31145
2022-05-27 10:49:36 +01:00
Youri Bonnaffe
d38bc13fd5
Remove mimepull dependency
...
Mimepull dependency was introduced in 1c18fd8 for gh-14924 to force the
version as the one coming from saaj-impl was not on Maven Central.
This is no longer the case.
Version 1.10.0 of Mimepull has been built with Java 11, breaking
compatibility with Java 8 for Spring Boot.
See gh-31145
2022-05-27 10:33:27 +01:00
Andy Wilkinson
9c5a682725
Merge pull request #31151 from izeye
...
* gh-31151:
Polish "Auto-configure JvmCompilationMetrics"
Auto-configure JvmCompilationMetrics
Closes gh-31151
2022-05-27 10:23:40 +01:00
Andy Wilkinson
90752e559a
Polish "Auto-configure JvmCompilationMetrics"
...
See gh-31151
2022-05-27 10:18:31 +01:00
izeye
f720b65dfc
Auto-configure JvmCompilationMetrics
...
See gh-31151
2022-05-27 10:18:13 +01:00
Andy Wilkinson
37b677824a
Merge pull request #31156 from wimdeblauwe
...
* gh-31156:
Add link to Error Handling Spring Boot Starter
Closes gh-31156
2022-05-27 10:12:13 +01:00
Wim Deblauwe
1aad7bea8e
Add link to Error Handling Spring Boot Starter
...
See gh-31156
2022-05-27 10:11:19 +01:00
Andy Wilkinson
df99ad17bd
Merge branch '2.7.x'
...
Closes gh-31184
2022-05-27 10:09:28 +01:00
Andy Wilkinson
194e9f0f79
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31183
2022-05-27 10:02:08 +01:00
Andy Wilkinson
88974b5488
Merge pull request #30878 from terminux
...
* gh-30878:
Polish "Assert that sources does not contain null elements"
Assert that sources does not contain null elements
Closes gh-30878
2022-05-27 10:01:17 +01:00
Andy Wilkinson
56c3a5f0ab
Polish "Assert that sources does not contain null elements"
...
See gh-30878
2022-05-27 10:01:06 +01:00
Guirong Hu
ebf276c005
Assert that sources does not contain null elements
...
See gh-30878
2022-05-27 10:00:32 +01:00
Andy Wilkinson
97197f89f4
Merge pull request #31104 from cansi
...
* gh-31104:
Polish "Add PUT shutdown operation for Prometheus Push Gateway"
Add PUT shutdown operation for Prometheus Push Gateway
Closes gh-31104
2022-05-27 09:12:36 +01:00
Andy Wilkinson
bf56665718
Polish "Add PUT shutdown operation for Prometheus Push Gateway"
...
See gh-31104
2022-05-26 20:04:09 +01:00
Mattia Cansirro Cortorillo
0f99c43198
Add PUT shutdown operation for Prometheus Push Gateway
...
See gh-31104
2022-05-26 19:58:53 +01:00
Andy Wilkinson
36a60d8e2e
Merge branch '2.7.x'
...
Closes gh-31181
2022-05-26 19:49:53 +01:00
Andy Wilkinson
137318a845
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31180
2022-05-26 19:49:35 +01:00
Andy Wilkinson
94c9388861
Merge pull request #31172 from dalbani
...
* gh-31172:
Fix Custom Layers Configuration section title in Maven plugin docs
Closes gh-31172
2022-05-26 19:48:51 +01:00
Damiano Albani
3f91ed037f
Fix Custom Layers Configuration section title in Maven plugin docs
...
See gh-31172
2022-05-26 19:46:11 +01:00
Andy Wilkinson
4bb5ba2bd0
Merge branch '2.7.x'
2022-05-26 18:26:52 +01:00
Andy Wilkinson
935d1264e0
Merge branch '2.6.x' into 2.7.x
2022-05-26 18:13:08 +01:00
Andy Wilkinson
3d203d0215
Polish
2022-05-26 17:30:39 +01:00
Andy Wilkinson
14af1bb2dc
Polish
2022-05-26 16:54:31 +01:00