Commit Graph

16870 Commits

Author SHA1 Message Date
Stephane Nicoll 02da20ec98 Start building against Spring LDAP 2.4.1 snapshots
See gh-31373
2022-06-14 07:43:52 +02:00
Stephane Nicoll 37af43cb18 Start building against Micrometer 1.9.1 snapshots
See gh-31372
2022-06-14 07:42:02 +02:00
Stephane Nicoll 0e1417935d Start building against Reactor 2020.0.20 snapshots
See gh-31371
2022-06-14 07:40:51 +02:00
Phillip Webb 0be5078a73 Merge branch '2.6.x' into 2.7.x
Closes gh-31369
2022-06-13 18:20:07 -07:00
Phillip Webb b3a46fc50e Document that placeholders should us the canonical property name form
Closes gh-31309
2022-06-13 18:19:47 -07:00
Phillip Webb 378e56f1d3 Add Order annotation to GraphQL RouterFunction beans
Update GraphQL auto-configuration so that `RouterFunction` beans have
and `@Order` of 0.

Fixes gh-31314
2022-06-13 16:44:20 -07:00
Phillip Webb 7e2b325b36 Include auto-configuration and management import files in parent POM
Update the `maven-shade-plugin` configuration to include transformation
of the new `AutoConfiguration.imports` and
`ManagementContextConfiguration.imports` files.

Fixes gh-31316
2022-06-13 13:40:53 -07:00
Stephane Nicoll 961b979d6e Merge branch '2.6.x' into 2.7.x
Closes gh-31366
2022-06-13 16:04:00 +02:00
Anthony Vanelverdinghe 1fffdbae2a Fix typos in the reference documentation
See gh-31328
2022-06-13 16:02:48 +02:00
Stephane Nicoll 499f54a335 Merge branch '2.6.x' into 2.7.x
Closes gh-31362
2022-06-13 15:51:45 +02:00
Lars Grefer 8c9557f552 Enable Links for the Javadoc of the Gradle Plugins
See gh-31279
2022-06-13 15:51:08 +02:00
Stephane Nicoll 56913a08b8 Merge branch '2.6.x' into 2.7.x
Closes gh-31360
2022-06-13 14:54:00 +02:00
Anthony Vanelverdinghe b1ccb600f3 Remove reference to outdated location
See gh-31276
2022-06-13 14:52:38 +02:00
Stephane Nicoll 06d7e67e79 Merge branch '2.6.x' into 2.7.x
Closes gh-31358
2022-06-13 14:50:35 +02:00
Stern, Ittay (is9613) e05363f9b0 Restore Custom Favicon section in the reference guide
The section about favicon was mistakenly removed in 5fceb9d and this
commit reinstates it.

See gh-31224
2022-06-13 14:50:18 +02:00
Stephane Nicoll 4b0fe63bdf Merge branch '2.6.x' into 2.7.x
Closes gh-31356
2022-06-13 14:45:54 +02:00
Stephane Nicoll d896d995d1 Polish contribution
See gh-31190
2022-06-13 14:39:58 +02:00
tudormarc e313aa5f6c Document that Lombok must be configured before our annotation processor
See gh-31190
2022-06-13 14:33:21 +02:00
Stephane Nicoll 72dd51ae0b Merge branch '2.6.x' into 2.7.x
Closes gh-31354
2022-06-13 14:29:18 +02:00
Henning Poettker 9fdd471adf Use Lambda-based API in Spring Security examples
See gh-31143
2022-06-13 13:15:56 +02:00
Phillip Webb 7bf82b5349 Merge branch '2.6.x' into 2.7.x 2022-06-10 16:13:35 -07:00
Phillip Webb 63fdd729f5 Refine conversion service type check
Update fix to account for primitive types.

See gh-28592
2022-06-10 16:12:38 -07:00
Phillip Webb beb1c15219 Merge branch '2.6.x' into 2.7.x
Closes gh-31341
2022-06-10 14:30:02 -07:00
Phillip Webb 31b0264d94 Ensure conversion service actually converts to the correct type
Update `BindConverter` with a guard to ensure that the resulting object
is the correct type.

Fixes gh-28592
2022-06-10 14:29:25 -07:00
Anthony Vanelverdinghe ed1e7382ab Fix typo in ImportCandidates javadoc
See gh-31277
2022-06-10 12:42:43 -07:00
Phillip Webb 0f7fa84214 Polish 'Update Dynatrace documentation for Micrometer 1.9.0'
See gh-31132
2022-06-10 12:36:45 -07:00
Georg Pirklbauer 6df9f50642 Update Dynatrace documentation for Micrometer 1.9.0
Update the actuator documentation for Dynatrace to reflect the
updates and improvements that were made in Micrometer 1.9.0.

See gh-31132
2022-06-10 12:34:05 -07:00
Andy Wilkinson 7f584a95a6 Merge branch '2.6.x' into 2.7.x
Closes gh-31329
2022-06-10 11:35:54 +01:00
Andy Wilkinson e02803d341 Configure max HTTP header size when using HTTP2 with Tomcat
Closes gh-31322
2022-06-10 11:32:57 +01:00
Andy Wilkinson 29cd148e05 Start building against Spring Framework 5.3.1 snapshots
See gh-31319
2022-06-09 20:55:14 +01:00
Andy Wilkinson ed897fc922 Start building against Spring Framework 5.3.21 snapshots
See gh-31318
2022-06-09 19:37:50 +01: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
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 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
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