Commit Graph

16068 Commits

Author SHA1 Message Date
Phillip Webb 9f00c3acf5 Polish 2022-02-23 21:44:43 -08:00
Phillip Webb adfaa8f778 Merge branch '2.6.x' into 2.7.x 2022-02-23 21:44:37 -08:00
Phillip Webb 1a3841f74e Polish 2022-02-23 21:44:14 -08:00
Phillip Webb 9411fc264d Merge branch '2.5.x' into 2.6.x 2022-02-23 21:44:08 -08:00
Phillip Webb 57009d5623 Polish 2022-02-23 21:43:42 -08:00
Scott Frederick ee4e7bb923 Merge branch '2.6.x' into 2.7.x
Closes gh-29982
2022-02-23 17:56:34 -06:00
Scott Frederick 59ffe28639 Ignore buildpack deprecation warnings in Paketo system tests
Fixes gh-29885
2022-02-23 17:56:21 -06:00
Madhura Bhave 729c6993e1 Merge branch '2.6.x' into 2.7.x
Closes gh-29981
2022-02-23 15:29:36 -08:00
Madhura Bhave acd1ba0eca Merge branch '2.5.x' into 2.6.x
Closes gh-29980
2022-02-23 15:28:17 -08:00
Madhura Bhave 67b13ee4c7 Document that placeholders in @DefaultValue annotations are not resolved
Closes gh-23164
2022-02-23 15:27:43 -08:00
Madhura Bhave 0ecf43dbe2 Merge branch '2.6.x' into 2.7.x
Closes gh-29979
2022-02-23 15:10:30 -08:00
Madhura Bhave 894860c177 Merge branch '2.5.x' into 2.6.x
Closes gh-29978
2022-02-23 15:10:12 -08:00
Madhura Bhave cc95f734d7 Clarify relation of import path to resultant properties in configtree import data
Closes gh-29606
2022-02-23 15:09:42 -08:00
Stephane Nicoll 46b6dc29c1 Upgrade to Spring Batch 4.3.5
Closes gh-29652
2022-02-23 17:10:35 +01:00
Stephane Nicoll 8147aff76a Upgrade to Spring Batch 4.3.5
Closes gh-29724
2022-02-23 17:04:59 +01:00
Stephane Nicoll f864505ea7 Upgrade to Netty tcNative 2.0.50.Final
Closes gh-29974
2022-02-23 17:04:40 +01:00
Stephane Nicoll 479a4e693c Upgrade to Spring Batch 4.3.5
Closes gh-29714
2022-02-23 16:58:39 +01:00
Stephane Nicoll 773b025208 Upgrade to Netty tcNative 2.0.50.Final
Closes gh-29973
2022-02-23 16:57:32 +01:00
Stephane Nicoll d1ab3f5f78 Upgrade to Spring Session 2021.1.2
Closes gh-29725
2022-02-23 16:19:26 +01:00
Stephane Nicoll 776ccf77a7 Upgrade to Spring Session 2021.0.5
Closes gh-29715
2022-02-23 16:17:52 +01:00
Moritz Halbritter fd36215d72 Omit empty values for AutoConfigureAfter and AutoConfigureBefore
As @AutoConfiguration is now meta-annotated with @AutoConfigureAfter
and @AutoConfigureBefore, the generated property files have a lot of
superfluous lines in the format <class>.AutoConfigureAfter= and
<class>.AutoConfigureBefore=.

One can now configure in the annotation processor for each property key
if empty values should be omitted. This is currently only activated for
AutoConfigureAfter and AutoConfigureBefore

See gh-29907
2022-02-23 15:39:46 +01:00
Moritz Halbritter 7872f61bfc Add @AutoConfiguration annotation support to the autoconfigure-processor
See gh-29907
2022-02-23 15:39:46 +01:00
Moritz Halbritter 9149ae50da Use @AutoConfiguration for relative ordering on auto-configurations 2022-02-23 15:39:46 +01:00
Moritz Halbritter 9e9049ca7f Add relative ordering to @AutoConfiguration
The relative ordering is implemented with @AliasFor annotations on the
@AutoConfiguration annotation. The production code already works without
changes, only the test code had to be modified. It now uses
AnnotationMetadata which already knows how to deal with @AliasFor
instead of using the reflection API directly.

See gh-29907
2022-02-23 15:39:41 +01:00
Andy Wilkinson 57cd34be88 Merge branch '2.6.x' into 2.7.x
Closes gh-29971
2022-02-23 11:53:09 +00:00
Andy Wilkinson a979925e63 Merge branch '2.5.x' into 2.6.x
Closes gh-29970
2022-02-23 11:52:57 +00:00
Andy Wilkinson 7aca75c58c Preserve ObjectName property order when name is unchanged
Closes gh-29953
2022-02-23 11:30:21 +00:00
Andy Wilkinson 1ae46dee6d Merge branch '2.6.x' into 2.7.x
Closes gh-29967
2022-02-23 08:59:33 +00:00
Andy Wilkinson 4f8a18fa0a Merge branch '2.5.x' into 2.6.x
Closes gh-29966
2022-02-23 08:59:16 +00:00
Andy Wilkinson 9c9e04b8e4 Use mainClass rather than deprecated main in BootRun examples
Closes gh-29965
2022-02-23 08:59:04 +00:00
Stephane Nicoll da404e12fc Upgrade to Spring Integration 5.5.9
Closes gh-29964
2022-02-23 08:36:44 +01:00
Stephane Nicoll 60637b7aaa Upgrade to Spring Kafka 2.8.3
Closes gh-29759
2022-02-23 08:35:56 +01:00
Stephane Nicoll 9e3891a0fe Upgrade to Spring Integration 5.5.9
Closes gh-29963
2022-02-23 08:29:23 +01:00
Stephane Nicoll c8b7a17545 Upgrade to Spring Kafka 2.8.3
Closes gh-29722
2022-02-23 08:27:24 +01:00
Stephane Nicoll ee7426a555 Upgrade to Spring Integration 5.5.9
Closes gh-29962
2022-02-23 08:21:14 +01:00
Stephane Nicoll 3f2d01628d Upgrade to Spring Kafka 2.7.11
Closes gh-29712
2022-02-23 08:19:08 +01:00
Madhura Bhave 64b8610c2e Merge branch '2.6.x' into 2.7.x
Closes gh-29960
2022-02-22 15:51:35 -08:00
Madhura Bhave 880db30c67 Merge branch '2.5.x' into 2.6.x
Closes gh-29959
2022-02-22 15:49:18 -08:00
Madhura Bhave a70fa80571 Rectify incorrect sanitizing regex example provided in how-to docs
Closes gh-29951
2022-02-22 15:44:50 -08:00
Scott Frederick c1fec6967e Support constructor injection for FailureAnalyzers
This commit adds support for instantiating FailureAnalyzer
implementations with BeanFactory and/or an Environment constructor
arguments and deprecates support for setter injection of these values
using BeanFactoryAware and EnvironmentAware.

Closes gh-29811
2022-02-22 14:24:59 -06:00
Andy Wilkinson 2d9177dd9d Merge branch '2.6.x' into 2.7.x
Closes gh-29955
2022-02-22 20:11:47 +00:00
Andy Wilkinson 3614c8d1f8 Merge branch '2.5.x' into 2.6.x
Closes gh-29954
2022-02-22 20:08:31 +00:00
Andy Wilkinson 1e8d29f7aa Configure Kotlin compilation JVM target by convention
Closes gh-29952
2022-02-22 18:11:51 +00:00
Stephane Nicoll 288533ba4a Upgrade to WebJars Locator Core 0.50
Closes gh-29948
2022-02-22 14:56:51 +01:00
Stephane Nicoll 9cec66bef8 Upgrade to UnboundID LDAPSDK 6.0.3
Closes gh-29947
2022-02-22 14:56:50 +01:00
Stephane Nicoll 2406e48b5c Upgrade to MSSQL JDBC 10.2.0.jre8
Closes gh-29946
2022-02-22 14:56:50 +01:00
Stephane Nicoll 1816f46c19 Upgrade to MariaDB 3.0.3
Closes gh-29945
2022-02-22 14:56:50 +01:00
Stephane Nicoll dda3bae02a Upgrade to Embedded Mongo 3.4.1
Closes gh-29944
2022-02-22 14:56:50 +01:00
Stephane Nicoll 6bdbfbab9a Upgrade to AppEngine SDK 1.9.95
Closes gh-29943
2022-02-22 14:23:39 +01:00
Stephane Nicoll d6105c7122 Upgrade to Postgresql 42.3.3
Closes gh-29941
2022-02-22 08:47:38 +01:00
Stephane Nicoll 6e0f664bbe Upgrade to Netty tcNative 2.0.49.Final
Closes gh-29940
2022-02-22 08:47:35 +01:00
Stephane Nicoll 2617eeb1fd Upgrade to Jetty Reactive HTTPClient 1.1.11
Closes gh-29939
2022-02-22 08:47:32 +01:00
Stephane Nicoll 8daa8e2307 Upgrade to AppEngine SDK 1.9.95
Closes gh-29938
2022-02-22 08:47:30 +01:00
Stephane Nicoll 2bd58f8f9b Upgrade to ActiveMQ 5.16.4
Closes gh-29937
2022-02-22 08:47:27 +01:00
Stephane Nicoll 49337f30da Upgrade to Netty tcNative 2.0.49.Final
Closes gh-29936
2022-02-22 08:43:16 +01:00
Stephane Nicoll d4db26dcc1 Merge branch '2.6.x' into 2.7.x
Closes gh-29935
2022-02-22 08:30:47 +01:00
Stephane Nicoll db26aff792 Merge branch '2.5.x' into 2.6.x
Closes gh-29934
2022-02-22 08:30:38 +01:00
UbaidurRehman1 7b48c51689 Clarify that any property of the environment can be used in a banner
See gh-29931
2022-02-22 08:30:07 +01:00
Andy Wilkinson da96eeab21 Remove redundant requestMappingHandlerMapping override
The bean no longer needs to be primary so the override is not needed
any more.

Closes gh-29682
2022-02-21 18:59:29 +00:00
Stephane Nicoll 935d37b2ca Polish "Reuse BatchLoaderRegistry in GraphQlService"
See gh-29929
2022-02-21 18:16:07 +01:00
dugenkui03 043e5ff0f5 Reuse BatchLoaderRegistry in GraphQlService
See gh-29929
2022-02-21 18:00:52 +01:00
Stephane Nicoll 8ee9681d36 Upgrade to Spring Security 5.7.0-M2
Closes gh-29766
2022-02-21 16:17:13 +01:00
Andy Wilkinson ca2dbf39ec Upgrade to Jetty Reactive HTTPClient 1.1.11
Closes gh-29927
2022-02-21 14:26:48 +00:00
Andy Wilkinson df6959679c Upgrade to AppEngine SDK 1.9.95
Closes gh-29926
2022-02-21 14:26:45 +00:00
Andy Wilkinson 7db9bb94cd Upgrade to ActiveMQ 5.16.4
Closes gh-29925
2022-02-21 14:26:42 +00:00
Andy Wilkinson 2d8495361e Upgrade to Spring Security 5.6.2
Closes gh-29723
2022-02-21 14:09:38 +00:00
Andy Wilkinson 21fb273ec3 Upgrade to Spring Security 5.5.5
Closes gh-29713
2022-02-21 14:08:16 +00:00
Andy Wilkinson 6493c7c561 Merge branch '2.6.x' into 2.7.x
Closes gh-29922
2022-02-21 14:01:58 +00:00
Andy Wilkinson fcd52c02a7 Merge branch '2.5.x' into 2.6.x
Closes gh-29921
2022-02-21 14:01:47 +00:00
Andy Wilkinson 55f68989d8 Remove redundant action to make plugins dat file reproducible
Closes gh-29917
2022-02-21 14:01:04 +00:00
Moritz Halbritter 1325153ee9 Move ManagementContextConfiguration from spring.factories
The import selector will now, in addition to spring.factories, look for
ManagementContextConfiguration classes in a file called
META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

The existing ManagementContextConfigurations have been moved from
spring.factories to the new file.

Closes gh-29730
2022-02-21 13:16:12 +01:00
Moritz Halbritter d7b229d3c7 Rename AutoConfigurationLoader to ImportCandidates
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports

See gh-29872
2022-02-21 10:34:38 +01:00
Stephane Nicoll 3ffd88158e Polish "Add support for Redis sentinel username"
See gh-29661
2022-02-21 09:52:29 +01:00
mourezwell 202a426bd6 Add support for Redis sentinel username
See gh-29661
2022-02-21 09:52:15 +01:00
Gary Russell d56403b64f Add support for Kafka immediateStop property
See gh-29884
2022-02-21 09:29:41 +01:00
Stephane Nicoll c5307a8bfe Merge branch '2.6.x' into 2.7.x
Closes gh-29916
2022-02-21 09:25:21 +01:00
Stephane Nicoll c52f6f09ad Merge branch '2.5.x' into 2.6.x
Closes gh-29915
2022-02-21 09:25:08 +01:00
Stephane Nicoll 92cd51e6b0 Polish "Clarify log message with a profile containing a comma"
See gh-29896
2022-02-21 09:00:27 +01:00
gcoppex c8466a14e9 Clarify log message with a profile containing a comma
See gh-29896
2022-02-21 08:28:10 +01:00
Andy Wilkinson 5f2ae858b6 Merge branch '2.6.x' into 2.7.x
Closes gh-29910
2022-02-19 11:36:20 +00:00
Andy Wilkinson 95d67a985b Merge branch 'gh-29639' into 2.6.x
Closes gh-29909
2022-02-19 11:36:09 +00:00
Andy Wilkinson 5baa71f1b3 Allow beans with circular dependencies to be spied
Closes gh-29639
2022-02-19 11:35:58 +00:00
Andy Wilkinson 9a3f053034 Allow beans with circular dependencies to be spied
Closes gh-29639
2022-02-19 11:35:28 +00:00
Andy Wilkinson 630da366bd Upgrade to Spring Data 2021.2.0-M3
Closes gh-29765
2022-02-19 08:05:24 +00:00
Andy Wilkinson f919c9983c Upgrade to Spring Data 2021.1.2
Closes gh-29721
2022-02-19 08:02:55 +00:00
Andy Wilkinson 1c4fc7d3fa Upgrade to Spring Data 2021.0.9
Closes gh-29711
2022-02-19 07:59:10 +00:00
Andy Wilkinson 027093d852 Use a templated source file for SpringBootVersion
Closes gh-29670
2022-02-18 18:08:09 +00:00
Stephane Nicoll 2374347bab Upgrade to Spring LDAP 2.4.0-M2
Closes gh-29764
2022-02-18 17:29:32 +01:00
Stephane Nicoll 47510924e5 Upgrade to Spring LDAP 2.3.6
Closes gh-29720
2022-02-18 17:28:16 +01:00
Stephane Nicoll 6bf172f0f2 Upgrade to Spring LDAP 2.3.6
Closes gh-29710
2022-02-18 17:02:39 +01:00
Moritz Halbritter 2afa02c856 Fix missing test slice configuration
Test slices are now longer registered in spring.factories, but
TestSliceMetadata still looked there for them to generate documentation.
Fixed this so that TestSliceMetadata now looks in the right places for
test slices.

See gh-29873
2022-02-18 14:49:07 +01:00
Brian Clozel 940558c2a6 Merge branch '2.6.x' into 2.7.x
Closes gh-29906
2022-02-18 13:55:53 +01:00
Brian Clozel 16c47595e7 Merge branch '2.5.x' into 2.6.x
Closes gh-29905
2022-02-18 13:55:27 +01:00
Brian Clozel 00114f9d61 Deregister failed contexts from SpringApplicationShutdownHook
Prior to this change, SpringApplication would register contexts to
SpringApplicationShutdownHook and only deregister them when they're
properly closed. A failed refresh attempt does not deregister the
context from the shutdown hook.
When a test suite runs lots of tests failing because of failed contexts,
this can build up and consume lots of resources.

This commit fixes this leak and deregisters failed contexts.

Fixes gh-29874
2022-02-18 13:54:14 +01:00
Moritz Halbritter 4f49e8c990 Polish JavaDoc 2022-02-18 13:14:42 +01:00
Andy Wilkinson d18f536bc8 Remove separate netty-tcnative dependency management
Closes gh-29816
2022-02-18 11:45:00 +00:00
Andy Wilkinson 0e5a82522c Merge branch '2.6.x' into 2.7.x
Closes gh-29904
2022-02-18 11:42:21 +00:00
Andy Wilkinson 9da6fb4a5a Merge branch '2.5.x' into 2.6.x
Closes gh-29903
2022-02-18 11:42:10 +00:00
Andy Wilkinson c676b8b84d Remove KafkaPropertiesKafka24Tests
We now use Kafka 2.7 by default so tests against 2.4 are no longer
required.

Closes gh-29882
2022-02-18 11:41:24 +00:00
Andy Wilkinson b6fea07001 Merge branch '2.6.x' into 2.7.x
Closes gh-29902
2022-02-18 11:23:28 +00:00