Commit Graph

16119 Commits (b17cb9b92b66c26990300fc0811501cb1fba1054)

Author SHA1 Message Date
Phillip Webb 0beccde6ee Merge branch '2.5.x' into 2.6.x
Closes gh-31094
3 years ago
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
3 years ago
Phillip Webb 6bce0c5044 Merge branch '2.5.x' into 2.6.x
Closes gh-31092
3 years ago
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
3 years ago
Phillip Webb 99f5c781a5 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 350d27fe50 Polish code to use method references when possible 3 years ago
Scott Frederick f395cfa255 Merge branch '2.5.x' into 2.6.x
Closes gh-31088
3 years ago
Scott Frederick 50e27333d2 Tolerate failures when recording WebClient metrics
Fixes gh-30978
3 years ago
Andy Wilkinson e3b2088e85 Merge branch '2.5.x' into 2.6.x
Closes gh-31085
3 years ago
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
3 years ago
Andy Wilkinson f6b095bdfd Merge branch '2.5.x' into 2.6.x
Closes gh-31078
3 years ago
Andy Wilkinson f19d91561b Manage version of all Artemis modules upon which the build depends
Closes gh-31077
3 years ago
Stephane Nicoll d2d4eefe1b Upgrade to Spring Security 5.6.4
Closes gh-31012
3 years ago
Stephane Nicoll a9df2a1ef7 Upgrade to Spring Kafka 2.8.6
Closes gh-31010
3 years ago
Stephane Nicoll f7f4831199 Upgrade to Spring Security 5.5.7
Closes gh-31005
3 years ago
Stephane Nicoll e9791e904d Upgrade to Spring Kafka 2.7.14
Closes gh-31004
3 years ago
Andy Wilkinson 9381daddb3 Upgrade to Spring AMQP 2.4.5
Closes gh-31009
3 years ago
Stephane Nicoll 6cc8714dec Start building against Spring Integration 5.5.12 snapshots
See gh-31061
3 years ago
Stephane Nicoll d479d2eeb9 Start building against Spring Integration 5.5.12 snapshots
See gh-31060
3 years ago
Stephane Nicoll 18129a5938 Merge branch '2.5.x' into 2.6.x
Closes gh-31058
3 years ago
Stephane Nicoll 22d187a38c Polish "Add missing configuration properties for Statsd"
See gh-30898
3 years ago
izeye d90ef6afb3 Add missing configuration properties for Statsd
See gh-30898
3 years ago
Andy Wilkinson 7a14673a00 Upgrade to Spring LDAP 2.3.8.RELEASE
Closes gh-31044
3 years ago
Andy Wilkinson 456d56d1bb Upgrade to Spring Framework 5.3.20
Closes gh-31043
3 years ago
Andy Wilkinson 8fa4103420 Upgrade to Jackson Bom 2.13.3
Closes gh-31042
3 years ago
Andy Wilkinson d7236934c1 Upgrade to Hibernate 5.6.9.Final
Closes gh-31041
3 years ago
Andy Wilkinson 23aae09936 Upgrade to Spring LDAP 2.3.8.RELEASE
Closes gh-31039
3 years ago
Andy Wilkinson 6fa103bdb2 Start building against Spring Security 5.6.4 snapshots
See gh-31012
3 years ago
Andy Wilkinson 40f82e9aa5 Start building against Spring Batch 4.3.6 snapshots
See gh-31011
3 years ago
Andy Wilkinson 2a9d9698ac Start building against Spring Kafka 2.8.6 snapshots
See gh-31010
3 years ago
Andy Wilkinson 9137d777ab Start building against Spring AMQP 2.4.5 snapshots
See gh-31009
3 years ago
Andy Wilkinson 76bc188e9f Upgrade to Spring HATEOAS 1.4.3
Closes gh-31008
3 years ago
Andy Wilkinson 2413e80105 Upgrade to Micrometer 1.8.6
Closes gh-31007
3 years ago
Andy Wilkinson 5ce39254de Start building against Spring Security 5.5.7 snapshots
See gh-31005
3 years ago
Andy Wilkinson 0233cf01d3 Start building against Spring Kafka 2.7.14 snapshots
See gh-31004
3 years ago
Andy Wilkinson 30bdd76bbe Start building against Spring Batch 4.3.6 snapshots
See gh-31003
3 years ago
Andy Wilkinson 6286fd7917 Upgrade to Spring Framework 5.3.20
Closes gh-31002
3 years ago
Andy Wilkinson e38cd9f928 Upgrade to Micrometer 1.7.12
Closes gh-31001
3 years ago
Andy Wilkinson 655ceefead Merge branch '2.5.x' into 2.6.x
Closes gh-30996
3 years ago
Andy Wilkinson 3f6fcac683 Polish "Extend documentation on Datadog metrics"
See gh-30879
3 years ago
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
3 years ago
Andy Wilkinson 9f46cf88c8 Merge branch '2.5.x' into 2.6.x
Closes gh-30994
3 years ago
颜虎 309e54bd21 Fix link to Upgrading From 1.x in multi-page documentation
See gh-30890
3 years ago
Andy Wilkinson 1fd9c4d82c Polish
Closes gh-30992
3 years ago
izeye 624c41c80e Polish
See gh-30862
3 years ago
Andy Wilkinson ba8274b3cb Upgrade to Reactor Bom 2020.0.19
Closes gh-30926
3 years ago
Andy Wilkinson b61661ff5f Upgrade to Postgresql 42.3.5
Closes gh-30925
3 years ago
Andy Wilkinson 295b3b0fbd Upgrade to Netty tcNative 2.0.52.Final
Closes gh-30924
3 years ago
Andy Wilkinson 4c197e4175 Upgrade to Netty 4.1.77.Final
Closes gh-30923
3 years ago
Andy Wilkinson 1f4f64553c Upgrade to MySQL 8.0.29
Closes gh-30922
3 years ago
Andy Wilkinson bf63740a9a Upgrade to Johnzon 1.2.18
Closes gh-30921
3 years ago
Andy Wilkinson 0a3169aab7 Upgrade to Jaybird 4.0.6.java8
Closes gh-30920
3 years ago
Andy Wilkinson d0bdb2a061 Upgrade to Hazelcast 4.2.5
Closes gh-30919
3 years ago
Andy Wilkinson 23ad3e1952 Upgrade to Couchbase Client 3.2.7
Closes gh-30918
3 years ago
Andy Wilkinson 68b54f194f Upgrade to ActiveMQ 5.16.5
Closes gh-30917
3 years ago
Andy Wilkinson 432741f06e Upgrade to Reactor Bom 2020.0.19
Closes gh-30913
3 years ago
Andy Wilkinson 7157ca4fe5 Upgrade to Netty tcNative 2.0.52.Final
Closes gh-30912
3 years ago
Andy Wilkinson 25c320be51 Upgrade to Netty 4.1.77.Final
Closes gh-30911
3 years ago
Andy Wilkinson 0713f772ba Upgrade to MySQL 8.0.29
Closes gh-30910
3 years ago
Andy Wilkinson 84b1b67e6d Upgrade to Johnzon 1.2.18
Closes gh-30909
3 years ago
Andy Wilkinson 705ce88f13 Upgrade to Jaybird 4.0.6.java8
Closes gh-30908
3 years ago
Andy Wilkinson 0c19ae5294 Upgrade to Hazelcast 4.1.9
Closes gh-30907
3 years ago
Andy Wilkinson 6938df26e0 Upgrade to ActiveMQ 5.16.5
Closes gh-30906
3 years ago
Andy Wilkinson d10addffe3 Merge branch '2.5.x' into 2.6.x
Closes gh-30886
3 years ago
christophejan a1f3d68ead Improve debug logging of requests to actuator endpoints on WebFlux
See gh-30880
3 years ago
Andy Wilkinson 5258cd2814 Merge branch '2.5.x' into 2.6.x
Closes gh-30882
3 years ago
Andy Wilkinson 0e7c3547dd Prohibit usage of Micrometer nullability annotations
Closes gh-30881
3 years ago
Andy Wilkinson c9571a04ab Merge branch '2.5.x' into 2.6.x
Closes gh-30873
3 years ago
Andy Wilkinson 6d4f0232ca Polish "Fix ConditionalOnProperty when used in an aliased composed annotation"
See gh-30505
3 years ago
Guirong Hu dc57ad54d5 Fix ConditionalOnProperty when used in an aliased composed annotation
See gh-30505
3 years ago
Andy Wilkinson fa327a783d Merge branch '2.5.x' into 2.6.x
Closes gh-30850
3 years ago
Andy Wilkinson 4fd2e0c916 Polish "Fix typos"
See gh-30773
3 years ago
Andy Wilkinson f6d24dc1a8 Fix typos
See gh-30773
3 years ago
Andy Wilkinson b20a8bd778 Merge branch '2.5.x' into 2.6.x
Closes gh-30847
3 years ago
Andy Wilkinson 798d61fcf0 Polish "Make event handling in ClassPathFileSystemWatcherTests thread-safe"
See gh-30844
3 years ago
dugenkui03 aeaad006cd Make event handling in ClassPathFileSystemWatcherTests thread-safe
See gh-30844
3 years ago
Andy Wilkinson a8b5a1c688 Merge branch '2.5.x' into 2.6.x
Closes gh-30845
3 years ago
Andy Wilkinson 026b9e2efe Polish "Make event handling in JobExecutionExitCodeGenerator thread-safe"
See gh-30705
3 years ago
dugenkui03 c8d1dfebab Make event handling in JobExecutionExitCodeGenerator thread-safe
See gh-30705
3 years ago
Andy Wilkinson f1b5f36af8 Merge branch '2.5.x' into 2.6.x
Closes gh-30841
3 years ago
Andy Wilkinson f8e5a534a6 Polish "Polish InfluxMetricsExportAutoConfiguration"
See gh-30824
3 years ago
Eddú Meléndez b0d5364efa Polish InfluxMetricsExportAutoConfiguration
See gh-30824
3 years ago
Andy Wilkinson bf94ea24d3 Improve testing of Batch schema resolution
Closes gh-30794
3 years ago
Andy Wilkinson 409ec48e2a Merge branch '2.5.x' into 2.6.x
Closes gh-30790
3 years ago
Andy Wilkinson 193ef9a06d Package META-INF/services/ files beneath BOOT-INF/classes/
Closes gh-30413
3 years ago
Andy Wilkinson 3f23c08268 Merge branch '2.5.x' into 2.6.x
Closes gh-30788
3 years ago
Andy Wilkinson ce788657ce Improve diagnostics for map binding failures
Closes gh-30281
3 years ago
Andy Wilkinson 5c3be7c61e Merge branch '2.5.x' into 2.6.x
Closes gh-30786
3 years ago
Andy Wilkinson ffe0ec6d4d Use SearchStrategy in MethodValidationExcludeFilter byAnnotation
Closes gh-30631
3 years ago
Moritz Halbritter 63eb6b6ad9 Merge branch '2.5.x' into 2.6.x
Closes gh-30781
3 years ago
Moritz Halbritter 9b8b87009c Document support for Java 18
Closes gh-30548
3 years ago
Phillip Webb c5d650a807 Merge branch '2.5.x' into 2.6.x
Closes gh-30762
3 years ago
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
3 years ago
Stephane Nicoll 3731655b34 Upgrade to Spring Session 2021.1.3
Closes gh-30603
3 years ago
Stephane Nicoll 5c4b63be11 Upgrade to Spring Session 2021.0.6
Closes gh-30595
3 years ago
Stephane Nicoll c5953623fa Upgrade to Postgresql 42.3.4
Closes gh-30758
3 years ago
Stephane Nicoll d69ca284b9 Upgrade to Lombok 1.18.24
Closes gh-30757
3 years ago
Stephane Nicoll bda0fbf22f Upgrade to Janino 3.1.7
Closes gh-30755
3 years ago
Stephane Nicoll 1bd1b2a3a4 Upgrade to Lombok 1.18.24
Closes gh-30753
3 years ago
Stephane Nicoll 792ebdbbf8 Upgrade to Janino 3.1.7
Closes gh-30752
3 years ago
Stephane Nicoll d049ae8703 Merge branch '2.5.x' into 2.6.x
Closes gh-30749
3 years ago
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
3 years ago
Stephane Nicoll 245c6c97ec Upgrade to Spring Integration 5.5.11
Closes gh-30702
3 years ago
Stephane Nicoll 1e32f3b718 Upgrade to Spring Integration 5.5.11
Closes gh-30700
3 years ago
Stephane Nicoll ba38441a0a Upgrade to Spring Data 2021.1.4
Closes gh-30602
3 years ago
Stephane Nicoll 9f7a9546bd Upgrade to Spring Data 2021.0.11
Closes gh-30594
3 years ago
Stephane Nicoll 00b175bb7f Upgrade to Jackson 2.13.2.1
Closes gh-30743
3 years ago
Stephane Nicoll d3a70c3793 Upgrade to Spring HATEOAS 1.4.2
Closes gh-30744
3 years ago
Stephane Nicoll 57b3cb5135 Polish "Fix incorrect link in kafka.adoc"
See gh-30674
3 years ago
Chanhyeong Cho 577f0add0c Fix incorrect link in kafka.adoc
See gh-30674
3 years ago
Stephane Nicoll 91625207b2 Merge branch '2.5.x' into 2.6.x
Closes gh-30738
3 years ago
Stephane Nicoll 1fa4701d6d Polish "Validate overrides against CharsetMapperDefault.properties"
See gh-30692
3 years ago
Guirong Hu 407ae3b04f Validate overrides against CharsetMapperDefault.properties
See gh-30692
3 years ago
Stephane Nicoll 52b54f434b Upgrade to Spring Kafka 2.8.5
Closes gh-30600
3 years ago
Stephane Nicoll 3438934a9e Upgrade to Spring AMQP 2.4.4
Closes gh-30701
3 years ago
Stephane Nicoll 1c6ef781cd Upgrade to Spring Security 5.6.3
Closes gh-30601
3 years ago
Stephane Nicoll 376aa199ba Upgrade to Spring LDAP 2.3.7
Closes gh-30598
3 years ago
Stephane Nicoll 0ad6ae9a03 Upgrade to Spring Kafka 2.7.13
Closes gh-30592
3 years ago
Stephane Nicoll 1c08f503ba Upgrade to Spring AMQP 2.3.16
Closes gh-30699
3 years ago
Stephane Nicoll c25a2eb274 Upgrade to Spring Security 5.5.6
Closes gh-30593
3 years ago
Stephane Nicoll 07ba83be5d Upgrade to Spring LDAP 2.3.7
Closes gh-30589
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 af7c20491b Upgrade to Undertow 2.2.17.Final
Closes gh-30690
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 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 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 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