Commit Graph

38441 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 6dea2f0e8d Merge branch '2.7.x'
Closes gh-31370
2022-06-13 18:20:32 -07: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 e15ca24977 Merge branch '2.7.x' 2022-06-13 17:03:30 -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 e125b0c22d Merge branch '2.7.x'
Closes gh-31368
2022-06-13 13:41:03 -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 cc4965ee8a Merge branch '2.7.x'
Closes gh-31367
2022-06-13 16:04:07 +02:00
Stephane Nicoll 961b979d6e Merge branch '2.6.x' into 2.7.x
Closes gh-31366
2022-06-13 16:04:00 +02:00
Stephane Nicoll 5ef5497680 Merge pull request #31328 from anthonyvdotbe
* pr/31328:
  Fix typos in the reference documentation

Closes gh-31328
2022-06-13 16:03:52 +02:00
Anthony Vanelverdinghe 1fffdbae2a Fix typos in the reference documentation
See gh-31328
2022-06-13 16:02:48 +02:00
Stephane Nicoll f79c40829d Merge branch '2.7.x'
Closes gh-31365
2022-06-13 16:01:01 +02:00
Stephane Nicoll d427bfc066 Merge branch '2.6.x' into 2.7.x
Closes gh-31364
2022-06-13 16:00:52 +02:00
Stephane Nicoll fb37ce7b2f Merge pull request #31344 from naveensrinivasan
* pr/31344:
  Restrict permissions for GitHub action

Closes gh-31344
2022-06-13 16:00:47 +02:00
naveen c052a4d6a6 Restrict permissions for GitHub action
See gh-31344
2022-06-13 15:59:27 +02:00
Stephane Nicoll 99f71941cd Merge branch '2.7.x'
Closes gh-31363
2022-06-13 15:55:21 +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
Stephane Nicoll 1dea328c04 Merge pull request #31279 from larsgrefer
* pr/31279:
  Enable Links for the Javadoc of the Gradle Plugins

Closes gh-31279
2022-06-13 15:51:33 +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 59f6661166 Merge branch '2.7.x'
Closes gh-31361
2022-06-13 14:54:09 +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
Stephane Nicoll 186536e964 Merge pull request #31276 from anthonyvdotbe
* pr/31276:
  Remove reference to outdated location

Closes gh-31276
2022-06-13 14:53:53 +02:00
Anthony Vanelverdinghe b1ccb600f3 Remove reference to outdated location
See gh-31276
2022-06-13 14:52:38 +02:00
Stephane Nicoll 41d327df51 Merge branch '2.7.x'
Closes gh-31359
2022-06-13 14:50:41 +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
Stephane Nicoll 3f1af9bd38 Merge pull request #31224 from ittays
* pr/31224:
  Restore Custom Favicon section in the reference guide

Closes gh-31224
2022-06-13 14:50:29 +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 ed7ff31d01 Merge branch '2.7.x'
Closes gh-31357
2022-06-13 14:46:04 +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 09978b3593 Merge pull request #31190 from tudormarc
* pr/31190:
  Polish contribution
  Document that Lombok must be configured before our annotation processor

Closes gh-31190
2022-06-13 14:45:36 +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 365d96daf6 Merge branch '2.7.x'
Closes gh-31355
2022-06-13 14:29:40 +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
Stephane Nicoll d7fa384c5f Merge pull request #31143 from hpoettker
* pr/31143:
  Use Lambda-based API in Spring Security examples

Closes gh-31143
2022-06-13 13:54:09 +02:00
Moritz Halbritter 42e8f65b80 Move @ConditionalOnClass from methods to inner classes
Closes gh-31353
2022-06-13 13:41:58 +02:00
Henning Poettker 9fdd471adf Use Lambda-based API in Spring Security examples
See gh-31143
2022-06-13 13:15:56 +02:00
Stephane Nicoll 2ae398ae84 Merge branch '2.7.x' 2022-06-13 12:44:23 +02:00
Stephane Nicoll 53689a295d Merge branch '2.6.x' into 2.7.x 2022-06-13 12:44:13 +02:00
Stephane Nicoll d3b4cbada8 Set LATEST_GA to false in CI pipeline
Closes gh-31120
2022-06-13 12:43:34 +02:00
Stephane Nicoll b3601643af Add hints for web resource default locations
Closes gh-31278
2022-06-13 11:09:48 +02:00
Stephane Nicoll 063e56dbff Polish 2022-06-13 09:44:02 +02:00
Phillip Webb 380776a9b2 Merge branch '2.7.x' 2022-06-10 16:13:50 -07: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 8937924508 Merge branch '2.7.x'
Closes gh-31342
2022-06-10 14:30:28 -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