Commit Graph

37166 Commits

Author SHA1 Message Date
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
Andy Wilkinson
16f49745ef Merge branch '2.6.x' into 2.7.x
Closes gh-31147
2022-05-23 11:15:06 +01:00
Andy Wilkinson
6183532cc1 Merge pull request #31139 from eddumelendez
* gh-31139:
  Use Bellsoft JDK in CI

Closes gh-31139
2022-05-23 11:14:51 +01:00
Eddú Meléndez
5fb96076bd Use Bellsoft JDK in CI
See gh-31139
2022-05-23 11:12:22 +01:00
Phillip Webb
06679a4c46 Merge branch '2.6.x' into 2.7.x
Closes gh-31128
2022-05-19 18:07:17 -07:00
Phillip Webb
9fa33e5645 Merge branch '2.5.x' into 2.6.x
Closes gh-31127
2022-05-19 18:04:54 -07:00
Phillip Webb
f185b0767a Merge pull request #31126 from abel533
* pr/31126:
  Polish "Resolve errors in layers.xsd"
  Resolve errors in layers.xsd

Closes gh-31126
2022-05-19 18:03:20 -07:00
Phillip Webb
05a6447a8d Polish "Resolve errors in layers.xsd"
Validate loaded `layer.xml` files against the XSD and additionally
update `<layers>` sub elements to have a 'minOccurs' of 0.

See gh-31126
2022-05-19 18:01:55 -07:00
Liuzh
0d78323b60 Resolve errors in layers.xsd
Update `layer-*.xsd` files with following fixes:

- Rename <includeProjectDependencies> to <includeModuleDependencies>
- Rename <excludeProjectDependencies> to <excludeModuleDependencies>

See gh-31126
2022-05-19 18:00:25 -07:00
Spring Builds
1006b386e4 Next development version (v2.7.1-SNAPSHOT) 2022-05-19 12:42:28 +00:00