Stephane Nicoll
f8a4aefce0
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26298
2021-04-29 12:29:55 +02:00
Stephane Nicoll
0c09841013
Document property names to enable reactive health indicators
...
Closes gh-26279
2021-04-29 12:28:43 +02:00
Stephane Nicoll
77a231d742
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26282
2021-04-28 16:14:46 +02:00
Stephane Nicoll
e7bf0a0bd6
Fix key to datasource health indicator in reference doc
...
Closes gh-26268
2021-04-28 16:14:06 +02:00
Stephane Nicoll
52994027f4
Fix checkstyle violation
2021-04-28 15:14:33 +02:00
Stephane Nicoll
05b09907e0
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26275
2021-04-28 14:12:35 +02:00
Stephane Nicoll
d610f3c2ff
Polish "Fix ordering of metadata entries"
...
See gh-26230
2021-04-28 14:07:37 +02:00
Dmitry Pavlov
3e34b0a60a
Fix ordering of metadata entries
...
This commit provides a consistent ordering for groups that share the
same configuration property prefix.
See gh-26230
2021-04-28 14:07:37 +02:00
Stephane Nicoll
d98fe36b88
Merge branch '2.3.x' into 2.4.x
2021-04-28 13:57:45 +02:00
Stephane Nicoll
20da9826cc
Disable incrementalBuildTypeRenamed test
...
This commit disables a test that does not test what it is supposed to
and improve the Metadata assertions to fail early if more than one
matching item by name and type is found in the metadata.
See gh-26271
2021-04-28 13:54:35 +02:00
Andy Wilkinson
a1138efc5f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26256
2021-04-27 15:18:23 +01:00
Andy Wilkinson
a470c1af3a
Align documentation with main default branch name
...
Closes gh-26255
2021-04-27 15:18:00 +01:00
Andy Wilkinson
ffc06e1e30
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26250
2021-04-27 11:51:29 +01:00
Andy Wilkinson
715c4febf9
Update maformed address to one that should fail on CI
...
Closes gh-26247
2021-04-27 11:50:52 +01:00
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
f82b33698d
Add missing asciidoctor heading anchors
...
Closes gh-26239
2021-04-26 17:35:14 -07: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
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
Stephane Nicoll
e424c1c4b4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26210
2021-04-22 14:48:15 +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
65a7422a45
Upgrade to Kafka 2.6.2
...
Closes gh-24247
2021-04-22 14:12:55 +02:00
Stephane Nicoll
db7460ddd5
Polish contribution based on Andy's review
...
See gh-26188
2021-04-21 17:23:21 +02:00
izeye
4be48d0d50
Polish
...
See gh-26188
2021-04-21 15:20:06 +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
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
bc1a462143
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26168
2021-04-20 11:19:10 +01:00
Andy Wilkinson
82198a99e0
Polish nohttp configuration
...
Closes gh-26166
2021-04-20 11:15:13 +01:00
Stephane Nicoll
52543b84c1
Fix sourceType for spring.profiles.include
...
Closes gh-26163
2021-04-20 10:23:42 +02:00
Stephane Nicoll
2bd4ccce8a
Document spring.profiles.group in configuration metadata
...
Closes gh-26127
2021-04-20 10:22:43 +02:00
Stephane Nicoll
6bbd36c77a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26159
2021-04-19 17:01:28 +02:00
Stephane Nicoll
03b65f3260
Polish "Enhance multiple entity manager factories how-to"
...
See gh-14928
2021-04-19 16:59:31 +02:00
Niclas Fredriksson
0d9db46f68
Enhance multiple entity manager factories how-to
...
See gh-14928
2021-04-19 16:53:50 +02:00
Stephane Nicoll
54613c77d4
Exclude beans with scheduled methods from global lazy init
...
This commit updates TaskSchedulingAutoConfiguration to contribute a
LazyInitializationExcludeFilter that processes beans that have
@Scheduled methods. This lets them be contributed to the context so
that scheduled methods are invoked as expected.
Closes gh-25315
2021-04-19 14:04:03 +02:00
Andy Wilkinson
0c30a5930d
Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
...
See gh-26149
2021-04-19 10:23:27 +01:00
Sriram
4268f8da84
Use ConfigDataLocationResolvers' class loader to load resolver names
...
See gh-26149
2021-04-19 10:06:07 +01:00
Phillip Webb
302d500ee9
Add StandardConfigDataResource.getProfile method
...
Add a `StandardConfigDataResource.getProfile()` method so that it's
possible to tell the profile used when reading a profile specific
resource.
Fixes gh-25940
2021-04-15 12:01:34 -07:00
Stephane Nicoll
f814beacec
Upgrade to Spring Session Dragonfruit-SR3
...
Closes gh-25907
2021-04-15 09:05:10 +02:00
Stephane Nicoll
e8eb68a458
Upgrade to Spring Session Dragonfruit-SR3
...
Closes gh-25907
2021-04-15 09:01:55 +02:00
Phillip Webb
5b836f3aee
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26124
2021-04-14 17:42:38 -07:00
Phillip Webb
61ff3c98bf
Polish 'Don't detect CloudPlatform when property is set'
...
See gh-25455
2021-04-14 17:29:30 -07:00
nguyensach
70f44d3a56
Don't detect CloudPlatform when property is set
...
Update `CloudPlatform.isActive` to back-off from detection when any
`spring.main.cloud-platform` property is set.
See gh-25455
2021-04-14 17:24:37 -07:00
Phillip Webb
fb3796dae8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26121
2021-04-14 15:02:58 -07:00
Phillip Webb
fcb2210a87
Include optional shade plugin in published pom
...
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.
This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.
Fixes gh-21992
2021-04-14 15:02:42 -07:00
Andy Wilkinson
1f0127036c
Upgrade to Spring Integration 5.4.6
...
Closes gh-26113
2021-04-14 17:26:54 +01:00
Andy Wilkinson
e6130c6ce0
Upgrade to Spring Integration 5.3.7.RELEASE
...
Closes gh-26112
2021-04-14 17:24:22 +01:00
Stephane Nicoll
401ebc672b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26110
2021-04-14 15:43:57 +02:00
Stephane Nicoll
ab785d9417
Document limitations of using deferred JPA bootstrap
...
Closes gh-24027
2021-04-14 15:38:34 +02:00