Commit Graph

37436 Commits

Author SHA1 Message Date
Stephane Nicoll d39f4efb05 Upgrade Java 18 version in CI image
Closes gh-31292
2022-06-09 08:01:32 +02:00
Stephane Nicoll a932555539 Upgrade Java 17 version in CI image
Closes gh-31284
2022-06-09 08:00:55 +02:00
Stephane Nicoll 1c85e1083a Upgrade Java 11 version in CI image
Closes gh-31285
2022-06-09 08:00:26 +02:00
Stephane Nicoll 87840c755b Upgrade Java 8 version in CI image
Closes gh-31286
2022-06-09 07:59:58 +02:00
Stephane Nicoll 1a8c1217ed Upgrade Ubuntu version in CI images
Closes gh-31288
2022-06-09 07:59:27 +02:00
Stephane Nicoll b028263663 Upgrade CI to Docker 20.10.17
Closes gh-31297
2022-06-09 07:58:28 +02:00
Stephane Nicoll f96f21c8a2 Upgrade Java 18 version in CI image
Closes gh-31294
2022-06-09 07:58:28 +02:00
Stephane Nicoll c07623e040 Upgrade Java 17 version in CI image
Closes gh-31290
2022-06-09 07:58:28 +02:00
Stephane Nicoll 4822c9b809 Upgrade Java 11 version in CI image
Closes gh-31293
2022-06-09 07:58:27 +02:00
Stephane Nicoll 976f1ac355 Upgrade Java 8 version in CI image
Closes gh-31291
2022-06-09 07:58:27 +02:00
Stephane Nicoll ea85dccd61 Upgrade Ubuntu version in CI images
Closes gh-31287
2022-06-09 07:58:27 +02:00
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