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
2fd04d9711
Upgrade to Micrometer 1.8.5
...
Closes gh-30597
2022-04-15 07:46:20 +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
Moritz Halbritter
41ab46d0c7
Fix wrong replacement hint for 'spring.data.neo4j.username'
...
Closes gh-30550
2022-04-06 08:56:23 +02:00
Andy Wilkinson
05d4093381
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30544
2022-04-05 15:11:01 +01:00
Andy Wilkinson
83cfc951f8
Polish "Refer to list of internal proxies in reference documentation"
...
See gh-30461
2022-04-05 14:37:08 +01:00
