Commit Graph

37430 Commits

Author SHA1 Message Date
Stephane Nicoll
3eda42b6e8 Merge branch '2.7.x' 2022-04-16 09:06:47 +02:00
Stephane Nicoll
7abc72119b Merge branch '2.6.x' into 2.7.x 2022-04-16 09:06:38 +02:00
Stephane Nicoll
7a6bb7208d Start building against Spring Integration 5.5.11 snapshots
See gh-30704
2022-04-16 09:06:23 +02:00
Stephane Nicoll
f340a90ade Start building against Spring AMQP 2.4.4 snapshots
See gh-30703
2022-04-16 09:05:45 +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
Brian Clozel
21eab010de Disable Redis Session smoke test
This commit temporarily disables the Redis Session smoke test, as it
relies on the Session Actuator endpoint being present.

Since spring-projects/spring-session#1711, the default session
repository contributed is not of type `FindByIndexNameSessionRepository`
and thus cannot support the Session endpoint use case.

Until gh-30673 is resolved, this test is disabled.

See gh-30673
2022-04-15 16:44:23 +02:00
Stephane Nicoll
048ca9fc3c Merge pull request #30693 from marcingrzejszczak
* pr/30693:
  Polish "Start building against Micrometer 1.10.0 snapshots"
  Start building against Micrometer 1.10.0 snapshots

Closes gh-30693
2022-04-15 15:59:53 +02:00
Stephane Nicoll
8c68b33240 Polish "Start building against Micrometer 1.10.0 snapshots"
See gh-30693
2022-04-15 15:59:24 +02:00
Marcin Grzejszczak
87991d93a5 Start building against Micrometer 1.10.0 snapshots
See gh-30693
2022-04-15 14:16:16 +02:00
Stephane Nicoll
aecb035e99 Merge branch '2.7.x' 2022-04-15 09:11:10 +02:00
Stephane Nicoll
8969f7f8f1 Merge branch '2.6.x' into 2.7.x 2022-04-15 09:11:02 +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
4d7cbce40e Merge branch '2.7.x' 2022-04-15 07:46:48 +02:00
Stephane Nicoll
07669aa514 Merge branch '2.6.x' into 2.7.x 2022-04-15 07:46:41 +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
4a401bfa16 Adapt to breaking changes in Spring Session Data Redis
See gh-30639
2022-04-14 20:41:20 +01:00
Brian Clozel
3dc8848d3a Merge branch '2.7.x' 2022-04-14 19:56:26 +02:00
Brian Clozel
eddb2b16ff Configure RSocket server support in GraphQL
This commit adds the RSocket server auto-configuration for GraphQL.

See gh-30453
2022-04-14 19:54:40 +02:00
Andy Wilkinson
7e97073994 Merge branch '2.7.x' 2022-04-14 18:38:26 +01:00
Andy Wilkinson
74494f1d37 Merge branch '2.6.x' into 2.7.x
Closes gh-30671
2022-04-14 18:38:09 +01: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
9658661bd4 Merge branch '2.7.x' 2022-04-14 14:53:40 +01:00
Andy Wilkinson
7789a18d23 Merge branch '2.6.x' into 2.7.x
Closes gh-30667
2022-04-14 14:51:22 +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