Commit Graph

35786 Commits

Author SHA1 Message Date
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
Moritz Halbritter
4e09289076 Merge branch '2.5.x' into 2.6.x
# Conflicts:
#	spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/test/java/smoketest/data/mongo/SampleMongoApplicationTests.java
2022-03-23 12:04:30 +01:00
Moritz Halbritter
1d15e8c8e2 Disable SampleMongoApplicationTests on Linux aarch64
See gh-30082
2022-03-23 12:03:35 +01:00
Andy Wilkinson
24aa4070c9 Merge pull request #30349 from hpoettker
* gh-30349:
  Fix links to Spring Security Reference Guide

Closes gh-30349
2022-03-23 09:35:58 +00:00
Henning Poettker
22eb301bcf Fix links to Spring Security Reference Guide
See gh-30349
2022-03-23 09:35:30 +00:00
Stephane Nicoll
5011a12f71 Merge branch '2.5.x' into 2.6.x 2022-03-23 08:06:34 +01:00
Stephane Nicoll
589804000b Upgrade to Spring Integration 5.5.10
Closes gh-30183
2022-03-23 08:06:25 +01:00
Stephane Nicoll
acdfa31f5a Upgrade to Spring Integration 5.5.10
Closes gh-30175
2022-03-23 08:05:45 +01:00
Andy Wilkinson
f063da30d2 Merge branch '2.5.x' into 2.6.x
Closes gh-30376
2022-03-22 20:12:48 +00:00
Andy Wilkinson
a8bddeb9cf Remove redundant setting of refresh policy
Closes gh-30375
2022-03-22 20:12:09 +00:00
Scott Frederick
7a8bde5f7b Enable Paketo system tests for Java versions supported by buildpacks
Closes gh-30373
2022-03-22 13:41:24 -05:00
Andy Wilkinson
f04a85957e Merge branch '2.5.x' into 2.6.x
Closes gh-30359
2022-03-22 10:36:17 +00:00
Andy Wilkinson
5473cd3abc Try to stabilize SampleSessionWebFluxApplicationTests
Closes gh-30353
2022-03-22 10:20:31 +00:00
Andy Wilkinson
f53c5178c3 Upgrade to Spring Kafka 2.8.4
Closes gh-30181
2022-03-21 20:44:19 +00:00