Commit Graph

35799 Commits

Author SHA1 Message Date
Andy Wilkinson
2da44a0b4f Upgrade to Jackson Bom 2.13.2.20220328
Closes gh-30478
2022-03-30 14:29:38 +01:00
Andy Wilkinson
1d53e711fe Merge branch '2.5.x' into 2.6.x 2022-03-30 14:24:28 +01:00
Andy Wilkinson
06c5e26f81 Upgrade to Jackson Bom 2.12.6.20220326
Closes gh-30477
2022-03-30 13:30:42 +01:00
Andy Wilkinson
64beaba99f Merge branch '2.5.x' into 2.6.x
Closes gh-30475
2022-03-30 10:56:56 +01:00
Andy Wilkinson
c0c32d89a7 Merge pull request #30456 from candrews
* gh-30456:
  Polish "Make MustacheViewResolver bean back off without Spring MVC"
  Make MustacheViewResolver bean back off without Spring MVC

Closes gh-30456
2022-03-30 10:56:47 +01:00
Andy Wilkinson
8cb11b74cd Polish "Make MustacheViewResolver bean back off without Spring MVC"
See gh-30456
2022-03-30 10:33:35 +01:00
Craig Andrews
7101b5099f Make MustacheViewResolver bean back off without Spring MVC
See gh-30456
2022-03-30 10:31:44 +01:00
Andy Wilkinson
880d33f391 Merge branch '2.5.x' into 2.6.x
Closes gh-30469
2022-03-29 15:06:47 +01:00
Andy Wilkinson
05b7befc7a Fix javadoc of ResolveMainClassName setClasspath(Object)
Closes gh-30468
2022-03-29 15:05:54 +01:00
Andy Wilkinson
8f985474a6 Merge branch '2.5.x' into 2.6.x
Closes gh-30465
2022-03-29 14:24:25 +01:00
Andy Wilkinson
d574563616 Document @ConstructorBinding and @DefaultValue with records
Closes gh-30460
2022-03-29 14:14:28 +01:00
Stephane Nicoll
e28b59693a Merge pull request #30446 from vikeychen
* pr/30446:
  Update copyright year of changed file
  Remove redundant Javadoc

Closes gh-30446
2022-03-28 09:46:34 +02:00
Stephane Nicoll
5dc4ff5366 Update copyright year of changed file
See gh-30446
2022-03-28 09:46:21 +02:00
Vikey Chen
f9d1c400a7 Remove redundant Javadoc
See gh-30446
2022-03-28 09:45:33 +02:00
Moritz Halbritter
cee51783fd Merge branch '2.5.x' into 2.6.x
Closes gh-30440
2022-03-25 16:28:07 +01:00
Moritz Halbritter
24e748d5cd Remove unnecessary entries in additional config metadata
Add the 'enabled' fields directly to the classes instead.

Closes gh-30439
2022-03-25 16:22:47 +01:00
Moritz Halbritter
c003d5b533 Merge branch '2.5.x' into 2.6.x
Closes gh-30436
2022-03-25 14:55:31 +01:00
Moritz Halbritter
0ff8119a1b Sort entries in additional-spring-configuration metadata alphabetically
Closes gh-30434
2022-03-25 14:54:39 +01:00
Andy Wilkinson
35d8f1dcdd Merge branch '2.5.x' into 2.6.x
Closes gh-30431
2022-03-25 11:44:24 +00:00
Andy Wilkinson
25e1e8629a Merge pull request #30406 from quaff
* gh-30406:
  Polish "Prevent imports of null-safety annotations"
  Prevent imports of null-safety annotations

Closes gh-30406
2022-03-25 11:44:15 +00:00
Andy Wilkinson
c087d609a0 Polish "Prevent imports of null-safety annotations"
See gh-30406
2022-03-25 11:43:57 +00:00
Yanming Zhou
0e99c57f8e Prevent imports of null-safety annotations
See gh-30406
2022-03-25 11:22:36 +00:00
Andy Wilkinson
344aa405ae Merge branch '2.5.x' into 2.6.x
Closes gh-30429
2022-03-25 11:14:46 +00:00
Andy Wilkinson
6e16552e84 Merge pull request #30422 from eddumelendez
* gh-30422:
  Polish "Enable Java 18 for LoaderIntegrationTests"
  Enable Java 18 for LoaderIntegrationTests

Closes gh-30422
2022-03-25 11:03:09 +00:00
Andy Wilkinson
e36ac6c155 Polish "Enable Java 18 for LoaderIntegrationTests"
See gh-30422
2022-03-25 11:02:57 +00:00
Eddú Meléndez
e9c433a0b7 Enable Java 18 for LoaderIntegrationTests
See gh-30422
2022-03-25 11:02:42 +00:00
Andy Wilkinson
d1ec50b915 Merge branch '2.5.x' into 2.6.x
Closes gh-30427
2022-03-25 10:51:41 +00:00
Andy Wilkinson
f33b489f47 Merge pull request #30415 from eddumelendez
* gh-30415:
  Switch to GA releases for Java 18 update checks

Closes gh-30415
2022-03-25 10:48:27 +00:00
Eddú Meléndez
713edf3625 Switch to GA releases for Java 18 update checks
See gh-30415
2022-03-25 10:47:45 +00:00
Phillip Webb
acb63e7126 Merge branch '2.5.x' into 2.6.x 2022-03-24 11:01:05 -07:00
Spring Builds
7072e9e75b Next development version (v2.6.6-SNAPSHOT) 2022-03-24 14:23:11 +00:00
Spring Builds
fe27ce8c91 Next development version (v2.5.12-SNAPSHOT) 2022-03-24 12:45:53 +00:00
Andy Wilkinson
12d9c7b1c8 Merge branch '2.5.x' into 2.6.x
Closes gh-30409
2022-03-24 10:59:50 +00:00
Andy Wilkinson
64138a138f Upgrade registry-image-resource in CI pipelines to 1.5.0
Closes gh-30408
2022-03-24 10:59:25 +00:00
Stephane Nicoll
330afb0e5b Merge branch '2.5.x' into 2.6.x 2022-03-24 08:47:27 +01:00
Stephane Nicoll
2b7712a2f1 Upgrade Java 18 version in CI image
Closes gh-30398
2022-03-24 08:46:52 +01:00
Stephane Nicoll
02e16675f3 Upgrade Ubuntu version in CI images
Closes gh-30397
2022-03-24 08:45:22 +01:00
Stephane Nicoll
5deb8d7edc Upgrade Java 18 version in CI image
Closes gh-30401
2022-03-24 08:44:19 +01:00
Stephane Nicoll
f8f7a24dde Upgrade Ubuntu version in CI images
Closes gh-30400
2022-03-24 08:43:42 +01:00
Andy Wilkinson
2317f69f4c Add Apache Kafka to Messaging section's description
Closes gh-30389
2022-03-23 15:29:56 +00:00
Andy Wilkinson
9c128f1acc Merge branch '2.5.x' into 2.6.x
Closes gh-30392
2022-03-23 15:28:56 +00:00
Andy Wilkinson
73d9e0e0ed Fix equals when adapt removes trailing characters from element
Closes gh-30317
2022-03-23 14:55:00 +00:00
Moritz Halbritter
27ddcbd551 Merge branch '2.5.x' into 2.6.x 2022-03-23 13:46:33 +01:00
Moritz Halbritter
cd5d3dbf8d Disable SampleSessionWebFluxApplicationTests on Linux aarch64
These tests use embedded mongo under the hood.

See gh-30082
2022-03-23 13:45:25 +01:00
Andy Wilkinson
c739831087 Merge branch '2.5.x' into 2.6.x
Closes gh-30387
2022-03-23 12:11:02 +00:00
Andy Wilkinson
d8cf332c2e Document default value of spring.thymeleaf.reactive.media-types
Closes gh-30280
2022-03-23 12:09:48 +00:00
Andy Wilkinson
f378627f94 Merge branch '2.5.x' into 2.6.x
Closes gh-30385
2022-03-23 11:45:31 +00:00
Andy Wilkinson
8d882fa09b Fix possible duplicate templateEngine bean in Thymeleaf auto-config
Closes gh-30384
2022-03-23 11:44:59 +00:00
Andy Wilkinson
1244c429a6 Merge branch '2.5.x' into 2.6.x
Closes gh-30382
2022-03-23 11:17:36 +00:00
Andy Wilkinson
e927cd71dd Clarify type matching performed by MockBean and SpyBean
Closes gh-28656
2022-03-23 11:17:07 +00:00