Andy Wilkinson
12eb7a8795
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31282
2022-06-08 19:24:07 +01:00
Andy Wilkinson
a651061e2c
Remove SpringApplicationHierarchyTests
...
Closes gh-31281
2022-06-08 19:23:26 +01:00
Andy Wilkinson
a0fee42740
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31270
2022-06-08 12:09:14 +01:00
Andy Wilkinson
4c23d2c45b
Merge pull request #31267 from vpavic
...
* gh-31267:
Polish "Update smoke tests to avoid conflicts with NAME environment variable"
Update smoke tests to avoid conflicts with NAME environment variable
Closes gh-31267
2022-06-08 12:08:57 +01:00
Andy Wilkinson
0834dc5b01
Polish "Update smoke tests to avoid conflicts with NAME environment variable"
...
See gh-31267
2022-06-08 12:08:40 +01:00
Vedran Pavic
95e0d6c0f7
Update smoke tests to avoid conflicts with NAME environment variable
...
This commit updates several smoke tests in order to avoid conflicts
with NAME environment variable that is present in WSL and causes
project build to fail. Previous attempt to fix this in 7da42d71 was
incomplete.
See gh-31267
2022-06-08 11:34:19 +01:00
Stephane Nicoll
8e550933a8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31261
2022-06-07 09:16:10 +02:00
Stephane Nicoll
bbb5966bca
Upgrade integration tests to Apache Maven 3.8.5
...
Closes gh-31260
2022-06-07 09:15:41 +02:00
Andy Wilkinson
c379456722
Remove dependency management for spring-ldap-ldif-batch
...
The spring-ldap-ldif-batch module was removed in Spring LDAP 2.4.0 in
favor of the equivalent code that already exists in Spring Batch.
This commit aligns Boot's dependency management with this removal.
Closes gh-31254
2022-06-06 17:01:28 +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
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
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
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
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
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
682ac53f32
Ensure that config processor runs with only AutoConfiguration
...
Fixes gh-31186
2022-05-27 15:58:00 +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
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
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
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
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
455ee0ce22
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31177
2022-05-26 15:53:38 +01:00
Andy Wilkinson
ee45fd2fc8
Remove redundant throws declarations from internal APIs
...
Closes gh-31176
2022-05-26 15:47:35 +01:00
Andy Wilkinson
b3a4982f31
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31174
2022-05-26 14:01:23 +01:00
Andy Wilkinson
cbf42dea14
Update deprecation messages to change removal version from 2.8 to 3.0
...
Closes gh-30903
2022-05-26 13:59:03 +01:00
Andy Wilkinson
e617035dba
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31167
2022-05-26 13:45:52 +01:00
Andy Wilkinson
3e7bd582a3
Upgrade to Spring Java Format 0.0.33
...
Closes gh-31166
2022-05-26 13:22:23 +01:00
Andy Wilkinson
d6046f23dc
Merge pull request #31140 from eddumelendez
...
* gh-31140:
Add package-info for o.s.b.a.a.metrics.graphql
Closes gh-31140
2022-05-25 13:33:06 +01:00
Eddú Meléndez
154c84ffe2
Add package-info for o.s.b.a.a.metrics.graphql
...
See gh-31140
2022-05-25 13:30:29 +01:00
Andy Wilkinson
f805f768ca
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31153
2022-05-23 12:55:17 +01:00
Andy Wilkinson
6ea3704baf
Merge pull request #31141 from eddumelendez
...
* gh-31141:
Add .sdkmanrc with latest java version
Closes gh-31141
2022-05-23 12:55:09 +01:00
Eddú Meléndez
07047e7e85
Add .sdkmanrc with latest java version
...
See gh-31141
2022-05-23 12:54:30 +01:00
Andy Wilkinson
24dc525127
Fix conditions on auto-configured WebMvcMetricsFilter
...
Closes gh-31150
2022-05-23 12:50:49 +01:00