Phillip Webb
94a70d6837
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26241
2021-04-26 17:42:00 -07:00
Phillip Webb
1e0a3a946d
Fix binding random properties test
...
See gh-26201
2021-04-26 17:36:58 -07:00
Phillip Webb
f82b33698d
Add missing asciidoctor heading anchors
...
Closes gh-26239
2021-04-26 17:35:14 -07:00
Phillip Webb
ba5b36d733
Restore support for binding random properties
...
Revert 0588e989af
so that `@ConfigurationProperties` can again be
bound using values from the `RandomValuePropertySource`.
Fixes gh-26201
2021-04-26 15:42:15 -07:00
Phillip Webb
5e8f383947
Extract code samples from docs
...
See gh-6313
2021-04-26 14:01:37 -07:00
Andy Wilkinson
6de10ff791
Merge branch '2.4.x'
...
Closes gh-26237
2021-04-26 15:53:37 +01:00
Andy Wilkinson
11fa850b97
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26236
2021-04-26 15:53:18 +01:00
Andy Wilkinson
4a990f3ed2
Use bean class loader when importing auto-configuration
...
Fixes gh-26234
2021-04-26 15:38:01 +01:00
Brian Clozel
1732d8ccf7
Merge branch '2.4.x'
...
Closes gh-26233
2021-04-26 11:37:20 +02:00
Brian Clozel
7be9c268b8
Fix ignored use-last-modified property in Spring MVC
...
Prior to this commit, the `spring.web.resources.cache.use-last-modified`
configuration property support was lost during a merge operation right
before 2.4.2.
This is due to an invalid test that missed this unintended change. This
commit fixes both problems.
Fixes gh-26212
2021-04-26 11:34:47 +02:00
Phillip Webb
32a87fcbda
Extract code samples from docs
...
See gh-6313
2021-04-25 16:07:26 -07:00
Phillip Webb
2f852fa256
Update copyright year of changed files
2021-04-23 23:42:14 -07:00
Phillip Webb
f30d48e3b3
Extract code samples from docs
...
See gh-6313
2021-04-23 23:41:06 -07:00
Phillip Webb
02cc778911
Extract code samples from docs
...
See gh-6313
2021-04-23 19:10:09 -07:00
Phillip Webb
3075ac0f54
Formatting
2021-04-23 11:17:49 -07:00
Stephane Nicoll
a654380552
Merge pull request #26200 from slawekjaranowski
...
* pr/26200:
Test Maven plugin against latest Maven versions
Closes gh-26200
2021-04-22 15:26:30 +02:00
Slawomir Jaranowski
50118f67fd
Test Maven plugin against latest Maven versions
...
See gh-26200
2021-04-22 14:59:16 +02:00
Stephane Nicoll
a7b0f90609
Merge branch '2.4.x'
...
Closes gh-26211
2021-04-22 14:48:30 +02:00
Stephane Nicoll
e424c1c4b4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26210
2021-04-22 14:48:15 +02:00
Stephane Nicoll
1d88e8fa65
Merge pull request #26209 from zoosm3
...
* pr/26209:
Align Maven version in system requirements with what is actually tested
Closes gh-26209
2021-04-22 14:48:06 +02:00
Shimizu, Yuko
474e460d5e
Align Maven version in system requirements with what is actually tested
...
See gh-26209
2021-04-22 14:47:29 +02:00
Stephane Nicoll
f1aeb8daf5
Merge branch '2.4.x'
2021-04-22 14:25:31 +02:00
Stephane Nicoll
65a7422a45
Upgrade to Kafka 2.6.2
...
Closes gh-24247
2021-04-22 14:12:55 +02:00
Stephane Nicoll
0c8f4e5ab3
Merge branch '2.4.x'
2021-04-22 11:11:51 +02:00
Stephane Nicoll
5aaca2b734
Upgrade Java 11 version in CI image
...
Closes gh-26193
2021-04-22 11:11:43 +02:00
Stephane Nicoll
a712d9d089
Upgrade Java 8 version in CI image
...
Closes gh-26196
2021-04-22 11:10:34 +02:00
Stephane Nicoll
0ad7597f56
Merge branch '2.3.x' into 2.4.x
2021-04-22 11:09:50 +02:00
Stephane Nicoll
df2f6a4b39
Upgrade Java 11 version in CI image
...
Closes gh-26194
2021-04-22 11:09:34 +02:00
Stephane Nicoll
4c6aece927
Upgrade Java 8 version in CI image
...
Closes gh-26195
2021-04-22 11:09:04 +02:00
Stephane Nicoll
410641d336
Upgrade Java 11 version in CI image
...
Closes gh-26198
2021-04-22 11:08:04 +02:00
Stephane Nicoll
e5a9defbc5
Upgrade Java 8 version in CI image
...
Closes gh-26197
2021-04-22 11:07:36 +02:00
Stephane Nicoll
e3f81f0243
Merge branch '2.4.x'
2021-04-21 17:23:42 +02:00
Stephane Nicoll
db7460ddd5
Polish contribution based on Andy's review
...
See gh-26188
2021-04-21 17:23:21 +02:00
Stephane Nicoll
3ca6ed6246
Polish
...
Closes gh-26190
2021-04-21 17:20:22 +02:00
Stephane Nicoll
b1170efd3b
Merge pull request #26188 from izeye
...
* pr/26188:
Polish
Closes gh-26188
2021-04-21 17:18:53 +02:00
izeye
4be48d0d50
Polish
...
See gh-26188
2021-04-21 15:20:06 +02:00
Stephane Nicoll
6c68f3652c
Merge branch '2.4.x'
...
Closes gh-26186
2021-04-21 10:03:41 +02:00
Stephane Nicoll
8edeb2c7a9
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26185
2021-04-21 10:03:32 +02:00
Stephane Nicoll
856e0d0535
Document that MeterFilters are only applied to a managed registry
...
Closes gh-25610
2021-04-21 10:02:57 +02:00
Stephane Nicoll
d403103aac
Merge branch '2.4.x'
...
Closes gh-26182
2021-04-20 17:58:30 +02:00
Stephane Nicoll
6fc803c5a2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26181
2021-04-20 17:58:14 +02:00
Stephane Nicoll
6f73fd6785
Upgrade to Testcontainers 1.15.3
...
Closes gh-26179
2021-04-20 17:05:58 +02:00
Andy Wilkinson
1116a3d0c5
Merge branch '2.4.x'
...
Closes gh-26178
2021-04-20 15:52:51 +01:00
Andy Wilkinson
289ede6541
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26177
2021-04-20 15:52:26 +01:00
Andy Wilkinson
2dce3abe84
Use main branch when working with Homebrew tap's git repo
...
Closes gh-26173
2021-04-20 15:51:06 +01:00
Andy Wilkinson
d1164c63f9
Merge branch '2.4.x'
...
Closes gh-26176
2021-04-20 15:47:50 +01:00
Andy Wilkinson
be99f386a8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26175
2021-04-20 15:47:38 +01:00
Andy Wilkinson
9e5f738f7a
Make relative file references in checkstyle.xml more robust
...
Closes gh-26174
2021-04-20 15:47:08 +01:00
Stephane Nicoll
d881503a73
Merge branch '2.4.x'
...
Closes gh-26172
2021-04-20 15:12:39 +02:00
Stephane Nicoll
7cbae821b7
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26171
2021-04-20 15:12:29 +02:00