15436 Commits

Author SHA1 Message Date
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
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
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
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
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
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
6bea2172cb Switch tests to properties that are not deprecated
Closes gh-29488
2022-01-19 19:08:31 +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
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
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
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
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
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