Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,917 Commits 23 Branches 0 Tags
18c4419c61efb59b089ee2fe23e7bee0e35902f0
Commit Graph

35917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
18c4419c61 Merge branch '2.5.x' into 2.6.x 2022-04-19 08:15:39 +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
07fd1af581 Merge branch '2.5.x' into 2.6.x 2022-04-16 09:04:36 +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
f6a8c63e31 Merge branch '2.5.x' into 2.6.x 2022-04-15 09:10:50 +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
5fa96dee78 Upgrade to Tomcat 9.0.62 
Closes gh-30689
 2022-04-15 08:29:08 +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
1d6df5181c Upgrade to Kotlin 1.6.20 
Closes gh-30685
 2022-04-15 08:28:59 +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
8199ffd4ed Upgrade to Tomcat 9.0.62 
Closes gh-30680
 2022-04-15 07:49:51 +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
513aa2cba9 Merge branch '2.5.x' into 2.6.x 2022-04-15 07:46:30 +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
e2dd454233 Merge branch '2.5.x' into 2.6.x 2022-04-13 13:19:36 +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
d489bf00be Merge branch '2.5.x' into 2.6.x 2022-04-13 09:17:18 +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