079ea41d6d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29691
2022-02-09 14:09:33 +01:00
262db65a38
Ignore invalid stream types when reading log update events
...
See gh-29675
2022-02-09 14:03:02 +01:00
093e8a524d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29689
2022-02-09 12:18:35 +00:00
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
b46eba16e6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29687
2022-02-09 11:34:51 +00:00
48fe1513fe
Test documented build script snippets when they change
...
Closes gh-29684
2022-02-09 11:33:40 +00:00
c0664efa86
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29685
2022-02-09 11:32:32 +00:00
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
358cdb33f7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29679
2022-02-08 19:21:48 +00:00
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
b3a82c9de6
Merge branch '2.5.x' into 2.6.x
2022-02-05 10:16:03 -08:00
52f1799c20
Polish formatting
2022-02-05 10:15:43 -08:00
05c58a18df
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29657
2022-02-04 19:44:05 -08:00
12a33a2eaf
Upgrade to spring-asciidoctor-backends 0.0.3
...
Closes gh-29656
2022-02-04 19:43:47 -08:00
03d393bc4c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29649
2022-02-04 09:50:47 +01:00
48649192cb
Fix schema file name for Batch auto-configuration tests
...
Closes gh-29648
2022-02-04 09:49:15 +01:00
50e0e28155
Merge branch '2.5.x' into 2.6.x
2022-02-02 10:37:32 -08:00
2b40ce09d8
Update copyright year of changed files
2022-02-02 10:35:40 -08:00
5975cdc5ed
Polish formatting
2022-02-02 10:35:10 -08:00
d130819fb4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29616
2022-02-01 16:35:19 +01:00
5fe6176966
Polish "Add a note on early init with @ConditionalOnExpression"
...
See gh-29276
2022-02-01 16:32:27 +01:00
fce3cd1684
Add a note on early init with @ConditionalOnExpression
...
See gh-29276
2022-02-01 16:24:13 +01:00
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
2022-02-01 10:59:08 +01:00
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
2022-02-01 10:03:18 +01:00
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
787a2f3d9b
Merge branch '2.5.x' into 2.6.x
2022-01-31 16:44:39 +01:00
ab0b29cb53
Polish "Make classloader customization easier to discover"
...
See gh-29438
2022-01-31 16:38:38 +01:00
96f48db2ab
Make classloader customization easier to discover
...
See gh-29438
2022-01-31 16:28:28 +01:00
f1dc7e7b78
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29600
2022-01-31 16:24:29 +01:00
0d78ff0657
Polish "Use a timeout when joining threads in HttpTunnelServerTests"
...
See gh-29522
2022-01-31 16:22:28 +01:00
940d969c7c
Use a timeout when joining threads in HttpTunnelServerTests
...
See gh-29522
2022-01-31 16:01:04 +01:00
118eb5f74a
Polish AbstractHealthEndpointAdditionalPathIntegrationTests
...
See gh-29593
2022-01-29 15:33:25 +01:00
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
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
fe43d527b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29560
2022-01-25 12:19:16 +00:00
3ed65f2383
Avoid running Maven plugin ITs for each s-b-dependencies change
...
Closes gh-28781
2022-01-25 12:11:19 +00:00
1204c1aa32
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29556
2022-01-25 09:21:49 +01:00
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
909ef6d635
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29553
2022-01-24 16:19:43 -06:00
000cbfa2d9
Set file permissions on all created test files
...
Closes gh-29551
2022-01-24 16:19:20 -06:00
e36a56f014
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29539
2022-01-24 09:41:35 +01:00
48817587e6
Rename Boxfuse to CloudCaptain
...
See gh-29523
2022-01-24 09:35:44 +01:00
267cd45235
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29537
2022-01-24 09:29:31 +01:00
d821f86b8e
Upgrade reference of gradle-git-properties to 2.3.2
...
See gh-29535
2022-01-24 09:28:53 +01:00
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
c488be5adc
Upgrade to MariaDB 2.7.5
...
Closes gh-29498
2022-01-20 10:53:13 +01:00
5dbde1b294
Upgrade to Hibernate 5.6.4.Final
...
Closes gh-29497
2022-01-20 10:53:11 +01:00
6ae5bfb728
Upgrade to MariaDB 2.7.5
...
Closes gh-29496
2022-01-20 10:29:26 +01:00
5b1486cc26
Merge branch '2.5.x' into 2.6.x
2022-01-19 15:54:19 -08:00
d211b0f3b3
Disable test is Docker is not available
...
See gh-28843
2022-01-19 15:53:07 -08:00
6bea2172cb
Switch tests to properties that are not deprecated
...
Closes gh-29488
2022-01-19 19:08:31 +00:00
ee9c399eba
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29485
2022-01-19 17:27:36 +00:00
1b3d088056
Move JdbcSessionDataSourceInitializerTests into src/test/java
...
Closes gh-29484
2022-01-19 17:26:55 +00:00
52f612b3eb
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29480
2022-01-19 13:18:50 +00:00
9cb66d55d1
Refer to Maven Resolver rather than Aether
...
Closes gh-29255
2022-01-19 13:18:05 +00:00
d92939e773
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29478
2022-01-19 12:24:15 +01:00
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
124a3219e8
Upgrade to Pooled JMS 1.2.3
...
Closes gh-29468
2022-01-19 08:17:20 +01:00
60971c6fdb
Upgrade to MySQL 8.0.28
...
Closes gh-29467
2022-01-19 08:17:19 +01:00
aba3b1dc5f
Upgrade to Spring Integration 5.5.8
...
Closes gh-29320
2022-01-19 08:12:33 +01:00
cdd479556f
Upgrade to Pooled JMS 1.2.3
...
Closes gh-29466
2022-01-19 08:12:08 +01:00
849fb8e435
Upgrade to Netty tcNative 2.0.47.Final
...
Closes gh-29465
2022-01-19 08:12:07 +01:00
3a043603e8
Upgrade to MySQL 8.0.28
...
Closes gh-29464
2022-01-19 08:12:06 +01:00
2782c3b077
Upgrade to Spring Integration 5.5.8
...
Closes gh-29314
2022-01-19 08:09:50 +01:00
3b4409305a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29459
2022-01-18 16:15:20 -08:00
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
4ee260aa8c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29454
2022-01-18 20:34:51 +00:00
1c6471ef60
Register AprLifecycleListener with Server not Context
...
Fixes gh-28814
2022-01-18 20:34:08 +00:00
27cd1c06a6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29322
2022-01-17 13:20:29 +00:00
75187349e8
Upgrade to Spring REST Docs 2.0.6.RELEASE
...
Closes gh-29321
2022-01-17 13:05:15 +00:00
a9feb923d7
Update to Spring Kafka 2.8.2
...
Closes gh-29319
2022-01-17 08:44:50 +01:00
200c05ff98
Upgrade to Spring AMQP 2.4.2
...
Closes gh-29318
2022-01-17 08:44:15 +01:00
e545441f01
Upgrade to Spring Kafka 2.7.10
...
Closes gh-29313
2022-01-17 08:41:47 +01:00
6afd9b665d
Merge branch '2.5.x' into 2.6.x
2022-01-14 22:56:30 -08:00
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
28cf6f5c59
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29410
2022-01-14 20:33:05 -08:00
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
14fe9347b5
Merge branch '2.5.x' into 2.6.x
2022-01-14 13:56:47 -08:00
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
d29a5a2f43
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29401
2022-01-14 15:55:41 +00:00
e8cbec0836
Clarify documentation of RestTemplate customization
...
Closes gh-29394
2022-01-14 15:51:08 +00:00
8868d34c24
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29399
2022-01-14 15:48:57 +00:00
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
1666b1c284
Upgrade to Neo4j Java Driver 4.4.2
...
Closes gh-29398
2022-01-14 15:54:48 +01:00
c2fa4ffd7e
Upgrade to SLF4J 1.7.33
...
Closes gh-29397
2022-01-14 15:49:56 +01:00
afcba76c3c
Upgrade to R2DBC Bom Arabba-SR12
...
Closes gh-29396
2022-01-14 15:49:55 +01:00
dac4888137
Upgrade to Netty tcNative 2.0.47.Final
...
Closes gh-29395
2022-01-14 15:49:54 +01:00
af79829cab
Upgrade to Spring Data 2021.1.1
...
Closes gh-29317
2022-01-14 15:44:45 +01:00
1e44e4e52e
Upgrade to Spring HATEOAS 1.4.1
...
Closes gh-29283
2022-01-14 15:44:16 +01:00
5883b22e01
Upgrade to SLF4J 1.7.33
...
Closes gh-29392
2022-01-14 12:21:04 +01:00
1e22504d21
Upgrade to R2DBC Bom Arabba-SR12
...
Closes gh-29391
2022-01-14 12:21:02 +01:00
251f4e8a3f
Upgrade to Spring AMQP 2.3.14
...
Closes gh-29312
2022-01-14 12:12:00 +01:00
777361421c
Upgrade to Spring Data 2021.0.8
...
Closes gh-29311
2022-01-14 12:11:30 +01:00
37a44f45a0
Upgrade to Spring HATEOAS 1.3.7
...
Closes gh-29352
2022-01-14 12:10:46 +01:00
c19e192acd
Fix duplicate "Logging" link
...
See gh-29380
2022-01-13 15:30:21 +01:00
832d8845df
Upgrade to Micrometer 1.8.2
...
Closes gh-29316
2022-01-13 14:38:40 +01:00
f65d766fbe
Upgrade to Spring Framework 5.3.15
...
Closes gh-29327
2022-01-13 14:38:07 +01:00
aa0a788800
Upgrade to Micrometer 1.7.8
...
Closes gh-29310
2022-01-13 14:36:51 +01:00
5428106925
Upgrade to Spring Framework 5.3.15
...
Closes gh-29326
2022-01-13 14:36:10 +01:00
8384019a41
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29377
2022-01-13 08:45:48 +01:00
5f03ace40f
Update copyright year of changed file
...
See gh-29112
2022-01-13 08:43:03 +01:00
74c522c745
Polish SpringBootContextLoaderTests
...
See gh-29112
2022-01-13 08:42:36 +01:00
e7fe371927
Merge branch '2.5.x' into 2.6.x
2022-01-12 15:43:11 -08:00
27ad0804f5
Update copyright year of changed files
2022-01-12 15:42:25 -08:00
91d2b1b988
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29374
2022-01-12 15:32:00 -08:00
eb6b48fff0
Use side-effect free environment with tests rather than converting
...
Refine the logic introduced in 64270eca
2022-01-12 14:21:52 -08:00
72696cdb0f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29371
2022-01-12 14:07:31 -08:00
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
3ae7c45900
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29367
2022-01-12 13:54:23 -08:00
827309f36f
Upgrade to Testcontainers 1.16.2
...
Closes gh-29366
2022-01-12 13:52:43 -08:00
ee938cf822
Upgrade to Netty 4.1.73.Final
...
Closes gh-29351
2022-01-12 14:33:55 +01:00
d8739c463b
Upgrade to MongoDB 4.4.1
...
Closes gh-29350
2022-01-12 14:33:54 +01:00
e14c13c75f
Upgrade to Maven Jar Plugin 3.2.2
...
Closes gh-29349
2022-01-12 14:33:52 +01:00
8cdccb6cb3
Upgrade to Logback 1.2.10
...
Closes gh-29348
2022-01-12 14:33:51 +01:00
61e08e3510
Upgrade to Lettuce 6.1.6.RELEASE
...
Closes gh-29347
2022-01-12 14:33:50 +01:00
b19593ee47
Upgrade to JBoss Logging 3.4.3.Final
...
Closes gh-29346
2022-01-12 14:33:49 +01:00
98118bc480
Upgrade to Jaybird 4.0.5.java8
...
Closes gh-29345
2022-01-12 14:33:47 +01:00
838cded308
Upgrade to Infinispan 12.1.11.Final
...
Closes gh-29344
2022-01-12 14:33:46 +01:00
4309b78f02
Upgrade to HttpCore5 5.1.3
...
Closes gh-29343
2022-01-12 14:33:45 +01:00
ca39780ff3
Upgrade to Netty 4.1.73.Final
...
Closes gh-29341
2022-01-12 13:51:24 +01:00
cb1db78c37
Upgrade to Maven Jar Plugin 3.2.2
...
Closes gh-29340
2022-01-12 13:51:23 +01:00
db9097b0d6
Upgrade to Logback 1.2.10
...
Closes gh-29339
2022-01-12 13:51:21 +01:00
d23a665bdc
Upgrade to Lettuce 6.1.6.RELEASE
...
Closes gh-29338
2022-01-12 13:51:20 +01:00
36811f9e1e
Upgrade to JBoss Logging 3.4.3.Final
...
Closes gh-29337
2022-01-12 13:51:19 +01:00
7125bd3779
Upgrade to Jaybird 4.0.5.java8
...
Closes gh-29336
2022-01-12 13:51:18 +01:00
404fb521ec
Upgrade to Infinispan 12.1.11.Final
...
Closes gh-29335
2022-01-12 13:51:17 +01:00
33da06cff0
Upgrade to HttpCore5 5.1.3
...
Closes gh-29334
2022-01-12 13:51:15 +01:00
c32912f05f
Start building against Spring Framework 5.3.15 snapshots
...
See gh-29327
2022-01-12 09:30:17 +01:00
b5407e6e8e
Start building against Spring Framework 5.3.15 snapshots
...
See gh-29326
2022-01-12 09:29:36 +01:00
c211aa0ac2
Start building against Spring REST Docs 2.0.6 snapshots
...
See gh-29322
2022-01-11 20:27:19 +00:00
27eaaa9442
Start building against Spring REST Docs 2.0.6 snapshots
...
See gh-29321
2022-01-11 20:09:39 +00:00
b9716ca4ee
Start building against Spring Integration 5.5.8 snapshots
...
See gh-29320
2022-01-11 17:24:50 +01:00
504421c4a5
Start building against Spring Kafka 2.8.2 snapshots
...
See gh-29319
2022-01-11 17:24:49 +01:00
ef4915ee55
Start building against Spring AMQP 2.4.2 snapshots
...
See gh-29318
2022-01-11 17:24:49 +01:00
b05f435b27
Start building against Spring Data 2021.1.1 snapshots
...
See gh-29317
2022-01-11 17:24:49 +01:00
2da271a240
Start building against Micrometer 1.8.2 snapshots
...
See gh-29316
2022-01-11 17:24:48 +01:00
17b0ac61aa
Upgrade to Reactor 2020.0.15
...
Closes gh-29315
2022-01-11 17:24:46 +01:00
c2925f8e84
Start building against Spring Integration 5.5.8 snapshots
...
See gh-29314
2022-01-11 17:22:20 +01:00
116427c78e
Start building against Spring Kafka 2.7.10 snapshots
...
See gh-29313
2022-01-11 17:22:20 +01:00
53fcf0971e
Start building against Spring AMQP 2.3.14 snapshots
...
See gh-29312
2022-01-11 17:22:20 +01:00
72e72bda67
Start building against Micrometer 1.7.8 snapshots
...
See gh-29310
2022-01-11 17:22:19 +01:00
79fd0ad30a
Upgrade to Reactor 2020.0.15
...
Closes gh-29309
2022-01-11 17:22:18 +01:00
a6d8ff4677
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29268
2022-01-05 11:58:03 +00:00
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
99a683dffb
Merge branch '2.5.x' into 2.6.x
2022-01-04 12:24:02 -08:00
9a6f35cd8e
Update copyright year of changed files
2022-01-04 12:23:53 -08:00
81266ca806
Merge branch '2.5.x' into 2.6.x
2022-01-04 12:17:35 -08:00
0fcdab3936
Update copyright year of changed files
2022-01-04 12:17:10 -08:00
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
c469c41127
Merge branch '2.5.x' into 2.6.x
2022-01-03 09:33:23 +01:00
Moritz Halbritter
Andy Wilkinson
Moritz Halbritter
Mike Partridge
Phillip Webb
Stephane Nicoll
Mihail Cornescu
Yanming Zhou
Andreas Ahlenstorf
Leo Li
izeye
Madhura Bhave
Brian Clozel
Lachlan Roberts
Scott Frederick
Axel Fontaine
Janne Valkealahti
Omkar Shetkar