root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
35,384 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

15509 Commits

Author SHA1 Message Date
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 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 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
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 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
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 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 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
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 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
Omkar Shetkar c19e192acd Fix duplicate "Logging" link 
See gh-29380
 2022-01-13 15:30:21 +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 8384019a41 Merge branch '2.5.x' into 2.6.x 
Closes gh-29377
 2022-01-13 08:45:48 +01:00
Stephane Nicoll 5f03ace40f Update copyright year of changed file 
See gh-29112
 2022-01-13 08:43:03 +01:00
izeye 74c522c745 Polish SpringBootContextLoaderTests 
See gh-29112
 2022-01-13 08:42:36 +01:00
Phillip Webb e7fe371927 Merge branch '2.5.x' into 2.6.x 2022-01-12 15:43:11 -08:00
Phillip Webb 27ad0804f5 Update copyright year of changed files 2022-01-12 15:42:25 -08:00
Phillip Webb 91d2b1b988 Merge branch '2.5.x' into 2.6.x 
Closes gh-29374
 2022-01-12 15:32:00 -08:00
Phillip Webb eb6b48fff0 Use side-effect free environment with tests rather than converting 
Refine the logic introduced in 64270eca to use a side-effect free
Environment implementation rather than converting the Environment early.

Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.

Fixes gh-29169
 2022-01-12 14:21:52 -08:00
Phillip Webb 72696cdb0f Merge branch '2.5.x' into 2.6.x 
Closes gh-29371
 2022-01-12 14:07:31 -08:00
Phillip Webb 9cf55808fb Ensure run user actually exists 
Update `launch.script` so that the `run_user` variable is only set when
the user actually exists. Prior to this commit, if the jar file was
owned by a non-existing user the startup script could fail.

Fixes gh-29370
 2022-01-12 14:05:30 -08:00
Phillip Webb 3ae7c45900 Merge branch '2.5.x' into 2.6.x 
Closes gh-29367
 2022-01-12 13:54:23 -08:00
Phillip Webb 827309f36f Upgrade to Testcontainers 1.16.2 
Closes gh-29366
 2022-01-12 13:52:43 -08:00
Stephane Nicoll ee938cf822 Upgrade to Netty 4.1.73.Final 
Closes gh-29351
 2022-01-12 14:33:55 +01:00
Stephane Nicoll d8739c463b Upgrade to MongoDB 4.4.1 
Closes gh-29350
 2022-01-12 14:33:54 +01:00
Stephane Nicoll e14c13c75f Upgrade to Maven Jar Plugin 3.2.2 
Closes gh-29349
 2022-01-12 14:33:52 +01:00
Stephane Nicoll 8cdccb6cb3 Upgrade to Logback 1.2.10 
Closes gh-29348
 2022-01-12 14:33:51 +01:00
Stephane Nicoll 61e08e3510 Upgrade to Lettuce 6.1.6.RELEASE 
Closes gh-29347
 2022-01-12 14:33:50 +01:00
Stephane Nicoll b19593ee47 Upgrade to JBoss Logging 3.4.3.Final 
Closes gh-29346
 2022-01-12 14:33:49 +01:00
Stephane Nicoll 98118bc480 Upgrade to Jaybird 4.0.5.java8 
Closes gh-29345
 2022-01-12 14:33:47 +01:00
Stephane Nicoll 838cded308 Upgrade to Infinispan 12.1.11.Final 
Closes gh-29344
 2022-01-12 14:33:46 +01:00
Stephane Nicoll 4309b78f02 Upgrade to HttpCore5 5.1.3 
Closes gh-29343
 2022-01-12 14:33:45 +01:00
Stephane Nicoll ca39780ff3 Upgrade to Netty 4.1.73.Final 
Closes gh-29341
 2022-01-12 13:51:24 +01:00
Stephane Nicoll cb1db78c37 Upgrade to Maven Jar Plugin 3.2.2 
Closes gh-29340
 2022-01-12 13:51:23 +01:00
Stephane Nicoll db9097b0d6 Upgrade to Logback 1.2.10 
Closes gh-29339
 2022-01-12 13:51:21 +01:00
Stephane Nicoll d23a665bdc Upgrade to Lettuce 6.1.6.RELEASE 
Closes gh-29338
 2022-01-12 13:51:20 +01:00
Stephane Nicoll 36811f9e1e Upgrade to JBoss Logging 3.4.3.Final 
Closes gh-29337
 2022-01-12 13:51:19 +01:00
Stephane Nicoll 7125bd3779 Upgrade to Jaybird 4.0.5.java8 
Closes gh-29336
 2022-01-12 13:51:18 +01:00
Stephane Nicoll 404fb521ec Upgrade to Infinispan 12.1.11.Final 
Closes gh-29335
 2022-01-12 13:51:17 +01:00
Stephane Nicoll 33da06cff0 Upgrade to HttpCore5 5.1.3 
Closes gh-29334
 2022-01-12 13:51:15 +01:00
Stephane Nicoll c32912f05f Start building against Spring Framework 5.3.15 snapshots 
See gh-29327
 2022-01-12 09:30:17 +01:00
Stephane Nicoll b5407e6e8e Start building against Spring Framework 5.3.15 snapshots 
See gh-29326
 2022-01-12 09:29:36 +01:00
Andy Wilkinson c211aa0ac2 Start building against Spring REST Docs 2.0.6 snapshots 
See gh-29322
 2022-01-11 20:27:19 +00:00
Andy Wilkinson 27eaaa9442 Start building against Spring REST Docs 2.0.6 snapshots 
See gh-29321
 2022-01-11 20:09:39 +00:00
Stephane Nicoll b9716ca4ee Start building against Spring Integration 5.5.8 snapshots 
See gh-29320
 2022-01-11 17:24:50 +01:00
Stephane Nicoll 504421c4a5 Start building against Spring Kafka 2.8.2 snapshots 
See gh-29319
 2022-01-11 17:24:49 +01:00
Stephane Nicoll ef4915ee55 Start building against Spring AMQP 2.4.2 snapshots 
See gh-29318
 2022-01-11 17:24:49 +01:00
Stephane Nicoll b05f435b27 Start building against Spring Data 2021.1.1 snapshots 
See gh-29317
 2022-01-11 17:24:49 +01:00
Stephane Nicoll 2da271a240 Start building against Micrometer 1.8.2 snapshots 
See gh-29316
 2022-01-11 17:24:48 +01:00
Stephane Nicoll 17b0ac61aa Upgrade to Reactor 2020.0.15 
Closes gh-29315
 2022-01-11 17:24:46 +01:00
Stephane Nicoll c2925f8e84 Start building against Spring Integration 5.5.8 snapshots 
See gh-29314
 2022-01-11 17:22:20 +01:00
Stephane Nicoll 116427c78e Start building against Spring Kafka 2.7.10 snapshots 
See gh-29313
 2022-01-11 17:22:20 +01:00
Stephane Nicoll 53fcf0971e Start building against Spring AMQP 2.3.14 snapshots 
See gh-29312
 2022-01-11 17:22:20 +01:00
Stephane Nicoll 72e72bda67 Start building against Micrometer 1.7.8 snapshots 
See gh-29310
 2022-01-11 17:22:19 +01:00
Stephane Nicoll 79fd0ad30a Upgrade to Reactor 2020.0.15 
Closes gh-29309
 2022-01-11 17:22:18 +01:00
Andy Wilkinson a6d8ff4677 Merge branch '2.5.x' into 2.6.x 
Closes gh-29268
 2022-01-05 11:58:03 +00:00
Andy Wilkinson 41b01cc289 Only write parent entries when entry is new 
Previously, when writing a repackaged jar, an attempt to write all of
an entry's parent directories would always be made, irrespective of
whether or not the entry itself had already been written. This was
inefficient as, due to the way that the jar is written, once an entry
itself has been written, we know that all of its parent directories
will also have been written.

This commit updates the jar writer so that no attempt is made to
write parent directory entries if the entry itself has already been
written.

Fixes gh-29175
 2022-01-05 11:49:48 +00:00
Phillip Webb 99a683dffb Merge branch '2.5.x' into 2.6.x 2022-01-04 12:24:02 -08:00
Phillip Webb 9a6f35cd8e Update copyright year of changed files 2022-01-04 12:23:53 -08:00
Phillip Webb 81266ca806 Merge branch '2.5.x' into 2.6.x 2022-01-04 12:17:35 -08:00
Phillip Webb 0fcdab3936 Update copyright year of changed files 2022-01-04 12:17:10 -08:00
Phillip Webb 8e583f6f73 Apply exclusion rules to child contributors 
Update `IncludeExcludeGroupMemberPredicate` so that exclusion rules are
also applied to child contributors. The restores the behavior of Spring
Boot 2.5.x where `management.endpoint.health.group.mygroup.exclude=db`
would exclude 'db/one', 'db/two' etc.

Fixes gh-29251
 2022-01-04 12:12:03 -08:00
Stephane Nicoll c469c41127 Merge branch '2.5.x' into 2.6.x 2022-01-03 09:33:23 +01:00
Stephane Nicoll 04ce0e65cd Polish assertion 2022-01-03 09:26:22 +01:00
Stephane Nicoll f54ea67ed6 Merge branch '2.5.x' into 2.6.x 
Closes gh-29198
 2022-01-02 11:25:46 +01:00
dreis2211 7a87d18b12 Update copyrights to 2022 
See gh-29195
 2022-01-02 11:24:58 +01:00
izeye d234681348 Fix default value for management.info.env.enabled in metadata 
See gh-29187
 2021-12-30 07:32:58 +01:00
Stephane Nicoll b345dddec0 Upgrade to Log4j2 2.17.1 
Closes gh-29184
 2021-12-29 11:30:25 +01:00
Stephane Nicoll 4b6aa81687 Upgrade to Log4j2 2.17.1 
Closes gh-29183
 2021-12-29 11:29:25 +01:00
izeye 7fbb5749d1 Polish 
See gh-29157
 2021-12-27 12:01:50 +01:00
Stephane Nicoll 8ee0640cc0 Merge branch '2.5.x' into 2.6.x 
Closes gh-29172
 2021-12-25 09:55:24 +01:00
izeye 9a6c1c531d Test our Gradle plugin against Gradle 7.3.3 
See gh-29161
 2021-12-25 09:52:14 +01:00
Stephane Nicoll 61c978e835 Upgrade to Spring Integration 5.5.7 
Closes gh-28975
 2021-12-21 17:11:43 +01:00
Stephane Nicoll 369046c37d Upgrade to Spring Integration 5.5.7 
Closes gh-28966
 2021-12-21 17:09:38 +01:00
Stephane Nicoll c7487749de Upgrade to Spring Session 2021.1.1 
Closes gh-28974
 2021-12-21 16:53:54 +01:00
Stephane Nicoll 2e67645fd5 Upgrade to Hazelcast 4.2.4 
Closes gh-29146
 2021-12-21 14:55:32 +01:00
Stephane Nicoll f3621702fb Upgrade to Hazelcast 4.1.8 
Closes gh-29145
 2021-12-21 14:24:50 +01:00
Stephane Nicoll a6350f2307 Upgrade to Spring Session 2021.0.4 
Closes gh-28965
 2021-12-21 14:00:18 +01:00
Stephane Nicoll b1ab3b8898 Revert "Upgrade to Spring Kafka 2.7.10" 
See gh-29114
 2021-12-21 09:30:44 +01:00
Stephane Nicoll 669710efe0 Upgrade to Spring Security 5.6.1 
Closes gh-28973
 2021-12-21 09:06:49 +01:00
Stephane Nicoll af77ee007a Upgrade to Spring Kafka 2.8.1 
Closes gh-29017
 2021-12-21 09:06:22 +01:00
Stephane Nicoll 66c43685f5 Upgrade to Spring AMQP 2.4.1 
Closes gh-28995
 2021-12-21 09:05:46 +01:00
Stephane Nicoll 44a9145bf8 Upgrade to Spring Security 5.5.4 
Closes gh-28964
 2021-12-21 09:04:47 +01:00
Stephane Nicoll 6f8e1166c6 Upgrade to Spring Kafka 2.7.10 
Closes gh-29114
 2021-12-21 09:04:05 +01:00
Stephane Nicoll b2c2e6d0ca Upgrade to Spring AMQP 2.3.13 
Closes gh-28994
 2021-12-21 09:03:40 +01:00
Scott Frederick b3a304fbe7 Merge branch '2.5.x' into 2.6.x 
Closes gh-29143
 2021-12-20 14:00:06 -06:00
Scott Frederick e4b0575a12 Do not consider bridge methods when binding java bean properties 
Fixes gh-28917
 2021-12-20 13:57:36 -06:00
Madhura Bhave 84f1a6ca09 Merge branch '2.5.x' into 2.6.x 
Closes gh-29138
 2021-12-20 09:21:08 -08:00
Madhura Bhave 99e650bd27 Document devtools remote support not available with WebFlux 
Closes gh-28955
 2021-12-20 09:19:34 -08:00
Stephane Nicoll 653fdbd0a4 Configure comment prefixes 
Closes gh-29095
 2021-12-20 17:47:50 +01:00
Stephane Nicoll 53654a0160 Merge branch '2.5.x' into 2.6.x 
Closes gh-29133
 2021-12-20 12:37:10 +01:00
Pavel Anisimov b704ee0b30 Polish reference doc 
See gh-29115
 2021-12-20 12:36:33 +01:00
Stephane Nicoll fd32ff3a51 Upgrade to XmlUnit2 2.8.4 
Closes gh-29131
 2021-12-20 10:48:31 +01:00
Stephane Nicoll fbb7f12f43 Upgrade to XmlUnit2 2.8.4 
Closes gh-29123
 2021-12-20 10:48:17 +01:00
Stephane Nicoll 64a5415edc Upgrade to Jackson Bom 2.13.1 
Closes gh-29129
 2021-12-20 10:46:31 +01:00
Stephane Nicoll d9a970a8e2 Upgrade to Infinispan 12.1.10.Final 
Closes gh-29128
 2021-12-20 10:46:30 +01:00
Stephane Nicoll a8fc4e9351 Upgrade to Hibernate 5.6.3.Final 
Closes gh-29127
 2021-12-20 10:46:29 +01:00
Stephane Nicoll 07c8ab2236 Upgrade to Ehcache3 3.9.9 
Closes gh-29126
 2021-12-20 10:46:27 +01:00
Stephane Nicoll 9ec44d80cf Upgrade to Dropwizard Metrics 4.2.7 
Closes gh-29125
 2021-12-20 10:46:25 +01:00
Stephane Nicoll 177fd6c539 Upgrade to DB2 JDBC 11.5.7.0 
Closes gh-29124
 2021-12-20 10:46:22 +01:00
Stephane Nicoll 620c6ec275 Upgrade to Infinispan 12.1.10.Final 
Closes gh-29121
 2021-12-20 09:57:12 +01:00
Stephane Nicoll d0cd7dcf60 Upgrade to Hibernate 5.4.33 
Closes gh-29120
 2021-12-20 09:57:11 +01:00
Stephane Nicoll cb81801907 Upgrade to Ehcache3 3.9.9 
Closes gh-29119
 2021-12-20 09:57:10 +01:00
Stephane Nicoll d8d97df34a Upgrade to Dropwizard Metrics 4.1.29 
Closes gh-29118
 2021-12-20 09:57:08 +01:00
Stephane Nicoll 8306287158 Upgrade to DB2 JDBC 11.5.7.0 
Closes gh-29117
 2021-12-20 09:57:06 +01:00
Stephane Nicoll bb1a1a0622 Upgrade to Spring LDAP 2.3.5 
Closes gh-28972
 2021-12-19 18:46:18 +01:00
Stephane Nicoll f619d66244 Upgrade to Spring LDAP 2.3.5 
Closes gh-28963
 2021-12-19 18:45:23 +01:00
Stephane Nicoll aab30b13b3 Start building against Spring Kafka 2.7.10 snapshots 
See gh-29114
 2021-12-19 18:30:54 +01:00
Stephane Nicoll efa93506e6 Fix checkstyle violations 2021-12-18 12:23:53 +01:00
Stephane Nicoll 012fbdd43d Upgrade to Log4j2 2.17.0 
Closes gh-28984
 2021-12-18 08:53:04 +01:00
Stephane Nicoll cb02944c71 Upgrade to Log4j2 2.17.0 
Closes gh-28983
 2021-12-18 08:52:22 +01:00
Madhura Bhave 4cc8012bfa Handle WebServerNamespace in CachingOperationInvoker 
Fixes gh-28882
 2021-12-17 17:55:06 -08:00
Madhura Bhave d9d161cd6b Allow previously authorized users to access the error page 
Prior to this commit, the `ErrorPageSecurityFilter` verified if
access to the error page was allowed by invoking the
`WebInvocationPrivilegeEvaluator` with the Authentication from the
`SecurityContextHolder`.
This meant that access to the error page was denied for a `null` Authentication
 or `AnonymousAuthenticationToken` in cases where the error page required
authenticated access. This prevented authorized users from accessing the
error page in case the Authentication wasn't retrievable for the error dispatch,
which is the case for `@Transient` authentication or stateless session policy.

This commit updates the `ErrorPageSecurityFilter` to check access to the error page
only if the error is an authn or authz error in cases where an authentication object
is not found in the SecurityContextHolder. This makes the error response consistent
when bad credentials or no credentials are used while also allowing access to previously
authorized users.

Fixes gh-28953
 2021-12-17 16:58:58 -08:00
Stephane Nicoll c077ebecf7 Merge branch '2.5.x' into 2.6.x 
Closes gh-29103
 2021-12-17 16:37:53 +01:00
Andy Wilkinson 2fec06ac7e Find annotation without initializing factory beans 
Closes gh-28977
 2021-12-17 16:08:30 +01:00
Brian Clozel 1c35ec2c3c Merge branch '2.5.x' into 2.6.x 
Closes gh-29012
 2021-12-17 12:14:31 +01:00
Brian Clozel 5d0206320a Upgrade to Logback 1.2.9 
Closes gh-29011
 2021-12-17 12:13:02 +01:00
Stephane Nicoll bcaa59ce73 Merge branch '2.5.x' into 2.6.x 
Closes gh-29098
 2021-12-17 10:50:07 +01:00
Pavel Anisimov 415c58e21b Polish CacheManager customization section in reference doc 
See gh-29094
 2021-12-17 10:48:55 +01:00
Stephane Nicoll 10362a9315 Merge branch '2.5.x' into 2.6.x 
Closes gh-29096
 2021-12-17 10:30:26 +01:00
Stephane Nicoll 8c9d398422 Test our Gradle plugin against Gradle 7.3.2 
Closes gh-29093
 2021-12-17 09:11:44 +01:00
Phillip Webb 587d6fa309 Polish 2021-12-16 13:55:42 -08:00
Phillip Webb f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08:00
Scott Frederick 92b096abbf Fix message interpolation when code is used as default message 
When `setUseCodeAsDefaultMessage(true)` was set on a message source,
attempting to interpolate the default message returned from the message
source would result in the code being unusable by upstream message
resolvers.

Fixes gh-28930
 2021-12-16 12:20:37 -06:00