Damiano Albani
3f91ed037f
Fix Custom Layers Configuration section title in Maven plugin docs
...
See gh-31172
2022-05-26 19:46:11 +01:00
Andy Wilkinson
3d203d0215
Polish
2022-05-26 17:30:39 +01:00
Andy Wilkinson
ee45fd2fc8
Remove redundant throws declarations from internal APIs
...
Closes gh-31176
2022-05-26 15:47:35 +01:00
Andy Wilkinson
cbf42dea14
Update deprecation messages to change removal version from 2.8 to 3.0
...
Closes gh-30903
2022-05-26 13:59:03 +01:00
Andy Wilkinson
3e7bd582a3
Upgrade to Spring Java Format 0.0.33
...
Closes gh-31166
2022-05-26 13:22:23 +01:00
Phillip Webb
9fa33e5645
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31127
2022-05-19 18:04:54 -07:00
Phillip Webb
05a6447a8d
Polish "Resolve errors in layers.xsd"
...
Validate loaded `layer.xml` files against the XSD and additionally
update `<layers>` sub elements to have a 'minOccurs' of 0.
See gh-31126
2022-05-19 18:01:55 -07:00
Liuzh
0d78323b60
Resolve errors in layers.xsd
...
Update `layer-*.xsd` files with following fixes:
- Rename <includeProjectDependencies> to <includeModuleDependencies>
- Rename <excludeProjectDependencies> to <excludeModuleDependencies>
See gh-31126
2022-05-19 18:00:25 -07:00
Andy Wilkinson
a712b1e6b0
Upgrade to Spring Security 5.6.5
...
Closes gh-31102
2022-05-18 19:19:47 +01:00
Andy Wilkinson
e82def03ca
Upgrade to Spring Security 5.5.8
...
Closes gh-31096
2022-05-18 19:18:24 +01:00
Andy Wilkinson
69edce0629
Upgrade to Spring Batch 4.3.6
...
Closes gh-31011
2022-05-18 17:37:11 +01:00
Andy Wilkinson
7f60c67074
Upgrade to Spring Batch 4.3.6
...
Closes gh-31003
2022-05-18 17:35:55 +01:00
Andy Wilkinson
e407bae8c8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31098
2022-05-18 13:14:15 +01:00
Andy Wilkinson
5e78bef9f8
Test security dialect auto-config without Spring Security
...
Closes gh-31097
2022-05-18 13:06:09 +01:00
Stephane Nicoll
01288b61af
Upgrade to Spring Integration 5.5.12
...
Closes gh-31061
2022-05-18 08:54:57 +02:00
Stephane Nicoll
4eb778df43
Upgrade to Spring Integration 5.5.12
...
Closes gh-31060
2022-05-18 08:54:24 +02:00
Phillip Webb
ea41e89c6c
Merge branch '2.5.x' into 2.6.x
2022-05-17 22:21:10 -07:00
Phillip Webb
7d2f1bafc0
Update copyright year of changed files
2022-05-17 22:20:05 -07:00
Phillip Webb
0beccde6ee
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31094
2022-05-17 22:18:38 -07:00
Phillip Webb
7da42d7139
Allow tests to pass when a NAME environment variable exists
...
Update `ConfigurationPropertiesTests` so that it will pass even if a
local `NAME` environment variable is declared.
Closes gh-31076
2022-05-17 22:16:24 -07:00
Phillip Webb
6bce0c5044
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31092
2022-05-17 22:14:21 -07:00
Phillip Webb
44c979beb0
Reorder default property sources after @PropertySource processing
...
Update `SpringApplication` so that the `DefaultPropertiesPropertySource`
is moved to the end after `@PropertySource` annotations have been
processed. This restores functionality that used to be handled by
the `ConfigFileApplicationListener` and was inadvertently dropped
when the `ConfigDataEnvironmentPostProcessor` was developed.
Fixes gh-31068
2022-05-17 22:13:49 -07:00
Phillip Webb
99f5c781a5
Merge branch '2.5.x' into 2.6.x
2022-05-17 21:48:50 -07:00
Phillip Webb
350d27fe50
Polish code to use method references when possible
2022-05-17 21:16:42 -07:00
Scott Frederick
f395cfa255
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31088
2022-05-17 18:46:38 -05:00
Scott Frederick
50e27333d2
Tolerate failures when recording WebClient metrics
...
Fixes gh-30978
2022-05-17 18:45:37 -05:00
Andy Wilkinson
e3b2088e85
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31085
2022-05-17 18:36:54 +01:00
Andy Wilkinson
cc2d68968d
Upgrade to Maven Resolver 1.6.3
...
This commit also expands our internal dependency management for
Maven Resolver to cover all of the modules upon which we depend.
Closes gh-31083
2022-05-17 17:51:37 +01:00
Andy Wilkinson
f6b095bdfd
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31078
2022-05-17 15:03:57 +01:00
Andy Wilkinson
f19d91561b
Manage version of all Artemis modules upon which the build depends
...
Closes gh-31077
2022-05-17 15:01:23 +01:00
Stephane Nicoll
d2d4eefe1b
Upgrade to Spring Security 5.6.4
...
Closes gh-31012
2022-05-17 09:42:13 +02:00
Stephane Nicoll
a9df2a1ef7
Upgrade to Spring Kafka 2.8.6
...
Closes gh-31010
2022-05-17 09:41:36 +02:00
Stephane Nicoll
f7f4831199
Upgrade to Spring Security 5.5.7
...
Closes gh-31005
2022-05-17 09:41:01 +02:00
Stephane Nicoll
e9791e904d
Upgrade to Spring Kafka 2.7.14
...
Closes gh-31004
2022-05-17 09:40:44 +02:00
Andy Wilkinson
9381daddb3
Upgrade to Spring AMQP 2.4.5
...
Closes gh-31009
2022-05-16 17:40:31 +01:00
Stephane Nicoll
6cc8714dec
Start building against Spring Integration 5.5.12 snapshots
...
See gh-31061
2022-05-16 16:41:19 +02:00
Stephane Nicoll
d479d2eeb9
Start building against Spring Integration 5.5.12 snapshots
...
See gh-31060
2022-05-16 16:39:57 +02:00
Stephane Nicoll
18129a5938
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31058
2022-05-16 16:37:07 +02:00
Stephane Nicoll
22d187a38c
Polish "Add missing configuration properties for Statsd"
...
See gh-30898
2022-05-16 16:33:22 +02:00
izeye
d90ef6afb3
Add missing configuration properties for Statsd
...
See gh-30898
2022-05-16 16:28:50 +02:00
Andy Wilkinson
7a14673a00
Upgrade to Spring LDAP 2.3.8.RELEASE
...
Closes gh-31044
2022-05-16 11:39:12 +01:00
Andy Wilkinson
456d56d1bb
Upgrade to Spring Framework 5.3.20
...
Closes gh-31043
2022-05-16 11:39:08 +01:00
Andy Wilkinson
8fa4103420
Upgrade to Jackson Bom 2.13.3
...
Closes gh-31042
2022-05-16 11:39:06 +01:00
Andy Wilkinson
d7236934c1
Upgrade to Hibernate 5.6.9.Final
...
Closes gh-31041
2022-05-16 11:39:04 +01:00
Andy Wilkinson
23aae09936
Upgrade to Spring LDAP 2.3.8.RELEASE
...
Closes gh-31039
2022-05-16 11:32:48 +01:00
Andy Wilkinson
6fa103bdb2
Start building against Spring Security 5.6.4 snapshots
...
See gh-31012
2022-05-12 16:59:07 +01:00
Andy Wilkinson
40f82e9aa5
Start building against Spring Batch 4.3.6 snapshots
...
See gh-31011
2022-05-12 16:59:07 +01:00
Andy Wilkinson
2a9d9698ac
Start building against Spring Kafka 2.8.6 snapshots
...
See gh-31010
2022-05-12 16:59:06 +01:00
Andy Wilkinson
9137d777ab
Start building against Spring AMQP 2.4.5 snapshots
...
See gh-31009
2022-05-12 16:59:00 +01:00
Andy Wilkinson
76bc188e9f
Upgrade to Spring HATEOAS 1.4.3
...
Closes gh-31008
2022-05-12 16:49:57 +01:00
Andy Wilkinson
2413e80105
Upgrade to Micrometer 1.8.6
...
Closes gh-31007
2022-05-12 16:49:09 +01:00
Andy Wilkinson
5ce39254de
Start building against Spring Security 5.5.7 snapshots
...
See gh-31005
2022-05-12 15:46:11 +01:00
Andy Wilkinson
0233cf01d3
Start building against Spring Kafka 2.7.14 snapshots
...
See gh-31004
2022-05-12 15:45:02 +01:00
Andy Wilkinson
30bdd76bbe
Start building against Spring Batch 4.3.6 snapshots
...
See gh-31003
2022-05-12 15:44:27 +01:00
Andy Wilkinson
6286fd7917
Upgrade to Spring Framework 5.3.20
...
Closes gh-31002
2022-05-12 15:43:46 +01:00
Andy Wilkinson
e38cd9f928
Upgrade to Micrometer 1.7.12
...
Closes gh-31001
2022-05-12 15:43:04 +01:00
Andy Wilkinson
655ceefead
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30996
2022-05-12 12:47:38 +01:00
Andy Wilkinson
3f6fcac683
Polish "Extend documentation on Datadog metrics"
...
See gh-30879
2022-05-12 12:36:50 +01:00
Denis Washington
09db7e4001
Extend documentation on Datadog metrics
...
- Document that an application key must be set to publish metadata
for the exported metrics.
- Point out that using a non-US Datadog site (e.g., EU) requires
changing the `uri` property.
See gh-30879
2022-05-12 12:36:18 +01:00
Andy Wilkinson
9f46cf88c8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30994
2022-05-12 12:27:52 +01:00
颜虎
309e54bd21
Fix link to Upgrading From 1.x in multi-page documentation
...
See gh-30890
2022-05-12 12:15:30 +01:00
Andy Wilkinson
1fd9c4d82c
Polish
...
Closes gh-30992
2022-05-12 12:10:52 +01:00
izeye
624c41c80e
Polish
...
See gh-30862
2022-05-12 12:07:12 +01:00
Andy Wilkinson
ba8274b3cb
Upgrade to Reactor Bom 2020.0.19
...
Closes gh-30926
2022-05-10 16:58:47 +01:00
Andy Wilkinson
b61661ff5f
Upgrade to Postgresql 42.3.5
...
Closes gh-30925
2022-05-10 16:58:44 +01:00
Andy Wilkinson
295b3b0fbd
Upgrade to Netty tcNative 2.0.52.Final
...
Closes gh-30924
2022-05-10 16:58:42 +01:00
Andy Wilkinson
4c197e4175
Upgrade to Netty 4.1.77.Final
...
Closes gh-30923
2022-05-10 16:58:39 +01:00
Andy Wilkinson
1f4f64553c
Upgrade to MySQL 8.0.29
...
Closes gh-30922
2022-05-10 16:58:36 +01:00
Andy Wilkinson
bf63740a9a
Upgrade to Johnzon 1.2.18
...
Closes gh-30921
2022-05-10 16:58:33 +01:00
Andy Wilkinson
0a3169aab7
Upgrade to Jaybird 4.0.6.java8
...
Closes gh-30920
2022-05-10 16:58:31 +01:00
Andy Wilkinson
d0bdb2a061
Upgrade to Hazelcast 4.2.5
...
Closes gh-30919
2022-05-10 16:58:28 +01:00
Andy Wilkinson
23ad3e1952
Upgrade to Couchbase Client 3.2.7
...
Closes gh-30918
2022-05-10 16:58:26 +01:00
Andy Wilkinson
68b54f194f
Upgrade to ActiveMQ 5.16.5
...
Closes gh-30917
2022-05-10 16:58:23 +01:00
Andy Wilkinson
432741f06e
Upgrade to Reactor Bom 2020.0.19
...
Closes gh-30913
2022-05-10 14:37:43 +01:00
Andy Wilkinson
7157ca4fe5
Upgrade to Netty tcNative 2.0.52.Final
...
Closes gh-30912
2022-05-10 14:37:41 +01:00
Andy Wilkinson
25c320be51
Upgrade to Netty 4.1.77.Final
...
Closes gh-30911
2022-05-10 14:37:39 +01:00
Andy Wilkinson
0713f772ba
Upgrade to MySQL 8.0.29
...
Closes gh-30910
2022-05-10 14:37:36 +01:00
Andy Wilkinson
84b1b67e6d
Upgrade to Johnzon 1.2.18
...
Closes gh-30909
2022-05-10 14:37:34 +01:00
Andy Wilkinson
705ce88f13
Upgrade to Jaybird 4.0.6.java8
...
Closes gh-30908
2022-05-10 14:37:30 +01:00
Andy Wilkinson
0c19ae5294
Upgrade to Hazelcast 4.1.9
...
Closes gh-30907
2022-05-10 14:37:27 +01:00
Andy Wilkinson
6938df26e0
Upgrade to ActiveMQ 5.16.5
...
Closes gh-30906
2022-05-10 14:37:25 +01:00
Andy Wilkinson
d10addffe3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30886
2022-05-06 18:15:01 +01:00
christophejan
a1f3d68ead
Improve debug logging of requests to actuator endpoints on WebFlux
...
See gh-30880
2022-05-06 17:49:27 +01:00
Andy Wilkinson
5258cd2814
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30882
2022-05-06 11:29:22 +01:00
Andy Wilkinson
0e7c3547dd
Prohibit usage of Micrometer nullability annotations
...
Closes gh-30881
2022-05-06 11:29:08 +01:00
Andy Wilkinson
c9571a04ab
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30873
2022-05-05 10:19:01 +01:00
Andy Wilkinson
6d4f0232ca
Polish "Fix ConditionalOnProperty when used in an aliased composed annotation"
...
See gh-30505
2022-05-05 10:02:27 +01:00
Guirong Hu
dc57ad54d5
Fix ConditionalOnProperty when used in an aliased composed annotation
...
See gh-30505
2022-05-05 10:02:15 +01:00
Andy Wilkinson
fa327a783d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30850
2022-05-03 15:14:00 +01:00
Andy Wilkinson
4fd2e0c916
Polish "Fix typos"
...
See gh-30773
2022-05-03 14:09:53 +01:00
Andy Wilkinson
f6d24dc1a8
Fix typos
...
See gh-30773
2022-05-03 14:09:37 +01:00
Andy Wilkinson
b20a8bd778
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30847
2022-05-03 13:54:59 +01:00
Andy Wilkinson
798d61fcf0
Polish "Make event handling in ClassPathFileSystemWatcherTests thread-safe"
...
See gh-30844
2022-05-03 13:54:13 +01:00
dugenkui03
aeaad006cd
Make event handling in ClassPathFileSystemWatcherTests thread-safe
...
See gh-30844
2022-05-03 13:52:55 +01:00
Andy Wilkinson
a8b5a1c688
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30845
2022-05-03 13:51:38 +01:00
Andy Wilkinson
026b9e2efe
Polish "Make event handling in JobExecutionExitCodeGenerator thread-safe"
...
See gh-30705
2022-05-03 13:49:12 +01:00
dugenkui03
c8d1dfebab
Make event handling in JobExecutionExitCodeGenerator thread-safe
...
See gh-30705
2022-05-03 13:48:15 +01:00
Andy Wilkinson
f1b5f36af8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30841
2022-05-03 11:28:53 +01:00
Andy Wilkinson
f8e5a534a6
Polish "Polish InfluxMetricsExportAutoConfiguration"
...
See gh-30824
2022-05-03 09:50:51 +01:00
Eddú Meléndez
b0d5364efa
Polish InfluxMetricsExportAutoConfiguration
...
See gh-30824
2022-05-03 09:50:06 +01:00
Andy Wilkinson
bf94ea24d3
Improve testing of Batch schema resolution
...
Closes gh-30794
2022-04-25 19:30:59 +01:00
Andy Wilkinson
409ec48e2a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30790
2022-04-25 15:00:51 +01:00
Andy Wilkinson
193ef9a06d
Package META-INF/services/ files beneath BOOT-INF/classes/
...
Closes gh-30413
2022-04-25 14:32:47 +01:00
Andy Wilkinson
3f23c08268
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30788
2022-04-25 14:11:08 +01:00
Andy Wilkinson
ce788657ce
Improve diagnostics for map binding failures
...
Closes gh-30281
2022-04-25 13:50:09 +01:00
Andy Wilkinson
5c3be7c61e
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30786
2022-04-25 12:36:14 +01:00
Andy Wilkinson
ffe0ec6d4d
Use SearchStrategy in MethodValidationExcludeFilter byAnnotation
...
Closes gh-30631
2022-04-25 12:35:41 +01:00
Moritz Halbritter
63eb6b6ad9
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30781
2022-04-25 09:13:34 +02:00
Moritz Halbritter
9b8b87009c
Document support for Java 18
...
Closes gh-30548
2022-04-25 09:13:07 +02:00
Phillip Webb
c5d650a807
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30762
2022-04-20 16:29:24 -07:00
Phillip Webb
77edb27a07
Fix package tangle caused by ApplicationContextFactory
...
Fix package tangle by changing `ApplicationContextFactory.DEFAULT` to
use `spring.factories` to discover implementations rather than needing
direct access to our own `ApplicationContext` classes.
Closes gh-30272
2022-04-20 16:28:46 -07:00
Stephane Nicoll
3731655b34
Upgrade to Spring Session 2021.1.3
...
Closes gh-30603
2022-04-20 18:35:52 +02:00
Stephane Nicoll
5c4b63be11
Upgrade to Spring Session 2021.0.6
...
Closes gh-30595
2022-04-20 18:34:05 +02:00
Stephane Nicoll
c5953623fa
Upgrade to Postgresql 42.3.4
...
Closes gh-30758
2022-04-20 09:26:42 +02:00
Stephane Nicoll
d69ca284b9
Upgrade to Lombok 1.18.24
...
Closes gh-30757
2022-04-20 09:26:39 +02:00
Stephane Nicoll
bda0fbf22f
Upgrade to Janino 3.1.7
...
Closes gh-30755
2022-04-20 09:26:34 +02:00
Stephane Nicoll
1bd1b2a3a4
Upgrade to Lombok 1.18.24
...
Closes gh-30753
2022-04-20 09:11:34 +02:00
Stephane Nicoll
792ebdbbf8
Upgrade to Janino 3.1.7
...
Closes gh-30752
2022-04-20 09:11:32 +02:00
Stephane Nicoll
d049ae8703
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30749
2022-04-20 08:24:07 +02:00
rfigueroa
ae267bfab2
Use eclipse-temurin in docker samples
...
As AdoptOpenJDK moved to the Eclipse Foundation, this commit updates the
docs to reflect that in docker file samples.
See gh-30748
2022-04-20 08:21:55 +02:00
Stephane Nicoll
245c6c97ec
Upgrade to Spring Integration 5.5.11
...
Closes gh-30702
2022-04-20 08:09:00 +02:00
Stephane Nicoll
1e32f3b718
Upgrade to Spring Integration 5.5.11
...
Closes gh-30700
2022-04-20 08:08:19 +02:00
Stephane Nicoll
ba38441a0a
Upgrade to Spring Data 2021.1.4
...
Closes gh-30602
2022-04-19 15:36:54 +02:00
Stephane Nicoll
9f7a9546bd
Upgrade to Spring Data 2021.0.11
...
Closes gh-30594
2022-04-19 15:35:29 +02:00
Stephane Nicoll
00b175bb7f
Upgrade to Jackson 2.13.2.1
...
Closes gh-30743
2022-04-19 13:04:03 +02:00
Stephane Nicoll
d3a70c3793
Upgrade to Spring HATEOAS 1.4.2
...
Closes gh-30744
2022-04-19 13:03:38 +02:00
Stephane Nicoll
57b3cb5135
Polish "Fix incorrect link in kafka.adoc"
...
See gh-30674
2022-04-19 09:52:56 +02:00
Chanhyeong Cho
577f0add0c
Fix incorrect link in kafka.adoc
...
See gh-30674
2022-04-19 09:48:03 +02:00
Stephane Nicoll
91625207b2
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30738
2022-04-19 09:11:01 +02:00
Stephane Nicoll
1fa4701d6d
Polish "Validate overrides against CharsetMapperDefault.properties"
...
See gh-30692
2022-04-19 09:03:54 +02:00
Guirong Hu
407ae3b04f
Validate overrides against CharsetMapperDefault.properties
...
See gh-30692
2022-04-19 09:03:40 +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
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
af7c20491b
Upgrade to Undertow 2.2.17.Final
...
Closes gh-30690
2022-04-15 08:29:10 +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
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
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
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
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