Commit Graph

15881 Commits (aa629c85104a8475e3a520db2848937508eb0451)

Author SHA1 Message Date
Stephane Nicoll aa629c8510 Upgrade to Hibernate 5.6.8.Final
Closes gh-30683
3 years ago
Stephane Nicoll be5c168e8c Upgrade to AppEngine SDK 1.9.96
Closes gh-30682
3 years ago
Stephane Nicoll 1be434e0a3 Upgrade to Spring Retry 1.3.3
Closes gh-30599
3 years ago
Stephane Nicoll 2fd04d9711 Upgrade to Micrometer 1.8.5
Closes gh-30597
3 years ago
Andy Wilkinson 1720290234 Merge branch '2.5.x' into 2.6.x
Closes gh-30670
3 years ago
Andy Wilkinson f7d181e65b Handle null additional properties more gracefully
Closes gh-30654
3 years ago
Andy Wilkinson d4348279a7 Merge branch '2.5.x' into 2.6.x
Closes gh-30666
3 years ago
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
3 years ago
Andy Wilkinson 887fa4a13f Merge branch '2.5.x' into 2.6.x
Closes gh-30664
3 years ago
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
3 years ago
Moritz Halbritter 9e98ccd8ab Merge branch '2.5.x' into 2.6.x
Closes gh-30651
3 years ago
Moritz Halbritter dfc0f21932 Fix language in WavefrontProperties
Closes gh-30649
3 years ago
Stephane Nicoll 138192230c Upgrade to Spring Framework 5.3.19
Closes gh-30517
3 years ago
Stephane Nicoll 08954fce85 Upgrade to Spring Framework 5.3.19
Closes gh-30516
3 years ago
Stephane Nicoll 368ba019de Upgrade to Reactor 2020.0.18
Closes gh-30596
3 years ago
Stephane Nicoll a1fe2b8857 Upgrade to Reactor 2020.0.18
Closes gh-30587
3 years ago
Stephane Nicoll 2a36d3dd14 Start building against Spring Session 2021.1.3 snapshots
See gh-30603
3 years ago
Stephane Nicoll c080a29feb Start building against Spring Security 5.6.3 snapshots
See gh-30601
3 years ago
Stephane Nicoll e42eeca549 Start building against Spring Kafka 2.8.5 snapshots
See gh-30600
3 years ago
Stephane Nicoll 65e2c20ca8 Start building against Spring Data 2021.1.4 snapshots
See gh-30602
3 years ago
Stephane Nicoll 33994a9f54 Start building against Spring Retry 1.3.3 snapshots
See gh-30599
3 years ago
Stephane Nicoll 9eb6f714b5 Start building against Spring LDAP 2.3.7 snapshots
See gh-30598
3 years ago
Stephane Nicoll ccdd49040f Start building against Micrometer 1.8.5 snapshots
See gh-30597
3 years ago
Stephane Nicoll e735bb2fcd Start building against Spring Framework 5.3.19 snapshots
See gh-30517
3 years ago
Stephane Nicoll 13cd3d2ce0 Start building against Reactor 2020.0.18 snapshots
See gh-30596
3 years ago
Andy Wilkinson 7e44745816 Merge branch '2.5.x' into 2.6.x
Closes gh-30620
3 years ago
Andy Wilkinson b88f062f04 Polish "Remove assumptions about ordering when comparing JSON in tests"
See gh-30514
3 years ago
Vivek Gupta 5b3bc1a936 Remove assumptions about ordering when comparing JSON in tests
See gh-30514
3 years ago
Andy Wilkinson d6731805b6 Merge branch '2.5.x' into 2.6.x
Closes gh-30616
3 years ago
Andy Wilkinson 70fa7e5e93 Make properties field final
Closes gh-30615
3 years ago
Stephane Nicoll 6aa8436c6d Start building against Spring Session 2021.0.6 snapshots
See gh-30595
3 years ago
Stephane Nicoll 455c37645d Start building against Spring Security 5.5.6 snapshots
See gh-30593
3 years ago
Stephane Nicoll bb8be2425a Start building against Spring Kafka 2.7.13 snapshots
See gh-30592
3 years ago
Stephane Nicoll aab8fc80ec Start building against Spring Data 2021.0.11 snapshots
See gh-30594
3 years ago
Stephane Nicoll 0080e45172 Start building against Spring Retry 1.3.3 snapshots
See gh-30590
3 years ago
Stephane Nicoll 5b05304c2c Start building against Spring LDAP 2.3.7 snapshots
See gh-30589
3 years ago
Stephane Nicoll ea6e87adef Start building against Micrometer 1.7.11 snapshots
See gh-30588
3 years ago
Stephane Nicoll e70451635c Start building against Spring Framework 5.3.19 snapshots
See gh-30516
3 years ago
Stephane Nicoll 9dda20cfab Start building against Reactor 2020.0.18 snapshots
See gh-30587
3 years ago
Andy Wilkinson f027faafa2 Merge branch '2.5.x' into 2.6.x
Closes gh-30583
3 years ago
izeye 618d113fad Move Jetty 9 specific exclusions to correct dependency
See gh-30522
3 years ago
Andy Wilkinson a2c08f9f99 Merge branch '2.5.x' into 2.6.x
Closes gh-30581
3 years ago
Andy Wilkinson 35154a96f3 Polish "Fix NPE in configprops endpoint"
See gh-30068
3 years ago
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
3 years ago
luozhenyu 09daad0a16 Add metadata for management.endpoint.health.probes.add-additional-paths
See gh-30562
3 years ago
Moritz Halbritter c54b825a82 Merge branch '2.5.x' into 2.6.x
Closes gh-30553
3 years ago
dugenkui03 035a16278e Make ApplicationAvailabilityBean threadsafe
See gh-30489
3 years ago
Moritz Halbritter 99a1b98e03 Merge branch '2.5.x' into 2.6.x
Closes gh-30551
3 years ago
Moritz Halbritter 41ab46d0c7 Fix wrong replacement hint for 'spring.data.neo4j.username'
Closes gh-30550
3 years ago
Andy Wilkinson 05d4093381 Merge branch '2.5.x' into 2.6.x
Closes gh-30544
3 years ago