Commit Graph

35909 Commits (376aa199baee314d33058843e34123c6293747cc)
 

Author SHA1 Message Date
Stephane Nicoll 376aa199ba Upgrade to Spring LDAP 2.3.7
Closes gh-30598
3 years ago
Stephane Nicoll 07fd1af581 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll 140c14cefc Start building against Spring Integration 5.5.11 snapshots
See gh-30702
3 years ago
Stephane Nicoll aed4bc5696 Start building against Spring AMQP 2.4.4 snapshots
See gh-30701
3 years ago
Stephane Nicoll 8e1e909444 Start building against Spring Integration 5.5.11 snapshots
See gh-30700
3 years ago
Stephane Nicoll 5cdcdbdcf1 Start building against Spring AMQP 2.3.16 snapshots
See gh-30699
3 years ago
Stephane Nicoll f6a8c63e31 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll af7c20491b Upgrade to Undertow 2.2.17.Final
Closes gh-30690
3 years ago
Stephane Nicoll 5fa96dee78 Upgrade to Tomcat 9.0.62
Closes gh-30689
3 years ago
Stephane Nicoll 7d8128adc8 Upgrade to RSocket 1.1.2
Closes gh-30688
3 years ago
Stephane Nicoll aa76f451e3 Upgrade to Pooled JMS 1.2.4
Closes gh-30687
3 years ago
Stephane Nicoll 5d430b4267 Upgrade to Netty 4.1.76.Final
Closes gh-30686
3 years ago
Stephane Nicoll 1d6df5181c Upgrade to Kotlin 1.6.20
Closes gh-30685
3 years ago
Stephane Nicoll 9a89e83be4 Upgrade to Jetty 9.4.46.v20220331
Closes gh-30684
3 years ago
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 9299329256 Upgrade to Spring Retry 1.3.3
Closes gh-30590
3 years ago
Stephane Nicoll be2b70452e Upgrade to Undertow 2.2.17.Final
Closes gh-30681
3 years ago
Stephane Nicoll 8199ffd4ed Upgrade to Tomcat 9.0.62
Closes gh-30680
3 years ago
Stephane Nicoll ded1810bd1 Upgrade to RSocket 1.1.2
Closes gh-30679
3 years ago
Stephane Nicoll a913e4fdd5 Upgrade to Pooled JMS 1.2.4
Closes gh-30678
3 years ago
Stephane Nicoll 0389bc84db Upgrade to Netty 4.1.76.Final
Closes gh-30677
3 years ago
Stephane Nicoll a245028b05 Upgrade to Jetty 9.4.46.v20220331
Closes gh-30676
3 years ago
Stephane Nicoll c6473bb5b5 Upgrade to AppEngine SDK 1.9.96
Closes gh-30675
3 years ago
Stephane Nicoll 513aa2cba9 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll 2fd04d9711 Upgrade to Micrometer 1.8.5
Closes gh-30597
3 years ago
Stephane Nicoll 5661c18d26 Upgrade to Micrometer 1.7.11
Closes gh-30588
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 e2dd454233 Merge branch '2.5.x' into 2.6.x 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 d489bf00be Merge branch '2.5.x' into 2.6.x 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