Commit Graph

15983 Commits

Author SHA1 Message Date
Andy Wilkinson ce788657ce Improve diagnostics for map binding failures
Closes gh-30281
2022-04-25 13:50:09 +01:00
Andy Wilkinson 5c3be7c61e Merge branch '2.5.x' into 2.6.x
Closes gh-30786
2022-04-25 12:36:14 +01:00
Andy Wilkinson ffe0ec6d4d Use SearchStrategy in MethodValidationExcludeFilter byAnnotation
Closes gh-30631
2022-04-25 12:35:41 +01:00
Moritz Halbritter 63eb6b6ad9 Merge branch '2.5.x' into 2.6.x
Closes gh-30781
2022-04-25 09:13:34 +02:00
Moritz Halbritter 9b8b87009c Document support for Java 18
Closes gh-30548
2022-04-25 09:13:07 +02:00
Phillip Webb c5d650a807 Merge branch '2.5.x' into 2.6.x
Closes gh-30762
2022-04-20 16:29:24 -07:00
Phillip Webb 77edb27a07 Fix package tangle caused by ApplicationContextFactory
Fix package tangle by changing `ApplicationContextFactory.DEFAULT` to
use `spring.factories` to discover implementations rather than needing
direct access to our own `ApplicationContext` classes.

Closes gh-30272
2022-04-20 16:28:46 -07:00
Stephane Nicoll 3731655b34 Upgrade to Spring Session 2021.1.3
Closes gh-30603
2022-04-20 18:35:52 +02:00
Stephane Nicoll 5c4b63be11 Upgrade to Spring Session 2021.0.6
Closes gh-30595
2022-04-20 18:34:05 +02:00
Stephane Nicoll c5953623fa Upgrade to Postgresql 42.3.4
Closes gh-30758
2022-04-20 09:26:42 +02:00
Stephane Nicoll d69ca284b9 Upgrade to Lombok 1.18.24
Closes gh-30757
2022-04-20 09:26:39 +02:00
Stephane Nicoll bda0fbf22f Upgrade to Janino 3.1.7
Closes gh-30755
2022-04-20 09:26:34 +02:00
Stephane Nicoll 1bd1b2a3a4 Upgrade to Lombok 1.18.24
Closes gh-30753
2022-04-20 09:11:34 +02:00
Stephane Nicoll 792ebdbbf8 Upgrade to Janino 3.1.7
Closes gh-30752
2022-04-20 09:11:32 +02:00
Stephane Nicoll d049ae8703 Merge branch '2.5.x' into 2.6.x
Closes gh-30749
2022-04-20 08:24:07 +02:00
rfigueroa ae267bfab2 Use eclipse-temurin in docker samples
As AdoptOpenJDK moved to the Eclipse Foundation, this commit updates the
docs to reflect that in docker file samples.

See gh-30748
2022-04-20 08:21:55 +02:00
Stephane Nicoll 245c6c97ec Upgrade to Spring Integration 5.5.11
Closes gh-30702
2022-04-20 08:09:00 +02:00
Stephane Nicoll 1e32f3b718 Upgrade to Spring Integration 5.5.11
Closes gh-30700
2022-04-20 08:08:19 +02:00
Stephane Nicoll ba38441a0a Upgrade to Spring Data 2021.1.4
Closes gh-30602
2022-04-19 15:36:54 +02:00
Stephane Nicoll 9f7a9546bd Upgrade to Spring Data 2021.0.11
Closes gh-30594
2022-04-19 15:35:29 +02:00
Stephane Nicoll 00b175bb7f Upgrade to Jackson 2.13.2.1
Closes gh-30743
2022-04-19 13:04:03 +02:00
Stephane Nicoll d3a70c3793 Upgrade to Spring HATEOAS 1.4.2
Closes gh-30744
2022-04-19 13:03:38 +02:00
Stephane Nicoll 57b3cb5135 Polish "Fix incorrect link in kafka.adoc"
See gh-30674
2022-04-19 09:52:56 +02:00
Chanhyeong Cho 577f0add0c Fix incorrect link in kafka.adoc
See gh-30674
2022-04-19 09:48:03 +02:00
Stephane Nicoll 91625207b2 Merge branch '2.5.x' into 2.6.x
Closes gh-30738
2022-04-19 09:11:01 +02:00
Stephane Nicoll 1fa4701d6d Polish "Validate overrides against CharsetMapperDefault.properties"
See gh-30692
2022-04-19 09:03:54 +02:00
Guirong Hu 407ae3b04f Validate overrides against CharsetMapperDefault.properties
See gh-30692
2022-04-19 09:03:40 +02:00
Stephane Nicoll 52b54f434b Upgrade to Spring Kafka 2.8.5
Closes gh-30600
2022-04-19 08:09:57 +02:00
Stephane Nicoll 3438934a9e Upgrade to Spring AMQP 2.4.4
Closes gh-30701
2022-04-19 08:07:17 +02:00
Stephane Nicoll 1c6ef781cd Upgrade to Spring Security 5.6.3
Closes gh-30601
2022-04-19 08:06:53 +02:00
Stephane Nicoll 376aa199ba Upgrade to Spring LDAP 2.3.7
Closes gh-30598
2022-04-19 08:03:54 +02:00
Stephane Nicoll 0ad6ae9a03 Upgrade to Spring Kafka 2.7.13
Closes gh-30592
2022-04-19 07:59:57 +02:00
Stephane Nicoll 1c08f503ba Upgrade to Spring AMQP 2.3.16
Closes gh-30699
2022-04-19 07:59:18 +02:00
Stephane Nicoll c25a2eb274 Upgrade to Spring Security 5.5.6
Closes gh-30593
2022-04-19 07:57:19 +02:00
Stephane Nicoll 07ba83be5d Upgrade to Spring LDAP 2.3.7
Closes gh-30589
2022-04-19 07:56:56 +02:00
Stephane Nicoll 140c14cefc Start building against Spring Integration 5.5.11 snapshots
See gh-30702
2022-04-16 08:56:33 +02:00
Stephane Nicoll aed4bc5696 Start building against Spring AMQP 2.4.4 snapshots
See gh-30701
2022-04-16 08:55:39 +02:00
Stephane Nicoll 8e1e909444 Start building against Spring Integration 5.5.11 snapshots
See gh-30700
2022-04-16 08:54:14 +02:00
Stephane Nicoll 5cdcdbdcf1 Start building against Spring AMQP 2.3.16 snapshots
See gh-30699
2022-04-16 08:53:18 +02:00
Stephane Nicoll af7c20491b Upgrade to Undertow 2.2.17.Final
Closes gh-30690
2022-04-15 08:29:10 +02:00
Stephane Nicoll 7d8128adc8 Upgrade to RSocket 1.1.2
Closes gh-30688
2022-04-15 08:29:05 +02:00
Stephane Nicoll aa76f451e3 Upgrade to Pooled JMS 1.2.4
Closes gh-30687
2022-04-15 08:29:03 +02:00
Stephane Nicoll 5d430b4267 Upgrade to Netty 4.1.76.Final
Closes gh-30686
2022-04-15 08:29:01 +02:00
Stephane Nicoll 9a89e83be4 Upgrade to Jetty 9.4.46.v20220331
Closes gh-30684
2022-04-15 08:28:57 +02:00
Stephane Nicoll aa629c8510 Upgrade to Hibernate 5.6.8.Final
Closes gh-30683
2022-04-15 08:28:54 +02:00
Stephane Nicoll be5c168e8c Upgrade to AppEngine SDK 1.9.96
Closes gh-30682
2022-04-15 08:28:52 +02:00
Stephane Nicoll 1be434e0a3 Upgrade to Spring Retry 1.3.3
Closes gh-30599
2022-04-15 08:26:19 +02:00
Stephane Nicoll 9299329256 Upgrade to Spring Retry 1.3.3
Closes gh-30590
2022-04-15 08:25:42 +02:00
Stephane Nicoll be2b70452e Upgrade to Undertow 2.2.17.Final
Closes gh-30681
2022-04-15 07:49:53 +02:00
Stephane Nicoll ded1810bd1 Upgrade to RSocket 1.1.2
Closes gh-30679
2022-04-15 07:49:49 +02:00
Stephane Nicoll a913e4fdd5 Upgrade to Pooled JMS 1.2.4
Closes gh-30678
2022-04-15 07:49:46 +02:00
Stephane Nicoll 0389bc84db Upgrade to Netty 4.1.76.Final
Closes gh-30677
2022-04-15 07:49:44 +02:00
Stephane Nicoll a245028b05 Upgrade to Jetty 9.4.46.v20220331
Closes gh-30676
2022-04-15 07:49:42 +02:00
Stephane Nicoll c6473bb5b5 Upgrade to AppEngine SDK 1.9.96
Closes gh-30675
2022-04-15 07:49:40 +02:00
Stephane Nicoll 2fd04d9711 Upgrade to Micrometer 1.8.5
Closes gh-30597
2022-04-15 07:46:20 +02:00
Stephane Nicoll 5661c18d26 Upgrade to Micrometer 1.7.11
Closes gh-30588
2022-04-15 07:45:32 +02:00
Andy Wilkinson 1720290234 Merge branch '2.5.x' into 2.6.x
Closes gh-30670
2022-04-14 18:37:55 +01:00
Andy Wilkinson f7d181e65b Handle null additional properties more gracefully
Closes gh-30654
2022-04-14 18:36:15 +01:00
Andy Wilkinson d4348279a7 Merge branch '2.5.x' into 2.6.x
Closes gh-30666
2022-04-14 14:51:09 +01:00
Andy Wilkinson 8f1b8622ba Ensure that webEnvironment=NONE creates non-web context
Previously, if spring.main.web-application-type was configured in
application.properties to servlet or reactive, setting
webEnvironment=NONE on @SpringBootTest would not work correctly and
a servlet or reactive web application context would be created
based on the value of spring.main.web-application-type.

This commit updates the test context bootstapper to set
spring.main.web-application-type to none when webEnvironment has been
set to none. This is done in the merged context configuration's
property source properties which are applied to the environment in a
high-precedence test property source that will override configuration
in application.properties.

Closes gh-29695
2022-04-14 14:44:30 +01:00
Andy Wilkinson 887fa4a13f Merge branch '2.5.x' into 2.6.x
Closes gh-30664
2022-04-14 12:40:29 +01:00
Andy Wilkinson c8de843d85 Honor final web application type when creating context in tests
Previously, SpringBootContextLoader would configure its
SpringApplication with an ApplicationContextFactory that ignores
the WebApplicationType with which its called and instead returns a
hard-coded type of context based on the type of the
MergedContextConfiguration. This hard-coding would result in the
wrong type of context being used if a subsequent change was made to
the application's WebApplicationType, for example due to binding of
the spring.main.web-application-type configuration property.

This commit updates SpringBootContextLoader to configure
SpringApplication with an ApplicationContextFactory that takes the
WebApplicationType with which it is called into consideration.

Fixes gh-29170
2022-04-14 12:26:07 +01:00
Moritz Halbritter 9e98ccd8ab Merge branch '2.5.x' into 2.6.x
Closes gh-30651
2022-04-13 14:59:59 +02:00
Moritz Halbritter dfc0f21932 Fix language in WavefrontProperties
Closes gh-30649
2022-04-13 14:59:48 +02:00
Stephane Nicoll 138192230c Upgrade to Spring Framework 5.3.19
Closes gh-30517
2022-04-13 13:19:06 +02:00
Stephane Nicoll 08954fce85 Upgrade to Spring Framework 5.3.19
Closes gh-30516
2022-04-13 13:11:13 +02:00
Stephane Nicoll 368ba019de Upgrade to Reactor 2020.0.18
Closes gh-30596
2022-04-12 16:46:31 +02:00
Stephane Nicoll a1fe2b8857 Upgrade to Reactor 2020.0.18
Closes gh-30587
2022-04-12 16:26:56 +02:00
Stephane Nicoll 2a36d3dd14 Start building against Spring Session 2021.1.3 snapshots
See gh-30603
2022-04-09 10:01:02 +02:00
Stephane Nicoll c080a29feb Start building against Spring Security 5.6.3 snapshots
See gh-30601
2022-04-09 10:01:02 +02:00
Stephane Nicoll e42eeca549 Start building against Spring Kafka 2.8.5 snapshots
See gh-30600
2022-04-09 10:01:01 +02:00
Stephane Nicoll 65e2c20ca8 Start building against Spring Data 2021.1.4 snapshots
See gh-30602
2022-04-09 10:01:01 +02:00
Stephane Nicoll 33994a9f54 Start building against Spring Retry 1.3.3 snapshots
See gh-30599
2022-04-09 10:01:01 +02:00
Stephane Nicoll 9eb6f714b5 Start building against Spring LDAP 2.3.7 snapshots
See gh-30598
2022-04-09 10:01:01 +02:00
Stephane Nicoll ccdd49040f Start building against Micrometer 1.8.5 snapshots
See gh-30597
2022-04-09 10:01:01 +02:00
Stephane Nicoll e735bb2fcd Start building against Spring Framework 5.3.19 snapshots
See gh-30517
2022-04-09 10:01:00 +02:00
Stephane Nicoll 13cd3d2ce0 Start building against Reactor 2020.0.18 snapshots
See gh-30596
2022-04-09 09:35:22 +02:00
Andy Wilkinson 7e44745816 Merge branch '2.5.x' into 2.6.x
Closes gh-30620
2022-04-08 21:01:48 +01:00
Andy Wilkinson b88f062f04 Polish "Remove assumptions about ordering when comparing JSON in tests"
See gh-30514
2022-04-08 20:56:20 +01:00
Vivek Gupta 5b3bc1a936 Remove assumptions about ordering when comparing JSON in tests
See gh-30514
2022-04-08 20:55:54 +01:00
Andy Wilkinson d6731805b6 Merge branch '2.5.x' into 2.6.x
Closes gh-30616
2022-04-08 14:03:58 +01:00
Andy Wilkinson 70fa7e5e93 Make properties field final
Closes gh-30615
2022-04-08 14:03:29 +01:00
Stephane Nicoll 6aa8436c6d Start building against Spring Session 2021.0.6 snapshots
See gh-30595
2022-04-08 10:09:30 +02:00
Stephane Nicoll 455c37645d Start building against Spring Security 5.5.6 snapshots
See gh-30593
2022-04-08 10:09:00 +02:00
Stephane Nicoll bb8be2425a Start building against Spring Kafka 2.7.13 snapshots
See gh-30592
2022-04-08 10:08:35 +02:00
Stephane Nicoll aab8fc80ec Start building against Spring Data 2021.0.11 snapshots
See gh-30594
2022-04-08 10:08:10 +02:00
Stephane Nicoll 0080e45172 Start building against Spring Retry 1.3.3 snapshots
See gh-30590
2022-04-08 10:07:41 +02:00
Stephane Nicoll 5b05304c2c Start building against Spring LDAP 2.3.7 snapshots
See gh-30589
2022-04-08 10:07:13 +02:00
Stephane Nicoll ea6e87adef Start building against Micrometer 1.7.11 snapshots
See gh-30588
2022-04-08 10:06:34 +02:00
Stephane Nicoll e70451635c Start building against Spring Framework 5.3.19 snapshots
See gh-30516
2022-04-08 10:06:02 +02:00
Stephane Nicoll 9dda20cfab Start building against Reactor 2020.0.18 snapshots
See gh-30587
2022-04-08 09:48:36 +02:00
Andy Wilkinson f027faafa2 Merge branch '2.5.x' into 2.6.x
Closes gh-30583
2022-04-07 20:44:10 +01:00
izeye 618d113fad Move Jetty 9 specific exclusions to correct dependency
See gh-30522
2022-04-07 20:41:42 +01:00
Andy Wilkinson a2c08f9f99 Merge branch '2.5.x' into 2.6.x
Closes gh-30581
2022-04-07 20:31:22 +01:00
Andy Wilkinson 35154a96f3 Polish "Fix NPE in configprops endpoint"
See gh-30068
2022-04-07 19:44:06 +01:00
qxo a1fe05f40b Fix NPE in configprops endpoint
This works around spring-projects/spring-framework#28298. The bug
means that when a @Configuration class is annotated with
@ConfigurationProperties any bean defined by a static @Bean method
is considered to be annotated with @ConfigurationProperties.

See gh-30068
2022-04-07 19:40:29 +01:00
luozhenyu 09daad0a16 Add metadata for management.endpoint.health.probes.add-additional-paths
See gh-30562
2022-04-07 09:14:02 +02:00
Moritz Halbritter c54b825a82 Merge branch '2.5.x' into 2.6.x
Closes gh-30553
2022-04-06 10:28:11 +02:00
dugenkui03 035a16278e Make ApplicationAvailabilityBean threadsafe
See gh-30489
2022-04-06 10:26:21 +02:00
Moritz Halbritter 99a1b98e03 Merge branch '2.5.x' into 2.6.x
Closes gh-30551
2022-04-06 08:56:47 +02:00