Commit Graph

16491 Commits

Author SHA1 Message Date
Andy Wilkinson 3630952f7b Merge branch '2.5.x' into 2.6.x
Closes gh-30022
2022-03-01 17:49:14 +00:00
Andy Wilkinson a265f150ac Improve parsing of numeric default values
Previously, all integral numbers were parsed as integers. This
caused two problems:

1. Compilation would fail if the default value for a long wasn't a
   valid integer.
2. The default value for a byte or short could be out of range,
   resulting in the generation of invalid metadata and an error
   that could have been caught at compile time not being caught
   until runtime.

This commit updates the parsing of all numeric values to use the
parse method of the target primitive type. For example,
Short.parseShort(String) is now used to parse a short.

Fixes gh-30020
2022-03-01 17:38:19 +00:00
Moritz Halbritter 0072cc807c Suppress deprecation warnings caused by micrometer backwards compatability 2022-03-01 14:00:27 +01:00
Andy Wilkinson 97c47123d5 Merge branch '2.6.x' into 2.7.x
Closes gh-30019
2022-03-01 12:35:57 +00:00
Andy Wilkinson c8b849e2f6 Merge branch '2.5.x' into 2.6.x
Closes gh-30018
2022-03-01 12:32:07 +00:00
Andy Wilkinson 355f80ab98 Add links to Spring Boot for Apache Geode and its documentation
Closes gh-29697
2022-03-01 12:13:58 +00:00
Moritz Halbritter 9c958669f4 Add io.micrometer:micrometer-binders as dependency to the test suite 2022-03-01 11:56:43 +01:00
Moritz Halbritter 7897a913a7 Start building against Micrometer 1.9.0-M4 snapshots
Micrometer duplicated the binders in a separate module named
micrometer-binders, and marked the binders in the core module as
deprecated. This commit changes the imports to use the new binders in
the micrometer-binders module. Additionally, the auto-configurations
honor user-supplied beans which use the old binders in the
micrometer-core module.

See gh-30014
2022-03-01 09:20:07 +01:00
Andy Wilkinson 19b5431ba4 Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration"
See gh-29976
2022-02-28 11:16:04 +00:00
dugenkui03 5a52b36ec7 Remove redundant ResourceLoaders from GraphQL auto-configuration
See gh-29976
2022-02-28 11:16:04 +00:00
Andy Wilkinson 73d0d5bccf Merge branch '2.6.x' into 2.7.x
Closes gh-30009
2022-02-28 11:15:24 +00:00
Andy Wilkinson b379eea885 Merge branch '2.5.x' into 2.6.x
Closes gh-30008
2022-02-28 11:15:02 +00:00
Andy Wilkinson 7bc336cdc6 Use an ephemeral port to avoid potential port clash
Closes gh-30007
2022-02-28 10:54:31 +00:00
Madhura Bhave e24f5b7efd Revert "Upgrade to Embedded Mongo 3.4.1"
This reverts to Embedded Mongo 3.3.1 due to some breaking
changes in 3.4.1 and 3.4.2
2022-02-24 11:00:00 -08:00
Stephane Nicoll 90c2bf192e Upgrade to Liquibase 4.8.0
Closes gh-29987
2022-02-24 15:36:07 +01:00
Stephane Nicoll 1bb498b03c Upgrade to Flyway 8.5.1
Closes gh-29986
2022-02-24 15:36:00 +01:00
Stephane Nicoll 525d5fd6e5 Merge branch '2.6.x' into 2.7.x
Closes gh-29994
2022-02-24 15:12:36 +01:00
Stephane Nicoll 0941cfd5fe Merge branch '2.5.x' into 2.6.x
Closes gh-29993
2022-02-24 15:12:26 +01:00
Stephane Nicoll b60b5feefe Add explicit dependency on inject-api
This commit clarifies the build as a test needs inject-api and it works
only by side effect as another library has repackaged this API.

Closes gh-29990
2022-02-24 15:12:09 +01:00
Andy Wilkinson 664ecbdcc1 Polish "Add DataCouchbaseTest annotation"
See gh-29912
2022-02-24 12:05:36 +00:00
Eddú Meléndez 36e52758a7 Add DataCouchbaseTest annotation
See gh-29912
2022-02-24 11:45:09 +00:00
Andy Wilkinson 53292a1f94 Polish "Add DataElasticsearchTest annotation"
See gh-29911
2022-02-24 11:21:24 +00:00
Eddú Meléndez e22f78bc6a Add DataElasticsearchTest annotation
See gh-29911
2022-02-24 10:27:20 +00:00
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
Andy Wilkinson 0cebb332d1 Merge branch '2.5.x' into 2.6.x
Closes gh-29901
2022-02-18 11:08:21 +00:00
Andy Wilkinson ac38a5a3e9 Update javadoc to reflect move to SecurityFilterChain
Closes gh-29900
2022-02-18 11:05:48 +00:00
Andy Wilkinson fc8f55fbf4 Upgrade to OkHTTP 4.9.3
Closes gh-18506
2022-02-18 10:05:54 +00:00
Scott Frederick 42328771ad Suppress deprecation warnings for WebSecurityConfigurerAdapter
Fixes gh-29897
2022-02-17 19:06:13 -06:00
Stephane Nicoll 55fdb9f215 Upgrade to Spring HATEOAS 1.5.0-M2
Closes gh-29893
2022-02-17 19:55:15 +01:00
Moritz Halbritter 896345df23 Fix test 2022-02-17 11:56:38 +01:00
Stephane Nicoll 828d4cebee Upgrade to Spring Framework 5.3.16
Closes gh-29761
2022-02-17 11:13:20 +01:00
Stephane Nicoll 5b58d1bfca Upgrade to Spring Framework 5.3.16
Closes gh-29719
2022-02-17 11:12:37 +01:00
Stephane Nicoll b1cfa402e8 Upgrade to Spring Framework 5.3.16
Closes gh-29709
2022-02-17 11:11:57 +01:00
Moritz Halbritter 7c96294641 Move our auto-configurations from spring.factories to new file
Closes gh-29873
2022-02-17 10:18:46 +01:00
Stephane Nicoll 553801bd9d Upgrade to Micrometer 1.9.0-M3
Closes gh-29763
2022-02-17 10:02:09 +01:00
Stephane Nicoll 6c82bb2e6f Upgrade to Micrometer 1.8.3
Closes gh-29718
2022-02-17 10:00:41 +01:00
Stephane Nicoll 0fba81adf0 Upgrade to Micrometer 1.7.9
Closes gh-29708
2022-02-17 09:59:40 +01:00
Stephane Nicoll 6fa8d81daf Start building against Spring HATEOAS 1.5.0-M2 snapshots
See gh-29893
2022-02-17 09:19:25 +01:00
Moritz Halbritter 7d68b58c8f Load auto-configurations from META-INF/spring-boot
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.

Adapts the AutoConfigurationImportSelector to use the new loader.

Adapts the ImportAutoConfigurationImportSelector to use the new loader.

Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.

Updates the documentation for auto-configurations and test slices.

Closes gh-29872
2022-02-17 09:17:23 +01:00
Phillip Webb c0ffb35668 Update copyright year of changed files 2022-02-16 20:43:10 -08:00
Phillip Webb 4092afc98f Polish 2022-02-16 20:42:58 -08:00
Phillip Webb a40637cb6d Merge branch '2.6.x' into 2.7.x 2022-02-16 20:30:32 -08:00
Phillip Webb 560d576a02 Polish 2022-02-16 20:30:14 -08:00
Phillip Webb 26512f8ac6 Merge branch '2.6.x' into 2.7.x 2022-02-16 20:24:59 -08:00
Phillip Webb 5b4ec32645 Merge branch '2.5.x' into 2.6.x 2022-02-16 18:56:12 -08:00
Phillip Webb c86b1330cf Update copyright year of changed files 2022-02-16 17:56:19 -08:00
Phillip Webb 9ab1b669d0 Polish 2022-02-16 17:56:07 -08:00
Andy Wilkinson ba73436ea8 Merge branch '2.6.x' into 2.7.x
Closes gh-29881
2022-02-16 14:59:39 +00:00
Andy Wilkinson 86c75b7a5c Merge branch '2.5.x' into 2.6.x
Closes gh-29880
2022-02-16 14:58:58 +00:00
Andy Wilkinson 03352b0a8c Prohibit use of APIs that prevent task configuration avoidance
Closes gh-29809
2022-02-16 14:57:47 +00:00
Stephane Nicoll 1080fad7c7 Merge branch '2.6.x' into 2.7.x 2022-02-16 14:32:42 +01:00
Stephane Nicoll 4fe0fb8913 Merge branch '2.5.x' into 2.6.x 2022-02-16 14:32:30 +01:00
Stephane Nicoll 865a829d29 Prevent upgrade to AspectJ 1.9.8 as it requires Java 11 2022-02-16 14:31:26 +01:00
Moritz Halbritter 8e99788fc8 Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
2022-02-16 13:55:16 +01:00
Andy Wilkinson 8e4484acea Merge branch '2.6.x' into 2.7.x
Closes gh-29878
2022-02-16 12:01:31 +00:00
Andy Wilkinson ce4beae12f Merge branch '2.5.x' into 2.6.x
Closes gh-29877
2022-02-16 12:01:15 +00:00
izeye 6bd6f590d3 Fix Javadoc since for ResolveMainClassName#setClasspath(Object)
See gh-29826
2022-02-16 12:00:31 +00:00
Andy Wilkinson 18e49b0269 Fix H2 R2DBC URL on Windows
Closes gh-29875
2022-02-16 11:55:11 +00:00
Moritz Halbritter 100f80d073 Add @AutoConfiguration annotation
This annotation can be used to mark auto-configurations with a dedicated
annotation. Under the hood, it's a standard @Configuration with
proxyBeanMethods set to false.

Closes gh-29870
2022-02-16 11:53:46 +01:00
Stephane Nicoll 8ae77659cd Upgrade to XmlUnit2 2.9.0
Closes gh-29869
2022-02-16 10:55:48 +01:00
Stephane Nicoll f5725df2a6 Upgrade to Versions Maven Plugin 2.9.0
Closes gh-29868
2022-02-16 10:55:47 +01:00
Stephane Nicoll 48bda615a2 Upgrade to Undertow 2.2.16.Final
Closes gh-29867
2022-02-16 10:17:50 +01:00
Stephane Nicoll bfc9094562 Upgrade to Thymeleaf 3.0.15.RELEASE
Closes gh-29866
2022-02-16 10:17:49 +01:00
Stephane Nicoll c874bfde4b Upgrade to SLF4J 1.7.36
Closes gh-29865
2022-02-16 10:17:47 +01:00
Stephane Nicoll 51fa2d4ca8 Upgrade to SendGrid 4.8.3
Closes gh-29864
2022-02-16 10:17:46 +01:00
Stephane Nicoll 976607ef02 Upgrade to Selenium HtmlUnit 3.58.0
Closes gh-29863
2022-02-16 10:17:45 +01:00
Stephane Nicoll 799ba39943 Upgrade to Selenium 4.1.2
Closes gh-29862
2022-02-16 10:17:44 +01:00
Stephane Nicoll a26c99e23a Upgrade to REST Assured 4.5.1
Closes gh-29861
2022-02-16 10:17:42 +01:00
Stephane Nicoll 0401a834e6 Upgrade to Rabbit AMQP Client 5.14.2
Closes gh-29860
2022-02-16 10:17:41 +01:00
Stephane Nicoll 361e624b0a Upgrade to Prometheus Client 0.15.0
Closes gh-29859
2022-02-16 10:17:40 +01:00
Stephane Nicoll b6d0d9a743 Upgrade to Postgresql 42.3.3
Closes gh-29858
2022-02-16 10:17:39 +01:00
Stephane Nicoll 7198e46cff Upgrade to Oracle Database 21.5.0.0
Closes gh-29857
2022-02-16 10:17:37 +01:00
Stephane Nicoll 2363ae3ef2 Upgrade to Netty tcNative 2.0.48.Final
Closes gh-29856
2022-02-16 10:17:36 +01:00
Stephane Nicoll 5e85917ae7 Upgrade to Netty 4.1.74.Final
Closes gh-29855
2022-02-16 10:17:35 +01:00
Stephane Nicoll ecaca8cff8 Upgrade to Neo4j Java Driver 4.4.3
Closes gh-29854
2022-02-16 10:17:34 +01:00
Stephane Nicoll 56f4bb610d Upgrade to MongoDB 4.5.0
Closes gh-29853
2022-02-16 10:17:32 +01:00
Stephane Nicoll 398821c66b Upgrade to Mockito 4.3.1
Closes gh-29852
2022-02-16 10:17:31 +01:00
Stephane Nicoll d6c22435bb Upgrade to Maven Javadoc Plugin 3.3.2
Closes gh-29851
2022-02-16 10:17:30 +01:00
Stephane Nicoll 1538bb78b4 Upgrade to Maven Compiler Plugin 3.10.0
Closes gh-29850
2022-02-16 10:17:29 +01:00
Stephane Nicoll ba9047e6ae Upgrade to Liquibase 4.7.1
Closes gh-29849
2022-02-16 10:17:28 +01:00
Stephane Nicoll 06bc52d727 Upgrade to Elasticsearch 7.17.0
Closes gh-29848
2022-02-16 10:17:26 +01:00
Stephane Nicoll 76797c4ecb Upgrade to Kafka 3.1.0
Closes gh-29700
2022-02-16 10:08:59 +01:00
Stephane Nicoll 3b7641c84d Upgrade to Json-smart 2.4.8
Closes gh-29846
2022-02-16 09:46:11 +01:00
Stephane Nicoll 7c3b31fd77 Upgrade to Json Path 2.7.0
Closes gh-29845
2022-02-16 09:46:11 +01:00
Stephane Nicoll 26d6c56865 Upgrade to Johnzon 1.2.16
Closes gh-29844
2022-02-16 09:46:11 +01:00
Stephane Nicoll 719fb2e8e5 Upgrade to Jetty 9.4.45.v20220203
Closes gh-29843
2022-02-16 09:46:10 +01:00
Stephane Nicoll f4edcef3e0 Upgrade to Jetty Reactive HTTPClient 1.1.11
Closes gh-29842
2022-02-16 09:41:15 +01:00
Stephane Nicoll e1b54677a3 Upgrade to Infinispan 13.0.6.Final
Closes gh-29841
2022-02-16 09:41:14 +01:00
Stephane Nicoll 8d7c215768 Upgrade to HttpClient5 5.1.3
Closes gh-29840
2022-02-16 09:41:13 +01:00
Stephane Nicoll eb84ac3298 Upgrade to HtmlUnit 2.58.0
Closes gh-29839
2022-02-16 09:41:11 +01:00
Stephane Nicoll a6fcb4c8f7 Upgrade to Hibernate Validator 6.2.2.Final
Closes gh-29838
2022-02-16 09:41:10 +01:00
Stephane Nicoll 334f198353 Upgrade to Hibernate 5.6.5.Final
Closes gh-29837
2022-02-16 09:41:09 +01:00
Stephane Nicoll 197162b2bb Upgrade to Gson 2.9.0
Closes gh-29836
2022-02-16 09:41:08 +01:00
Stephane Nicoll bc112fe61b Upgrade to Glassfish JAXB 2.3.6
Closes gh-29835
2022-02-16 09:41:07 +01:00
Stephane Nicoll 06ddffed06 Upgrade to Flyway 8.5.0
Closes gh-29834
2022-02-16 09:41:05 +01:00
Stephane Nicoll c6f527b58e Upgrade to Embedded Mongo 3.3.1
Closes gh-29833
2022-02-16 09:41:03 +01:00
Stephane Nicoll 05e95de028 Upgrade to Dropwizard Metrics 4.2.8
Closes gh-29832
2022-02-16 09:41:02 +01:00
Stephane Nicoll 306c090dbe Upgrade to Couchbase Client 3.2.5
Closes gh-29831
2022-02-16 09:41:01 +01:00
Stephane Nicoll 17e3bfa016 Upgrade to Byte Buddy 1.12.8
Closes gh-29830
2022-02-16 09:40:59 +01:00
Stephane Nicoll bd70fca004 Upgrade to Artemis 2.19.1
Closes gh-29829
2022-02-16 09:40:58 +01:00
Stephane Nicoll 84c3b9e911 Upgrade to ActiveMQ 5.16.4
Closes gh-29828
2022-02-16 09:40:57 +01:00
Stephane Nicoll 197203968a Merge branch '2.6.x' into 2.7.x
Closes gh-29823
2022-02-15 16:20:45 +01:00
Stephane Nicoll f59e442978 Merge branch '2.5.x' into 2.6.x
Closes gh-29822
2022-02-15 16:19:59 +01:00
Stephane Nicoll f3af035941 Remove usage of SocketUtils in tests
Closes gh-29821
2022-02-15 16:17:21 +01:00
Stephane Nicoll 2b9d393c48 Upgrade to Reactor 2020.0.16
Closes gh-29760
2022-02-15 15:10:43 +01:00
Stephane Nicoll 863b23e7a8 Upgrade to Reactor 2020.0.16
Closes gh-29717
2022-02-15 15:10:11 +01:00
Stephane Nicoll f180397998 Upgrade to Reactor 2020.0.16
Closes gh-29707
2022-02-15 15:09:21 +01:00
Andy Wilkinson a513dbb797 Merge branch '2.6.x' into 2.7.x
Closes gh-29818
2022-02-15 12:24:38 +00:00
Andy Wilkinson f134358c78 Merge branch '2.5.x' into 2.6.x
Closes gh-29817
2022-02-15 12:24:05 +00:00
Andy Wilkinson c84b35c460 Polish "Avoid using Gradle APIs that trigger eager task creation"
See gh-29762
2022-02-15 08:36:29 +00:00
Lars Grefer 7cd87acd73 Avoid using Gradle APIs that trigger eager task creation
See gh-29762
2022-02-15 08:24:14 +00:00
Andy Wilkinson 15f4b6c263 Merge branch '2.6.x' into 2.7.x
Closes gh-29808
2022-02-14 14:48:49 +00:00
Andy Wilkinson 64e24a0e11 Merge branch '2.5.x' into 2.6.x
Closes gh-29807
2022-02-14 14:48:30 +00:00
dreis2211 39394b9c2b Link to Integration section of the appendix for Kafka properties
See gh-29758
2022-02-14 14:25:40 +00:00
Stephane Nicoll f6a0fd5938 Upgrade to Undertow 2.2.16.Final
Closes gh-29804
2022-02-14 13:43:45 +01:00
Stephane Nicoll 72fad9843a Upgrade to Thymeleaf 3.0.15.RELEASE
Closes gh-29802
2022-02-14 13:43:45 +01:00
Stephane Nicoll 775ada2001 Upgrade to SLF4J 1.7.36
Closes gh-29801
2022-02-14 13:43:45 +01:00
Stephane Nicoll 4a88b521a8 Upgrade to Postgresql 42.3.2
Closes gh-29800
2022-02-14 13:43:45 +01:00
Stephane Nicoll b73c67e53e Upgrade to Netty tcNative 2.0.48.Final
Closes gh-29799
2022-02-14 13:43:44 +01:00
Stephane Nicoll 185c4968c2 Upgrade to Netty 4.1.74.Final
Closes gh-29798
2022-02-14 13:43:44 +01:00
Stephane Nicoll bb336e5e7b Upgrade to Neo4j Java Driver 4.4.3
Closes gh-29797
2022-02-14 13:43:44 +01:00
Stephane Nicoll 57bc5136f5 Upgrade to MongoDB 4.4.2
Closes gh-29796
2022-02-14 13:43:44 +01:00
Stephane Nicoll dd293cd86c Upgrade to Maven Javadoc Plugin 3.3.2
Closes gh-29795
2022-02-14 13:43:44 +01:00
Stephane Nicoll b1160d676d Upgrade to Json-smart 2.4.8
Closes gh-29794
2022-02-14 13:43:44 +01:00
Stephane Nicoll 82a0491afd Upgrade to Johnzon 1.2.16
Closes gh-29793
2022-02-14 13:43:44 +01:00
Stephane Nicoll dc171c6462 Upgrade to Jetty 9.4.45.v20220203
Closes gh-29791
2022-02-14 13:43:43 +01:00
Stephane Nicoll 96e4cbbe04 Upgrade to HttpClient5 5.1.3
Closes gh-29790
2022-02-14 13:43:43 +01:00
Stephane Nicoll f2ab9c3b10 Upgrade to Hibernate Validator 6.2.2.Final
Closes gh-29789
2022-02-14 13:43:43 +01:00
Stephane Nicoll 60cf736e28 Upgrade to Hibernate 5.6.5.Final
Closes gh-29788
2022-02-14 13:43:43 +01:00
Stephane Nicoll 7800c9b1de Upgrade to Glassfish JAXB 2.3.6
Closes gh-29787
2022-02-14 13:43:43 +01:00
Stephane Nicoll e5f399b005 Upgrade to Dropwizard Metrics 4.2.8
Closes gh-29786
2022-02-14 13:43:43 +01:00
Stephane Nicoll 7375a5f52f Upgrade to Couchbase Client 3.2.5
Closes gh-29785
2022-02-14 13:43:42 +01:00
Stephane Nicoll 7016693f0e Upgrade to Artemis 2.19.1
Closes gh-29784
2022-02-14 13:43:42 +01:00
Stephane Nicoll 32dda9e730 Upgrade to AppEngine SDK 1.9.94
Closes gh-29783
2022-02-14 13:43:42 +01:00
Stephane Nicoll 4ee7b4b25a Upgrade to Undertow 2.2.16.Final
Closes gh-29781
2022-02-14 13:43:25 +01:00
Stephane Nicoll e9eba82c6c Upgrade to Thymeleaf 3.0.15.RELEASE
Closes gh-29779
2022-02-14 13:43:24 +01:00
Stephane Nicoll 0440147f41 Upgrade to SLF4J 1.7.36
Closes gh-29778
2022-02-14 13:43:24 +01:00
Stephane Nicoll ea609ae697 Upgrade to Postgresql 42.2.25
Closes gh-29777
2022-02-14 13:43:24 +01:00
Stephane Nicoll 1c1bf932b2 Upgrade to Netty tcNative 2.0.48.Final
Closes gh-29776
2022-02-14 13:43:24 +01:00
Stephane Nicoll 66cc3e7730 Upgrade to Netty 4.1.74.Final
Closes gh-29775
2022-02-14 13:43:24 +01:00
Stephane Nicoll f29152496a Upgrade to Neo4j Java Driver 4.2.9
Closes gh-29774
2022-02-14 13:43:23 +01:00
Stephane Nicoll 4f98bfd39d Upgrade to Json-smart 2.4.8
Closes gh-29773
2022-02-14 13:43:23 +01:00
Stephane Nicoll 7de763f2d7 Upgrade to Johnzon 1.2.16
Closes gh-29772
2022-02-14 13:43:23 +01:00
Stephane Nicoll a99582a3bb Upgrade to Jetty 9.4.45.v20220203
Closes gh-29771
2022-02-14 13:43:23 +01:00
Stephane Nicoll 1cdb75f780 Upgrade to Hibernate Validator 6.2.2.Final
Closes gh-29770
2022-02-14 13:43:23 +01:00
Stephane Nicoll 2485c05a50 Upgrade to Glassfish JAXB 2.3.6
Closes gh-29769
2022-02-14 13:43:23 +01:00
Stephane Nicoll 6c09d4d7a1 Upgrade to Dropwizard Metrics 4.1.30
Closes gh-29768
2022-02-14 13:43:22 +01:00
Stephane Nicoll 81aec09357 Upgrade to AppEngine SDK 1.9.94
Closes gh-29767
2022-02-14 13:43:22 +01:00
Andy Wilkinson 25e75c60ee Merge branch '2.6.x' into 2.7.x
Closes gh-29806
2022-02-14 12:32:47 +00:00
Andy Wilkinson 85d14cdb2c Merge branch '2.5.x' into 2.6.x
Closes gh-29805
2022-02-14 12:32:32 +00:00
Andy Wilkinson 1fd4a4d86b Remove code related to unsupported versions of Gradle
Closes gh-29681
2022-02-14 12:31:21 +00:00
Stephane Nicoll 15e14e23c9 Start building against Spring Kafka 2.8.3 snapshots
See gh-29759
2022-02-14 08:22:13 +01:00
Stephane Nicoll d925c8d317 Start building against Spring Security 5.7.0-M2 snapshots
See gh-29766
2022-02-14 08:21:00 +01:00
Stephane Nicoll b2659f5da8 Start building against Spring Data 2021.2.0-M3 snapshots
See gh-29765
2022-02-14 08:20:28 +01:00
Stephane Nicoll 76039f3464 Start building against Spring LDAP 2.4.0-M2 snapshots
See gh-29764
2022-02-14 08:20:03 +01:00
Stephane Nicoll 137bcd98b6 Start building against Micrometer 1.9.0-M3 snapshots
See gh-29763
2022-02-14 08:19:31 +01:00
Stephane Nicoll e1c5f219ca Start building against Spring Framework 5.3.16 snapshots
See gh-29761
2022-02-13 18:41:20 +01:00
Stephane Nicoll 9601a3e6bf Start building against Reactor 2020.0.16 snapshots
See gh-29760
2022-02-13 18:40:23 +01:00
Stephane Nicoll 00279b6928 Merge branch '2.6.x' into 2.7.x 2022-02-13 18:15:57 +01:00
Stephane Nicoll bd6cb5c915 Merge branch '2.5.x' into 2.6.x 2022-02-13 18:15:48 +01:00
Stephane Nicoll 1f01345057 Fix assertion due to toString change in Spring Framework 2022-02-13 18:01:00 +01:00
Scott Frederick db6ef0e802 Exclude duplicate properties file when building a jar from jars
See gh-29670 and gh-23955
2022-02-11 15:31:20 -06:00
Scott Frederick f80490bafb Precompute Spring Boot version at build time
Closes gh-29670
2022-02-11 14:44:28 -06:00
Andy Wilkinson 76510fae48 Merge branch '2.6.x' into 2.7.x
Closes gh-29752
2022-02-11 15:37:32 +00:00
Andy Wilkinson 09f51f38d6 Update docs to reflect use of CamelCaseToUnderscoresNamingStrategy
Closes gh-29743
2022-02-11 15:37:10 +00:00
Andy Wilkinson 197112e1bc Merge branch '2.6.x' into 2.7.x
Closes gh-29751
2022-02-11 14:14:59 +00:00
Andy Wilkinson 4b33ea733e Merge branch '2.5.x' into 2.6.x
Closes gh-29750
2022-02-11 14:14:43 +00:00
Andy Wilkinson 387795d4db Remove trailing space from media type for ots mapping
The regular expression in the new test is intended to match the
documented [1] ABNF for a media type:

    type-name = reg-name
    subtype-name = reg-name

    reg-name = 1*127reg-name-chars
    reg-name-chars = ALPHA / DIGIT / "!" /
                     "#" / "$" / "&" / "." /
                     "+" / "-" / "^" / "_"

Closes gh-29746

[1] https://datatracker.ietf.org/doc/html/rfc4288#section-4.2
2022-02-11 14:09:53 +00:00
Andy Wilkinson da61545925 Merge branch '2.6.x' into 2.7.x
Closes gh-29749
2022-02-11 13:34:51 +00:00
Andy Wilkinson 646bb05c8d Merge branch '2.5.x' into 2.6.x
Closes gh-29748
2022-02-11 13:34:40 +00:00
Andy Wilkinson c3eee4ad68 Align Gradle's plugin's META-INF repackaging with Maven plugin's
Closes gh-28562
2022-02-11 13:32:52 +00:00
Andy Wilkinson 0c15fab881 Merge branch '2.6.x' into 2.7.x
Closes gh-29744
2022-02-11 12:26:15 +00:00
Andy Wilkinson b74f668254 Only auto-configure WebSessionIdResolver in reactive web app
Closes gh-29669
2022-02-11 12:09:45 +00:00
Andy Wilkinson 480904f4dc Merge branch '2.6.x' into 2.7.x
Closes gh-29742
2022-02-11 11:36:12 +00:00
Andy Wilkinson bb7fa9f545 Merge branch '2.5.x' into 2.6.x
Closes gh-29741
2022-02-11 11:35:47 +00:00
Andy Wilkinson c46b45a1e3 Add dependency management for liquibase-cdi
Closes gh-29676
2022-02-11 11:34:51 +00:00
Stephane Nicoll d8454f8758 Start building against Spring Session 2021.1.2 snapshots
See gh-29725
2022-02-11 10:10:12 +01:00
Stephane Nicoll 9006fdec50 Start building against Spring Batch 4.3.5 snapshots
See gh-29724
2022-02-11 10:10:12 +01:00
Stephane Nicoll 56ed5fb68c Start building against Spring Security 5.6.2
See gh-29723
2022-02-11 10:10:12 +01:00
Stephane Nicoll 1ce07cfe2b Start building against Spring Data 2021.1.2 snapshots
See gh-29721
2022-02-11 09:35:25 +01:00
Stephane Nicoll 2b87d8364d Start building against Spring LDAP 2.3.6 snapshots
See gh-29720
2022-02-11 09:35:01 +01:00
Stephane Nicoll f6cf198767 Start building against Spring Framework 5.3.16 snapshots
See gh-29719
2022-02-11 09:34:35 +01:00
Stephane Nicoll cebba5a6d0 Start building against Micrometer 1.8.3 snapshots
See gh-29718
2022-02-11 09:34:14 +01:00
Stephane Nicoll 0297437fc5 Start building against Reactor 2020.0.16 snapshots
See gh-29717
2022-02-11 09:33:13 +01:00
Stephane Nicoll e242dc5ce8 Start building against Spring Session 2021.0.5 snapshots
See gh-29715
2022-02-11 09:29:06 +01:00
Stephane Nicoll 7afd33589f Start building against Spring Batch 4.3.5 snapshots
See gh-29714
2022-02-11 09:28:41 +01:00
Stephane Nicoll 3c3ebafa31 Start building against Spring Security 5.5.5 snapshots
See gh-29713
2022-02-11 09:28:17 +01:00
Stephane Nicoll b892bb4415 Start building against Spring Kafka 2.7.11 snapshots
See gh-29712
2022-02-11 09:27:52 +01:00
Stephane Nicoll cd94b27f2d Start building against Spring Data 2021.0.9 snapshots
See gh-29711
2022-02-11 09:27:28 +01:00
Stephane Nicoll 29d502da5b Start building against Spring LDAP 2.3.6 snapshots
See gh-29710
2022-02-11 09:27:05 +01:00
Stephane Nicoll d15149c1a3 Start building against Spring Framework 5.3.16 snapshots
See gh-29709
2022-02-11 09:26:35 +01:00
Stephane Nicoll 0f630debb3 Start building against Micrometer 1.7.9 snapshots
See gh-29708
2022-02-11 09:26:11 +01:00
Stephane Nicoll 5767e1fda1 Start building against Reactor 2020.0.16 snapshots
See gh-29707
2022-02-11 09:25:38 +01:00
Andy Wilkinson fc23310144 Merge branch '2.6.x' into 2.7.x
Closes gh-29734
2022-02-10 17:13:56 +00:00
Andy Wilkinson fc5ede7b94 Polish "Auto-configure Spring rather than Nimbus opaque token introspectors"
See gh-29572
2022-02-10 17:11:04 +00:00
Andy Wilkinson d6ebce4ccf Merge branch '2.5.x' into 2.6.x
Closes gh-29733
2022-02-10 17:02:39 +00:00
Andy Wilkinson 6901f6dab2 Test our Gradle plugin against Gradle 7.4
Closes gh-29673
2022-02-10 16:57:13 +00:00
Lukas Kuster 131ea706c7 Auto-configure Spring rather than Nimbus opaque token introspectors
See gh-29572
2022-02-10 16:50:06 +00:00
Andy Wilkinson 4f724f14d3 Polish "Override available() in RandomAccessDataFile's InputStream"
See gh-29295
2022-02-10 15:25:01 +00:00
Gnaily 49bf620f4b Override available() in RandomAccessDataFile's InputStream
See gh-29295
2022-02-10 15:23:19 +00:00
Andy Wilkinson c761dc517b Merge branch '2.6.x' into 2.7.x
Closes gh-29732
2022-02-10 15:05:15 +00:00
Andy Wilkinson 197ba9ebc9 Merge branch '2.5.x' into 2.6.x
Closes gh-29731
2022-02-10 15:04:58 +00:00
Andy Wilkinson 64ee54423a Polish "Configure ForwardedHeaderFilter with Tomcat's use relative redirects"
See gh-29333
2022-02-10 15:01:57 +00:00
Guirong Hu cec69feb95 Configure ForwardedHeaderFilter with Tomcat's use relative redirects
Previously, when Tomcat was configured to use relative redirects
and the ForwardedHeaderFilter is in use, the filter would ignore
the use of the relative redirects.

This commit corrects this misalignment by applying Tomcat's use
relative redirects setting to the filter, but only when Tomcat is
being used as the servlet container.

See gh-29333
2022-02-10 15:01:56 +00:00
Moritz Halbritter 96ce8d842e Merge branch '2.6.x' into 2.7.x
Closes gh-29729
2022-02-10 13:38:50 +01:00
Moritz Halbritter 44ff29c4d4 Merge branch '2.5.x' into 2.6.x
Closes gh-29728
2022-02-10 13:28:15 +01:00
Moritz Halbritter 096ba72a39 Add documentation for WebMvc.fn
See gh-29683
2022-02-10 13:14:34 +01:00
Andy Wilkinson e4b074f07b Merge branch '2.6.x' into 2.7.x 2022-02-09 13:37:50 +00:00
Andy Wilkinson f672a20f90 Polish appendix cross-references
See gh-29689
2022-02-09 13:24:05 +00:00
Moritz Halbritter 94d095ce1a Merge branch '2.6.x' into 2.7.x
Closes gh-29692
2022-02-09 14:10:41 +01:00
Moritz Halbritter 079ea41d6d Merge branch '2.5.x' into 2.6.x
Closes gh-29691
2022-02-09 14:09:33 +01:00
Moritz Halbritter 262db65a38 Ignore invalid stream types when reading log update events
See gh-29675
2022-02-09 14:03:02 +01:00
Andy Wilkinson 7e8d499333 Merge branch '2.6.x' into 2.7.x
Closes gh-29690
2022-02-09 12:18:57 +00:00
Andy Wilkinson 093e8a524d Merge branch '2.5.x' into 2.6.x
Closes gh-29689
2022-02-09 12:18:35 +00:00
Moritz Halbritter 52d9ba58d8 Move appendix subsections under appendix section
This involved a small code change to the generated configuration
properties snippets. The section id has to start with
'appendix.', otherwise the section-id asciidoctor extension
complains. To ensure that the anchors that are derived from the
section IDs remain backwards compatible, the anchor-rewrite
properties have been updated.

See gh-29667
2022-02-09 12:04:05 +00:00
Andy Wilkinson 665e1f665e Merge branch '2.6.x' into 2.7.x
Closes gh-29688
2022-02-09 11:35:03 +00:00
Andy Wilkinson b46eba16e6 Merge branch '2.5.x' into 2.6.x
Closes gh-29687
2022-02-09 11:34:51 +00:00
Andy Wilkinson 48fe1513fe Test documented build script snippets when they change
Closes gh-29684
2022-02-09 11:33:40 +00:00
Andy Wilkinson 1e16c2f229 Merge branch '2.6.x' into 2.7.x
Closes gh-29686
2022-02-09 11:32:43 +00:00
Andy Wilkinson c0664efa86 Merge branch '2.5.x' into 2.6.x
Closes gh-29685
2022-02-09 11:32:32 +00:00
Mike Partridge 2e9dcdd96d Replace use of classifier with archiveClassifier
classifier has been deprecated so the docs should be using its
replacement, archiveClassifier, instead.

See gh-29611
2022-02-09 11:31:22 +00:00
Andy Wilkinson 41863d4b80 Merge branch '2.6.x' into 2.7.x
Closes gh-29680
2022-02-08 19:21:59 +00:00
Andy Wilkinson 358cdb33f7 Merge branch '2.5.x' into 2.6.x
Closes gh-29679
2022-02-08 19:21:48 +00:00
Andy Wilkinson 43ca2d2cb0 Access classpath lazily to allow later changes to be picked up
Previously, the classpath of bootJar, bootWar, and bootRun was
configured directly as a FileCollection derived from the main source
set's runtime classpath. This direct configuration meant that
subsequent changes to the main source set's runtime classpath may not
have been picked up.

This commit changes the configuration of the classpath to use a
Callable. This indirection allows subsequent changes to the main
source set's runtime classpath to be picked up as long as they
occur before Gradle calls the callable.

Closes gh-29672
2022-02-08 19:21:37 +00:00
Phillip Webb 26dd6b826c Merge branch '2.6.x' into 2.7.x 2022-02-05 10:16:19 -08:00
Phillip Webb b3a82c9de6 Merge branch '2.5.x' into 2.6.x 2022-02-05 10:16:03 -08:00
Phillip Webb 52f1799c20 Polish formatting 2022-02-05 10:15:43 -08:00
Stephane Nicoll 098a57affb Upgrade to R2DBC Borca-RELEASE
See gh-28524
2022-02-05 13:37:20 +01:00
Stephane Nicoll 8c8c9c5f28 Upgrade to H2 2.1.210
H2 2.x contains several important changes such as moving the primary key
generation mechanism to a sequence-based identifier. This commit fixes
a number of tests that were failing.

Closes gh-29651

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
2022-02-05 13:36:53 +01:00
Stephane Nicoll 5f7657508f Start building against Spring Batch 4.3.5 snapshots
See gh-29652
2022-02-05 13:36:38 +01:00
Andy Wilkinson 2fec7b8562 Only use Kotlin 1.6 API and language versions in docs project
To preserve our existing Kotlin 1.3 baseline, we should compile our
Kotlin code with Kotlin 1.3 API and language versions. At the same
time, we want our documentation to use modern Kotlin. This commit
restores the 1.3 convention and overrides it to 1.6 in the docs
project. This maintains our Kotlin 1.3 baseline while also allowing
the Kotlin code examples to use 1.6 API and language features.

Closes gh-29654
2022-02-05 09:54:00 +00:00
Phillip Webb d212243eef Polish 'Add Kotlin alternatives to Java documentation samples'
See gh-29499
2022-02-04 19:57:21 -08:00
Pavel Semyonov 197afff1d6 Add Kotlin alternatives to Java documentation samples
See gh-29499
2022-02-04 19:56:13 -08:00
Phillip Webb 0e906dc6e2 Use convention based code imports
Closes gh-29647
2022-02-04 19:46:44 -08:00
Phillip Webb 71695d2162 Merge branch '2.6.x' into 2.7.x
Closes gh-29658
2022-02-04 19:44:31 -08:00
Phillip Webb 05c58a18df Merge branch '2.5.x' into 2.6.x
Closes gh-29657
2022-02-04 19:44:05 -08:00
Phillip Webb 12a33a2eaf Upgrade to spring-asciidoctor-backends 0.0.3
Closes gh-29656
2022-02-04 19:43:47 -08:00
Phillip Webb 6c74e24147 Update copyright year of changed files 2022-02-04 16:09:35 -08:00
Phillip Webb b9e037b88f Polish 2022-02-04 16:09:22 -08:00
Henning Poettker e3d0f1feee Adjust IDENTITY in DDLs for H2 2.x compatibility
See gh-29200
2022-02-04 09:57:59 +01:00
Stephane Nicoll 37c1f47902 Merge branch '2.6.x' into 2.7.x
Closes gh-29650
2022-02-04 09:53:42 +01:00
Stephane Nicoll 03d393bc4c Merge branch '2.5.x' into 2.6.x
Closes gh-29649
2022-02-04 09:50:47 +01:00
Stephane Nicoll 48649192cb Fix schema file name for Batch auto-configuration tests
Closes gh-29648
2022-02-04 09:49:15 +01:00
Phillip Webb 4919683354 Use consistent packages for doc samples
Closes gh-29646
2022-02-03 22:50:47 -08:00
Phillip Webb a05903b9d1 Polish GraphQL auto-configuration 2022-02-02 12:57:17 -08:00
Phillip Webb ce08b519b1 Merge branch '2.6.x' into 2.7.x 2022-02-02 10:37:55 -08:00
Phillip Webb 50e0e28155 Merge branch '2.5.x' into 2.6.x 2022-02-02 10:37:32 -08:00
Phillip Webb 2b40ce09d8 Update copyright year of changed files 2022-02-02 10:35:40 -08:00
Phillip Webb 5975cdc5ed Polish formatting 2022-02-02 10:35:10 -08:00
Stephane Nicoll 9028ab33f2 Merge branch '2.6.x' into 2.7.x
Closes gh-29617
2022-02-01 16:35:28 +01:00
Stephane Nicoll d130819fb4 Merge branch '2.5.x' into 2.6.x
Closes gh-29616
2022-02-01 16:35:19 +01:00
Stephane Nicoll 5fe6176966 Polish "Add a note on early init with @ConditionalOnExpression"
See gh-29276
2022-02-01 16:32:27 +01:00
Mihail Cornescu fce3cd1684 Add a note on early init with @ConditionalOnExpression
See gh-29276
2022-02-01 16:24:13 +01:00
Stephane Nicoll 067af65152 Fix formatting violations 2022-02-01 13:52:06 +01:00
Stephane Nicoll f812b33cbd Merge branch '2.6.x' into 2.7.x
Closes gh-29613
2022-02-01 11:07:31 +01:00
Stephane Nicoll 136b5959c3 Merge branch '2.5.x' into 2.6.x
Closes gh-29612
2022-02-01 10:59:08 +01:00
Stephane Nicoll 7f17f819a6 Polish "Enforce use of BDDMockito"
See gh-29178
2022-02-01 10:03:18 +01:00
Yanming Zhou b49418aaaf Enforce use of BDDMockito
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
2022-02-01 09:37:15 +01:00
Stephane Nicoll 19e671dd7b Merge branch '2.6.x' into 2.7.x 2022-01-31 16:45:04 +01:00
Stephane Nicoll 787a2f3d9b Merge branch '2.5.x' into 2.6.x 2022-01-31 16:44:39 +01:00
Stephane Nicoll ab0b29cb53 Polish "Make classloader customization easier to discover"
See gh-29438
2022-01-31 16:38:38 +01:00
Andreas Ahlenstorf 96f48db2ab Make classloader customization easier to discover
See gh-29438
2022-01-31 16:28:28 +01:00
Stephane Nicoll 7bebfd06b8 Merge branch '2.6.x' into 2.7.x
Closes gh-29601
2022-01-31 16:24:40 +01:00
Stephane Nicoll f1dc7e7b78 Merge branch '2.5.x' into 2.6.x
Closes gh-29600
2022-01-31 16:24:29 +01:00
Stephane Nicoll 0d78ff0657 Polish "Use a timeout when joining threads in HttpTunnelServerTests"
See gh-29522
2022-01-31 16:22:28 +01:00
Leo Li 940d969c7c Use a timeout when joining threads in HttpTunnelServerTests
See gh-29522
2022-01-31 16:01:04 +01:00
Stephane Nicoll 0c0ec64ed4 Polish "Use existing constant rather than "spring.beaninfo.ignore""
See gh-29592
2022-01-29 15:39:43 +01:00
minkyu-jo 1a558292a8 Use existing constant rather than "spring.beaninfo.ignore"
See gh-29592
2022-01-29 15:39:28 +01:00
Stephane Nicoll a94b176c39 Merge branch '2.6.x' into 2.7.x
Closes gh-29595
2022-01-29 15:34:08 +01:00
izeye 118eb5f74a Polish AbstractHealthEndpointAdditionalPathIntegrationTests
See gh-29593
2022-01-29 15:33:25 +01:00
Madhura Bhave 81bbd295e9 Merge branch '2.6.x' into 2.7.x
Closes gh-29584
2022-01-27 12:04:26 -08:00
Madhura Bhave 0597c6831e Configure health on additional path only when health exposed
Prior to this commit, limiting the exposure to a specific
technology in `ConditionalOnAvailableEndpoint` would not have
any effect because all endpoints would be considered to be available
if the app was running on Cloud Foundry. This caused issues in cases
where beans were meant to be exposed only if the endpoint was actually
exposed.

This commit adds CLOUD_FOUNDRY to the `EndpointExposure`
enum. This allows `ConditionalOnAvailableEndpoint` to limit
by exposure even when the Cloud Foundry platform is active.

Fixes gh-29532
2022-01-27 11:44:54 -08:00
Phillip Webb bb024211f6 Merge branch '2.6.x' into 2.7.x
Closes gh-29565
2022-01-25 13:17:22 -08:00
Phillip Webb df9cf6b726 Make ErrorPageSecurityFilter compatible with Servlet 3.1
Ensure that all default methods are implemented so that the
filter is compatible with Servlet 3.1 environments.

Fixes gh-29558
2022-01-25 13:15:59 -08:00
Andy Wilkinson 8480abca20 Merge branch '2.6.x' into 2.7.x
Closes gh-29561
2022-01-25 12:19:37 +00:00
Andy Wilkinson fe43d527b5 Merge branch '2.5.x' into 2.6.x
Closes gh-29560
2022-01-25 12:19:16 +00:00
Andy Wilkinson 3ed65f2383 Avoid running Maven plugin ITs for each s-b-dependencies change
Closes gh-28781
2022-01-25 12:11:19 +00:00
Brian Clozel 24c5f4b7ea Merge branch '2.6.x' into 2.7.x
Closes gh-29557
2022-01-25 09:22:19 +01:00
Brian Clozel 1204c1aa32 Merge branch '2.5.x' into 2.6.x
Closes gh-29556
2022-01-25 09:21:49 +01:00
Lachlan Roberts f1bbce1aac Do not modify AliasChecks list from Jetty WebAppContext
Closes gh-29555
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-01-25 08:58:42 +01:00
Scott Frederick 698eb94913 Merge branch '2.6.x' into 2.7.x
Closes gh-29554
2022-01-24 16:20:33 -06:00
Scott Frederick 909ef6d635 Merge branch '2.5.x' into 2.6.x
Closes gh-29553
2022-01-24 16:19:43 -06:00
Scott Frederick 000cbfa2d9 Set file permissions on all created test files
Closes gh-29551
2022-01-24 16:19:20 -06:00
Stephane Nicoll f9029a3584 Merge branch '2.6.x' into 2.7.x
Closes gh-29540
2022-01-24 09:41:56 +01:00
Stephane Nicoll e36a56f014 Merge branch '2.5.x' into 2.6.x
Closes gh-29539
2022-01-24 09:41:35 +01:00
Axel Fontaine 48817587e6 Rename Boxfuse to CloudCaptain
See gh-29523
2022-01-24 09:35:44 +01:00
Stephane Nicoll ba8c76ba08 Merge branch '2.6.x' into 2.7.x
Closes gh-29538
2022-01-24 09:29:48 +01:00
Stephane Nicoll 267cd45235 Merge branch '2.5.x' into 2.6.x
Closes gh-29537
2022-01-24 09:29:31 +01:00
Janne Valkealahti d821f86b8e Upgrade reference of gradle-git-properties to 2.3.2
See gh-29535
2022-01-24 09:28:53 +01:00
Andy Wilkinson 5b95c89303 Upgrade to Solr 8.11.1
Closes gh-29517
2022-01-21 14:16:38 +00:00
Stephane Nicoll 5cbaf2ba44 Upgrade to MariaDB 2.7.5
Closes gh-29506
2022-01-20 16:43:12 +01:00
Stephane Nicoll e74eba8cea Upgrade to Hibernate 5.6.4.Final
Closes gh-29505
2022-01-20 16:43:11 +01:00
Stephane Nicoll 8d0263c329 Upgrade to Flyway 8.4.2
Closes gh-29504
2022-01-20 16:43:11 +01:00
Andy Wilkinson 2c049f2b40 Merge branch '2.6.x' into 2.7.x
Closes gh-29501
2022-01-20 12:36:49 +00:00
Madhura Bhave 3460c24a16 Ignore context path when calling privilege evaluator
Previously, the error page security filter passed the request's URI
to the privilege evaluator. This was incorrect in applications with
a custom context path as the privilege evaluator must be passed a
path that does not include the context path and the request URI
includes the context path.

This commit updates the filter to use UrlPathHelper's
pathWithinApplication instead. The path within the application does
not include the context path. In addition, pathWithinAppliation
also correctly handles applications configured with a servlet
mapping other than the default of /.

Closes gh-29299

Co-Authored-By: Andy Wilkinson <wilkinsona@vmware.com>
2022-01-20 12:36:18 +00:00
Stephane Nicoll c488be5adc Upgrade to MariaDB 2.7.5
Closes gh-29498
2022-01-20 10:53:13 +01:00
Stephane Nicoll 5dbde1b294 Upgrade to Hibernate 5.6.4.Final
Closes gh-29497
2022-01-20 10:53:11 +01:00
Stephane Nicoll 6ae5bfb728 Upgrade to MariaDB 2.7.5
Closes gh-29496
2022-01-20 10:29:26 +01:00
Phillip Webb 5b1486cc26 Merge branch '2.5.x' into 2.6.x 2022-01-19 15:54:19 -08:00
Phillip Webb d211b0f3b3 Disable test is Docker is not available
See gh-28843
2022-01-19 15:53:07 -08:00
Andy Wilkinson 1e4b786ff9 Merge branch '2.6.x' into 2.7.x
Closes gh-29489
2022-01-19 19:09:09 +00:00
Andy Wilkinson 6bea2172cb Switch tests to properties that are not deprecated
Closes gh-29488
2022-01-19 19:08:31 +00:00
Andy Wilkinson 0829dcd572 Merge branch '2.6.x' into 2.7.x
Closes gh-29486
2022-01-19 17:27:51 +00:00
Andy Wilkinson ee9c399eba Merge branch '2.5.x' into 2.6.x
Closes gh-29485
2022-01-19 17:27:36 +00:00
Andy Wilkinson 1b3d088056 Move JdbcSessionDataSourceInitializerTests into src/test/java
Closes gh-29484
2022-01-19 17:26:55 +00:00
Brian Clozel cbcc49408c Upgrade to Spring Session 2021.2.0-M1
Closes gh-29226
2022-01-19 17:40:22 +01:00
Brian Clozel 1e4e4f168d Upgrade to Spring for GraphQL 1.0.0-M5
Closes gh-29285
2022-01-19 16:46:12 +01:00
Andy Wilkinson 6fa4b942ee Merge branch '2.6.x' into 2.7.x
Closes gh-29481
2022-01-19 13:19:13 +00:00
Andy Wilkinson 52f612b3eb Merge branch '2.5.x' into 2.6.x
Closes gh-29480
2022-01-19 13:18:50 +00:00
Andy Wilkinson 9cb66d55d1 Refer to Maven Resolver rather than Aether
Closes gh-29255
2022-01-19 13:18:05 +00:00
Stephane Nicoll f510805f00 Merge branch '2.6.x' into 2.7.x
Closes gh-29479
2022-01-19 12:24:32 +01:00
Stephane Nicoll d92939e773 Merge branch '2.5.x' into 2.6.x
Closes gh-29478
2022-01-19 12:24:15 +01:00
Stephane Nicoll 4eb458f7d8 Prevent early resolution of factory beans
This commit updates DatabaseInitializationDependencyConfigurer so that
it does not inject the Environment anymore. Doing so in such a low-level
callback can lead to early resolution of factory beans. Rather, this
commit uses the EnvironmentAware callback that short-circuit dependency
resolution.

Closes gh-29475
2022-01-19 11:49:56 +01:00
Stephane Nicoll 4166429fd0 Add missing dependency management for Flyway
Closes gh-29474
2022-01-19 09:03:32 +01:00
Stephane Nicoll 6a70daa361 Upgrade to Pooled JMS 1.2.3
Closes gh-29473
2022-01-19 08:37:17 +01:00
Stephane Nicoll 92f1e119b4 Upgrade to MySQL 8.0.28
Closes gh-29472
2022-01-19 08:37:16 +01:00
Stephane Nicoll 23d3b0f8ea Upgrade to Liquibase 4.7.0
Closes gh-29471
2022-01-19 08:37:15 +01:00
Stephane Nicoll 801e7c4c03 Upgrade to Flyway 8.4.1
Closes gh-29470
2022-01-19 08:37:13 +01:00
Stephane Nicoll dad1e0b18d Upgrade to Embedded Mongo 3.2.8
Closes gh-29469
2022-01-19 08:37:11 +01:00
Stephane Nicoll 124a3219e8 Upgrade to Pooled JMS 1.2.3
Closes gh-29468
2022-01-19 08:17:20 +01:00
Stephane Nicoll 60971c6fdb Upgrade to MySQL 8.0.28
Closes gh-29467
2022-01-19 08:17:19 +01:00
Stephane Nicoll c2f8823e4e Upgrade to Spring Integration 5.5.8
Closes gh-29286
2022-01-19 08:13:28 +01:00
Stephane Nicoll aba3b1dc5f Upgrade to Spring Integration 5.5.8
Closes gh-29320
2022-01-19 08:12:33 +01:00
Stephane Nicoll cdd479556f Upgrade to Pooled JMS 1.2.3
Closes gh-29466
2022-01-19 08:12:08 +01:00
Stephane Nicoll 849fb8e435 Upgrade to Netty tcNative 2.0.47.Final
Closes gh-29465
2022-01-19 08:12:07 +01:00
Stephane Nicoll 3a043603e8 Upgrade to MySQL 8.0.28
Closes gh-29464
2022-01-19 08:12:06 +01:00
Stephane Nicoll 2782c3b077 Upgrade to Spring Integration 5.5.8
Closes gh-29314
2022-01-19 08:09:50 +01:00
Phillip Webb a77411ebd8 Merge branch '2.6.x' into 2.7.x
Closes gh-29460
2022-01-18 16:16:18 -08:00
Phillip Webb 3b4409305a Merge branch '2.5.x' into 2.6.x
Closes gh-29459
2022-01-18 16:15:20 -08:00
Phillip Webb 3d46b06e8d Fix config data placeholder resolution active document logic
Update `ConfigDataEnvironmentContributor.isActive` so that unbound
imports are no longer considered active. Prior to this commit, any
`ConfigDataEnvironmentContributor` that had `null` properties was
considered active. This is incorrect for `Kind.UNBOUND_IMPORT`
contributors since we haven't yet bound the `spring.config.*`
properties.

The `ConfigDataEnvironmentContributorPlaceholdersResolver` has been
updated to handle the refined logic. A placeholder can now be resolved
from the current contributor, or from an unbound contributor by binding
it on the fly.

Fixes gh-29386
2022-01-18 16:14:52 -08:00
Andy Wilkinson 654d142c95 Merge branch '2.6.x' into 2.7.x
Closes gh-29455
2022-01-18 20:35:06 +00:00
Andy Wilkinson 4ee260aa8c Merge branch '2.5.x' into 2.6.x
Closes gh-29454
2022-01-18 20:34:51 +00:00
Andy Wilkinson 1c6471ef60 Register AprLifecycleListener with Server not Context
Fixes gh-28814
2022-01-18 20:34:08 +00:00
Stephane Nicoll 5c9e59493d Upgrade to Spring Data 2021.2.0-M2
Closes gh-29223
2022-01-18 09:57:10 +01:00
rstoyanchev 68f4938367 Update GraphQL QBE auto-config
This change is the same as 68806bfef8
for Querydsl, but applied also to the Query By Example auto config.

Closes gh-29445
2022-01-18 09:50:31 +01:00
Andy Wilkinson e23aaba32b Merge branch '2.6.x' into 2.7.x
Closes gh-29323
2022-01-17 13:21:19 +00:00
Andy Wilkinson 27cd1c06a6 Merge branch '2.5.x' into 2.6.x
Closes gh-29322
2022-01-17 13:20:29 +00:00
Andy Wilkinson 75187349e8 Upgrade to Spring REST Docs 2.0.6.RELEASE
Closes gh-29321
2022-01-17 13:05:15 +00:00
Stephane Nicoll 3bbdbd9e5f Upgrade to Spring Security 5.7.0-M1
Closes gh-29225
2022-01-17 08:47:25 +01:00
Stephane Nicoll ce6cc77ea7 Upgrade to Spring Kafka 2.8.2
Closes gh-29224
2022-01-17 08:46:43 +01:00
Stephane Nicoll 77e9047d31 Upgrade to Spring AMQP 2.4.2
Closes gh-29284
2022-01-17 08:46:16 +01:00
Stephane Nicoll a9feb923d7 Update to Spring Kafka 2.8.2
Closes gh-29319
2022-01-17 08:44:50 +01:00
Stephane Nicoll 200c05ff98 Upgrade to Spring AMQP 2.4.2
Closes gh-29318
2022-01-17 08:44:15 +01:00
Stephane Nicoll e545441f01 Upgrade to Spring Kafka 2.7.10
Closes gh-29313
2022-01-17 08:41:47 +01:00
Stephane Nicoll 2f7d62eae9 Upgrade to SLF4J 1.7.33
Closes gh-29427
2022-01-15 17:50:04 +01:00
Stephane Nicoll 781ad288b0 Upgrade to SendGrid 4.8.2
Closes gh-29426
2022-01-15 17:50:04 +01:00
Stephane Nicoll a15ff0692c Upgrade to Rabbit AMQP Client 5.14.1
Closes gh-29425
2022-01-15 17:50:04 +01:00
Stephane Nicoll 6be4146907 Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29424
2022-01-15 17:50:04 +01:00
Stephane Nicoll 0cb553c0da Upgrade to Netty tcNative 2.0.47.Final
Closes gh-29423
2022-01-15 17:50:04 +01:00
Stephane Nicoll 998c7996aa Upgrade to Netty 4.1.73.Final
Closes gh-29422
2022-01-15 17:50:03 +01:00
Stephane Nicoll 3830e7a3bb Upgrade to Neo4j Java Driver 4.4.2
Closes gh-29421
2022-01-15 17:50:03 +01:00
Stephane Nicoll 5676e796d0 Upgrade to MongoDB 4.4.1
Closes gh-29420
2022-01-15 17:50:03 +01:00
Stephane Nicoll db389d7cac Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29419
2022-01-15 17:50:03 +01:00
Stephane Nicoll da3de9684a Upgrade to Maven Compiler Plugin 3.9.0
Closes gh-29418
2022-01-15 17:50:03 +01:00
Stephane Nicoll 28ecf53762 Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29417
2022-01-15 17:50:03 +01:00
Stephane Nicoll b2c92457ab Upgrade to Jedis 3.8.0
Closes gh-29416
2022-01-15 17:50:02 +01:00
Stephane Nicoll 2c403cb0e8 Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29415
2022-01-15 17:50:02 +01:00
Stephane Nicoll cf3935073f Upgrade to Byte Buddy 1.12.7
Closes gh-29414
2022-01-15 17:50:02 +01:00
Stephane Nicoll 998a74bf97 Upgrade to Build Helper Maven Plugin 3.3.0
Closes gh-29413
2022-01-15 17:50:02 +01:00
Stephane Nicoll 388b12a048 Upgrade to Spring LDAP 2.4.0-M1
Closes gh-29222
2022-01-15 17:50:02 +01:00
Stephane Nicoll 7c85d2bc07 Upgrade to Spring HATEOAS 1.5.0-M1
Closes gh-29353
2022-01-15 15:07:27 +01:00
Phillip Webb a2e473ec31 Merge branch '2.6.x' into 2.7.x 2022-01-14 22:56:43 -08:00
Phillip Webb 6afd9b665d Merge branch '2.5.x' into 2.6.x 2022-01-14 22:56:30 -08:00
Phillip Webb bccc9c1861 Refine ConfigurationPropertySources attach logic
Refine `ConfigurationPropertySources.attach` logic to endure that
the attached or reattached source is always first.

See gh-29409
2022-01-14 22:55:26 -08:00
Phillip Webb e4e16f81ec Merge branch '2.6.x' into 2.7.x
Closes gh-29411
2022-01-14 20:33:19 -08:00
Phillip Webb 28cf6f5c59 Merge branch '2.5.x' into 2.6.x
Closes gh-29410
2022-01-14 20:33:05 -08:00
Phillip Webb 79d9549805 Fix ConfigurationPropertySources attach logic
Fix `ConfigurationPropertySources.attach` so that repeated calls to the
same source no longer create a new instance.

Fixes gh-29409
2022-01-14 20:32:34 -08:00
Phillip Webb 9c481952d8 Remove deprecated convertEnvironment method 2022-01-14 17:38:23 -08:00
Phillip Webb 9764b3eba0 Change getEnvironment() to return null by default
Update the `SpringBootContextLoader.getEnvironment()` method so that it
returns `null` rather than a new `StandardEnvironment`.

Closes gh-29405
2022-01-14 17:35:58 -08:00
Phillip Webb c84d3c14fb Allow test property sources to override command line args
Refine `SpringBootContextLoader` logic so that inline test properties
are always added above command line arguments.

Closes gh-29404
2022-01-14 16:30:28 -08:00
Phillip Webb 9278a502c7 Merge branch '2.6.x' into 2.7.x 2022-01-14 13:57:25 -08:00
Phillip Webb 14fe9347b5 Merge branch '2.5.x' into 2.6.x 2022-01-14 13:56:47 -08:00
Phillip Webb 3f7bf7d34f Modify SpringApplication Environment rather than setting it
Update `SpringBootContextLoader` so that when possible the
`SpringApplication` remains in control of creating the `Environment`
instance.

Prior to this commit, we would always create the `Environment` in the
`SpringBootContextLoader` and then call `setEnvironment` on the
`SpringApplication`. This meant that the `ApplicationEnvironment`
classes were not used and that `isCustomEnvironment` was set to `true`
so no conversion was applied.

With the updated code, an `ApplicationListener` is used to mutate the
`Environment` instance and add the required test property sources.

Fixes gh-29169
2022-01-14 13:47:22 -08:00
Brian Clozel cdee953252 Polish 2022-01-14 21:07:29 +01:00
Brian Clozel 68806bfef8 Fix build after Spring for GraphQL changes
See spring-projects/spring-graphql#244
2022-01-14 21:05:15 +01:00
Andy Wilkinson b67cc62c37 Merge branch '2.6.x' into 2.7.x
Closes gh-29402
2022-01-14 15:55:54 +00:00
Andy Wilkinson d29a5a2f43 Merge branch '2.5.x' into 2.6.x
Closes gh-29401
2022-01-14 15:55:41 +00:00
Andy Wilkinson e8cbec0836 Clarify documentation of RestTemplate customization
Closes gh-29394
2022-01-14 15:51:08 +00:00
Andy Wilkinson ece4c8ad93 Merge branch '2.6.x' into 2.7.x
Closes gh-29400
2022-01-14 15:49:39 +00:00
Andy Wilkinson 8868d34c24 Merge branch '2.5.x' into 2.6.x
Closes gh-29399
2022-01-14 15:48:57 +00:00
Andy Wilkinson d051146eb4 Use Testcontainers instead on Embedded Mongo
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.

Closes gh-28843
2022-01-14 15:48:31 +00:00
Stephane Nicoll 1666b1c284 Upgrade to Neo4j Java Driver 4.4.2
Closes gh-29398
2022-01-14 15:54:48 +01:00
Stephane Nicoll c2fa4ffd7e Upgrade to SLF4J 1.7.33
Closes gh-29397
2022-01-14 15:49:56 +01:00
Stephane Nicoll afcba76c3c Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29396
2022-01-14 15:49:55 +01:00
Stephane Nicoll dac4888137 Upgrade to Netty tcNative 2.0.47.Final
Closes gh-29395
2022-01-14 15:49:54 +01:00
Stephane Nicoll af79829cab Upgrade to Spring Data 2021.1.1
Closes gh-29317
2022-01-14 15:44:45 +01:00
Stephane Nicoll 1e44e4e52e Upgrade to Spring HATEOAS 1.4.1
Closes gh-29283
2022-01-14 15:44:16 +01:00
Stephane Nicoll 5883b22e01 Upgrade to SLF4J 1.7.33
Closes gh-29392
2022-01-14 12:21:04 +01:00
Stephane Nicoll 1e22504d21 Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29391
2022-01-14 12:21:02 +01:00
Stephane Nicoll 251f4e8a3f Upgrade to Spring AMQP 2.3.14
Closes gh-29312
2022-01-14 12:12:00 +01:00
Stephane Nicoll 777361421c Upgrade to Spring Data 2021.0.8
Closes gh-29311
2022-01-14 12:11:30 +01:00
Stephane Nicoll 37a44f45a0 Upgrade to Spring HATEOAS 1.3.7
Closes gh-29352
2022-01-14 12:10:46 +01:00
Stephane Nicoll 77a9d0b6f1 Merge branch '2.6.x' into 2.7.x
Closes gh-29381
2022-01-13 15:31:31 +01:00
Omkar Shetkar c19e192acd Fix duplicate "Logging" link
See gh-29380
2022-01-13 15:30:21 +01:00
Stephane Nicoll d82fbcb43b Upgrade to Micrometer 1.9.0-M2
Closes gh-29282
2022-01-13 14:40:27 +01:00
Stephane Nicoll 7a0f7c498f Upgrade to Spring Framework 5.3.15
Closes gh-29328
2022-01-13 14:39:51 +01:00
Stephane Nicoll 832d8845df Upgrade to Micrometer 1.8.2
Closes gh-29316
2022-01-13 14:38:40 +01:00
Stephane Nicoll f65d766fbe Upgrade to Spring Framework 5.3.15
Closes gh-29327
2022-01-13 14:38:07 +01:00
Stephane Nicoll aa0a788800 Upgrade to Micrometer 1.7.8
Closes gh-29310
2022-01-13 14:36:51 +01:00
Stephane Nicoll 5428106925 Upgrade to Spring Framework 5.3.15
Closes gh-29326
2022-01-13 14:36:10 +01:00
Stephane Nicoll 1bf13371c4 Merge branch '2.6.x' into 2.7.x
Closes gh-29378
2022-01-13 08:45:59 +01:00