07de9e3920
Merge branch '2.4.x'
2021-05-12 17:40:58 +01:00
e29d2e208e
Merge branch '2.3.x' into 2.4.x
2021-05-12 17:40:48 +01:00
b3af6d6403
Polish
...
See gh-25798
2021-05-12 17:40:33 +01:00
19fa1a6107
Upgrade to Spring HATEOAS 1.3.1
...
Closes gh-26380
2021-05-12 16:28:11 +01:00
827e0cf80a
Upgrade to Micrometer 1.7.0
...
Closes gh-26379
2021-05-12 16:27:35 +01:00
0e68f3c303
Upgrade to Spring Framework 5.3.7
...
Closes gh-26361
2021-05-12 16:26:53 +01:00
322d6455db
Upgrade to Micrometer 1.6.7
...
Closes gh-26430
2021-05-12 14:52:05 +01:00
7a2d5d4eee
Upgrade to Spring Framework 5.3.7
...
Closes gh-26360
2021-05-12 14:51:33 +01:00
ece845a4e0
Upgrade to Micrometer 1.5.14
...
Closes gh-26427
2021-05-12 14:09:27 +01:00
1a32a864d4
Upgrade to Spring Framework 5.2.15.RELEASE
...
Closes gh-26425
2021-05-12 11:30:57 +01:00
efc0a7da44
Properly assert that auto-configured TaskExecutor is lazy
...
This commit fixes a flawed assertion that was relying on a log message
to validate the TaskExecutor is lazy. The level of the log message has
changed in framework and broke the test. We now rather check the bean
definition.
2021-05-12 07:34:58 +02:00
eff024b0ce
Polish "Process additional profiles before config files processing"
...
See gh-25817
2021-05-11 15:04:34 -07:00
97fd9a7c77
Process additional profiles before config files processing
...
Additional profiles were being processed after config file processing
when legacy processing was used.
This commit also restores the order in which additional profiles are added
when legacy processing is used.
Active profiles take precedence over additional profiles.
See gh-25817
2021-05-11 15:03:36 -07:00
38ef6b5644
Merge pull request #25817 from nguyensach
...
* pr/25817:
Polish "Process additional profiles before config files processing"
Process additional profiles before config files processing
Closes gh-25817
2021-05-11 14:46:12 -07:00
2e1b20ce2b
Polish "Process additional profiles before config files processing"
...
See gh-25817
2021-05-11 13:06:46 -07:00
6f266145c7
Process additional profiles before config files processing
...
Additional profiles were being processed after config file processing
when legacy processing was used.
This commit also restores the order in which additional profiles are added
when legacy processing is used.
Active profiles take precedence over additional profiles.
See gh-25817
2021-05-11 13:05:48 -07:00
0e2bb5f179
Polish "Polish SpringApplicationAdminJmxAutoConfigurationTests"
...
See gh-26416
2021-05-11 17:19:24 +02:00
b263f126fa
Polish SpringApplicationAdminJmxAutoConfigurationTests
...
See gh-26416
2021-05-11 17:19:24 +02:00
f042dcf0e0
Properly assert that auto-configured TaskExecutor is lazy
...
This commit fixes a flawed assertion that was relying on a log message
to validate the TaskExecutor is lazy. The level of the log message has
changed in framework and broke the test. We now rather check the bean
definition.
2021-05-11 17:17:28 +02:00
2e0481ca28
Remove useless overrides of ConditionalOnProperty#matchIfMissing
...
Closes gh-26432
2021-05-11 16:48:05 +02:00
0512992791
Upgrade to Reactor 2020.0.7
...
Closes gh-26359
2021-05-11 15:56:26 +02:00
c50afc69bd
Upgrade to Reactor 2020.0.7
...
Closes gh-26358
2021-05-11 15:55:56 +02:00
526af5a790
Upgrade to Reactor Dysprosium-SR20
...
Closes gh-26424
2021-05-11 15:55:14 +02:00
21fbb2e79c
Start building against Micrometer 1.6.7 snapshots
...
See gh-26430
2021-05-11 13:47:38 +02:00
5cdabc9729
Start building against Spring Kafka 2.5.13 snapshots
...
See gh-26429
2021-05-11 13:29:00 +02:00
47d5592035
Start building against Spring AMQP 2.2.17 snapshots
...
See gh-26428
2021-05-11 13:28:28 +02:00
3a8500126b
Start building against Micrometer 1.5.14 snapshots
...
See gh-26427
2021-05-11 13:27:57 +02:00
9772867862
Start building against Spring Batch 4.2.7 snapshots
...
See gh-26426
2021-05-11 13:26:58 +02:00
66fe98eb3f
Start building against Spring Framework 5.2.15 snapshots
...
See gh-26425
2021-05-11 10:05:47 +02:00
c059759c4d
Start building against Reactor Dysprosium-SR20 snapshots
...
See gh-26424
2021-05-11 10:05:00 +02:00
ba2a4781d2
Test our Gradle Plugin against Gradle 7.0.1
...
See gh-26420
2021-05-11 08:25:19 +02:00
87d8aedd3c
Use spring-pdf backend for PDF generation
...
Update `asciidoctorPdf` tasks to use the `spring-pdf` backend so that
chomped elements and @fold:on/@fold:off comments are hidden.
Closes gh-26373
2021-05-10 18:04:05 -07:00
217f6efa64
Start building against Micrometer 1.7.0 snapshots
...
See gh-26379
2021-05-10 12:46:23 +02:00
8d2fa26a99
Start building against Spring LDAP 2.3.4 snapshots
...
See gh-26394
2021-05-10 12:45:49 +02:00
14dd98c690
Start building against Spring Batch 4.3.3 snapshots
...
See gh-26392
2021-05-10 12:44:59 +02:00
98b48c1069
Start building against Spring WS 3.1.0 snapshots
...
See gh-26390
2021-05-10 12:44:27 +02:00
f5cba056d7
Start building against Spring Session 2021.0.0 snapshots
...
See gh-26389
2021-05-10 12:44:00 +02:00
8fcba2c333
Start building against Spring Integration 5.5.0 snapshots
...
See gh-26388
2021-05-10 12:43:29 +02:00
55ccf9f750
Start building against Spring Security 5.5.0 snapshots
...
See gh-26387
2021-05-10 12:43:04 +02:00
c9cd7cae51
Start building against Spring Kafka 2.7.1 snapshots
...
See gh-26386
2021-05-10 12:42:36 +02:00
c85936f004
Start building against Spring AMQP 2.3.7 snapshots
...
See gh-26384
2021-05-10 12:42:05 +02:00
b93263ec3c
Start building against Spring Data 2021.0.1 snapshots
...
See gh-26382
2021-05-10 12:41:37 +02:00
10dca8d829
Start building against Spring HATEOAS 1.3.1 snapshots
...
See gh-26380
2021-05-10 12:41:12 +02:00
a5cb9540ca
Start building against Spring LDAP 2.3.4 snapshots
...
See gh-26393
2021-05-10 09:38:41 +02:00
0d920894b7
Start building against Spring Batch 4.3.3 snapshots
...
See gh-26391
2021-05-10 09:03:43 +02:00
618475887c
Start building against Spring Kafka 2.6.8 snapshots
...
See gh-26385
2021-05-10 09:03:14 +02:00
2479f69db1
Start building against Spring AMQP 2.3.7 snapshots
...
See gh-26383
2021-05-10 09:02:27 +02:00
05a3b9bbeb
Start building against Spring Data 2020.0.9 snapshots
...
See gh-26381
2021-05-10 09:01:56 +02:00
dc5f115c04
Document support for Gradle 6.9
...
Closes gh-26409
2021-05-07 11:29:51 +01:00
b3071dab91
Merge branch '2.4.x'
...
Closes gh-26412
2021-05-07 11:26:18 +01:00
fe4d20c976
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26411
2021-05-07 11:25:10 +01:00
6daf67a88c
Upgrade to Gradle 6.9
...
Closes gh-26408
2021-05-07 11:21:24 +01:00
b4424605af
Merge branch '2.4.x'
...
Closes gh-26406
2021-05-07 09:14:46 +02:00
559af275a4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26405
2021-05-07 09:14:35 +02:00
afa77b8253
Fix wrong reference to Cassandra in DockerImageNames#couchbase
...
See gh-26399
2021-05-07 09:12:43 +02:00
ba1e5fb5e8
Merge branch '2.4.x'
...
Closes gh-26402
2021-05-06 19:50:52 -07:00
efad44be43
Refine mandatory location checking logic
...
Update `ConfigDataEnvironment.checkMandatoryLocations` to use the
actual locations that were imported, including those that were skipped
because the related `ConfigDataResource` had already been imported by a
different location.
Prior to this commit, any location that was skipped because it had
already been imported would throw a `ConfigDataNotFoundException`.
Closes gh-26147
Co-authored-by: Scott Frederick <sfrederick@vmware.com>
Co-authored-by: Madhura Bhave <mbhave@vmware.com>
2021-05-06 19:50:41 -07:00
777abc4aac
Merge branch '2.4.x'
...
Closes gh-26401
2021-05-06 19:50:17 -07:00
fef62f784a
Import profile specific files in correct order
...
Update `StandardConfigDataLoader` to mark profile specific files with
`Option.PROFILE` so that they are added in the correct order. This is
a variation of the same issue described in commit 5774ea3f0c
2021-05-06 19:43:40 -07:00
922517c0e5
Polish
2021-05-06 19:43:31 -07:00
2976fd9165
Merge branch '2.4.x'
...
Closes gh-26397
2021-05-06 20:12:41 +01:00
fe696ee22a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26396
2021-05-06 20:11:59 +01:00
ef9e3bafff
Test our Gradle plugin against 6.9-rc-2
...
Closes gh-26395
2021-05-06 20:10:54 +01:00
b1f3d91f7d
Make sure the Couchbase's Jackson module is available
...
When we customize Couchbase's JacksonJsonSerializer with the
auto-configured ObjectMapper, Couchbase's JsonValueModule is lost.
This prevents the storage and retrieval of JSON objects.
This commit updates the Couchbase auto-configuration to use a copy
of the auto-configured ObjectMapper with the JsonValueModule added
to it.
Fixes gh-26363
2021-05-06 19:40:47 +01:00
4bbfd5a3b7
Start building against Spring Framework 5.3.7 snapshots
...
See gh-26361
2021-05-06 17:12:20 +02:00
d0e3b16f6d
Start building against Reactor 2020.0.7 snapshots
...
See gh-26359
2021-05-06 17:11:58 +02:00
3a596ed130
Start building against Spring Framework 5.3.7 snapshots
...
See gh-26360
2021-05-06 16:43:17 +02:00
17fdd5a79f
Start building against Reactor 2020.0.7 snapshots
...
See gh-26358
2021-05-06 16:42:45 +02:00
d3207b107c
Polish docs
2021-05-05 23:42:22 -07:00
aeea15be0f
Merge branch '2.4.x'
...
Closes gh-26365
2021-05-05 09:53:20 +01:00
f7fae8f0f2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26364
2021-05-05 09:52:53 +01:00
b3275c5647
Align productionRuntimeClasspath with runtimeClasspath
...
Fixes gh-25798
2021-05-05 09:52:44 +01:00
65c00f373a
Polish
2021-05-04 14:07:58 -07:00
711a0c19e6
Use consistent asciidoctor subs attribute
...
Closes gh-25101
2021-05-04 13:01:20 -07:00
979fa12ca9
Polish source type for Gradle snippets
2021-05-04 10:35:39 -07:00
57e54af6f5
Delete R2dbcDatabaseInitializationConfiguration
...
The `R2dbcDatabaseInitializationConfiguration` docs class is not needed
in 2.5.x.
Closes gh-26225
2021-05-04 08:15:14 -07:00
a164658dab
Merge branch '2.4.x'
...
Closes gh-26349
2021-05-04 09:46:23 +01:00
cb1af35dde
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26348
2021-05-04 09:46:01 +01:00
6440843358
Do not wait indefinitely in initialize test if refresh fails
...
Closes gh-26286
2021-05-04 09:44:56 +01:00
d6d1d95741
Use American English spellings
2021-05-03 22:39:45 -07:00
b5583a4620
Polish doc code samples
...
See gh-6313
2021-05-03 22:39:44 -07:00
9aad29da0c
Extract code samples from docs
...
See gh-6313
2021-05-03 17:46:37 -07:00
0893df4a01
Merge branch '2.4.x'
...
Closes gh-26346
2021-05-03 14:53:41 -05:00
dbee0cf9f1
Ignore empty values in config location properties
...
This commit updates config data property binding to ignore empty
elements in `spring.config.location` and `spring.config.import`
property values when a value is a comma-delimited string
representing a collection.
Fixes gh-26342
2021-05-03 14:52:22 -05:00
b314d848dc
Polish docs code
...
See gh-6313
2021-04-30 18:19:52 -07:00
09e85806d6
Align docs package structure with heading IDs
...
See gh-6313
2021-04-30 16:34:35 -07:00
b976483852
Merge branch '2.4.x'
...
Closes gh-26330
2021-04-30 16:56:46 +01:00
c0fe23181c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26329
2021-04-30 16:55:10 +01:00
94ca2d1e78
Test the Gradle plugin against Gradle 6.9-rc-1
...
Closes gh-26267
2021-04-30 16:52:52 +01:00
6df3a8291e
Merge branch '2.4.x'
...
Closes gh-26328
2021-04-30 14:36:04 +02:00
01d2c70e8c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26327
2021-04-30 14:35:52 +02:00
07358c6b79
Support reactive infrastructure with DataRedisTest
...
Previously DataRedisTest-annotated test could not use reactive
operations as RedisReactiveAutoConfiguration is not considered. This
commit includes this auto-configuration and adds a test to exercise this
scenario.
Closes gh-26319
2021-04-30 14:32:25 +02:00
367fd64c23
Merge branch '2.4.x'
...
Closes gh-26325
2021-04-30 13:40:32 +02:00
c134c38a68
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26324
2021-04-30 13:40:24 +02:00
af70da0e92
Update copyright year of changed file
...
See gh-26321
2021-04-30 13:35:28 +02:00
6c8c735027
Fix typo in NamedContributors Javadoc
...
See gh-26321
2021-04-30 13:35:17 +02:00
3475e01cda
Merge branch '2.4.x'
...
Closes gh-26323
2021-04-30 13:32:56 +02:00
4ccce2a74f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26322
2021-04-30 13:32:40 +02:00
a6e59b357f
Polish "Improve failure analysis with a single bean cycle"
...
See gh-26292
2021-04-30 13:30:58 +02:00
044c902a8c
Improve failure analysis with a single bean cycle
...
See gh-26292
2021-04-30 13:18:13 +02:00
4febe6485c
Merge branch '2.4.x'
...
Closes gh-26318
2021-04-30 08:53:31 +02:00
63d486158d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26317
2021-04-30 08:53:20 +02:00
3f528bb0eb
Mark SpringBootConfiguration as Indexed
...
Previously, users of the components.index could not use the index in
scenario where Spring Boot needs to locate the SpringBootConfiguration
to use to bootstrap the test context, as AnnotatedClassFinder scans
the classpath for that stereotype specifically and that requires a
dedicated entry for it.
This commit makes sure that a SpringBootConfiguration-annotated type has
a dedicated entry in the components index.
Closes gh-26308
2021-04-30 08:47:45 +02:00
ca3105920b
Fix link to Webservices reference docs
...
See gh-26316
2021-04-30 08:27:22 +02:00
33c6c600a9
Split up adoc files
...
Closes gh-23254
2021-04-29 17:32:27 -07:00
bb8188b681
Merge branch '2.4.x'
...
Closes gh-26313
2021-04-29 16:16:32 -05:00
17fa215cf5
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26312
2021-04-29 15:33:33 -05:00
c37b9b8a8e
Use layout configuration in Maven build-image goal
...
This commit changes the Maven build-image goal to honor the `layout` and
`layoutFactory` parameters to ensure that the archive content sent to the
builder is the same as is used by the `repackage` goal to build the
archive file.
Fixes gh-26216
2021-04-29 15:03:08 -05:00
5d8a64e186
Validate section IDs in the reference documentation
...
See gh-26307
2021-04-29 15:40:54 +01:00
fa81b41afc
Merge branch '2.4.x'
...
Closes gh-26301
2021-04-29 11:37:13 +01:00
94519c33b1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26300
2021-04-29 11:36:15 +01:00
ef5fbb0669
Configure bootBuildImage's targetJavaVersion using a provider
...
Previously, the targetJavaVersion property of bootBuildImage was set
using the project's target compatibility directly. This meant that
property's value would reflect the configured target compatibility at
the time of the task's creation and any subsequent changes to the
target compatibility would be missed.
This commit updates the registration of the bootBuildImage task to set
the value of the targetJavaVersion property using a provider. This
indirection means that the project's target compatibility isn't read
until the value of the targetJavaVersion is read, allowing any changes
to the target compatibility to be picked up even if they're made after
the bootBuildImage task has been created.
Fixes gh-26297
2021-04-29 11:36:03 +01:00
242f2ba6bd
Merge branch '2.4.x'
...
Closes gh-26299
2021-04-29 12:30:09 +02:00
f8a4aefce0
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26298
2021-04-29 12:29:55 +02:00
0c09841013
Document property names to enable reactive health indicators
...
Closes gh-26279
2021-04-29 12:28:43 +02:00
5dce5ee595
Align adoc filename with anchors
...
See gh-26296
2021-04-28 22:34:16 -07:00
bd3f4d74be
Rationalize reference documentation anchors
...
Closes gh-26296
2021-04-28 21:56:51 -07:00
80248dcc13
Merge branch '2.4.x'
...
Closes gh-26283
2021-04-28 16:14:58 +02:00
77a231d742
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26282
2021-04-28 16:14:46 +02:00
e7bf0a0bd6
Fix key to datasource health indicator in reference doc
...
Closes gh-26268
2021-04-28 16:14:06 +02:00
52994027f4
Fix checkstyle violation
2021-04-28 15:14:33 +02:00
7465eb0f03
Merge branch '2.4.x'
2021-04-28 15:12:45 +02:00
85e1cc4d65
Fix checkstyle violation
2021-04-28 15:12:22 +02:00
09ae65e3b7
Merge branch '2.4.x'
...
Closes gh-26277
2021-04-28 14:13:11 +02:00
05b09907e0
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26275
2021-04-28 14:12:35 +02:00
d610f3c2ff
Polish "Fix ordering of metadata entries"
...
See gh-26230
2021-04-28 14:07:37 +02:00
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
9e3c3b73ac
Merge branch '2.4.x'
2021-04-28 13:58:05 +02:00
d98fe36b88
Merge branch '2.3.x' into 2.4.x
2021-04-28 13:57:45 +02:00
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
6953da2013
Merge branch '2.4.x'
...
Closes gh-26257
2021-04-27 15:19:04 +01:00
a1138efc5f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26256
2021-04-27 15:18:23 +01:00
a470c1af3a
Align documentation with main default branch name
...
Closes gh-26255
2021-04-27 15:18:00 +01:00
31b650093d
Merge branch '2.4.x'
...
Closes gh-26251
2021-04-27 11:56:48 +01:00
ffc06e1e30
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26250
2021-04-27 11:51:29 +01:00
715c4febf9
Update maformed address to one that should fail on CI
...
Closes gh-26247
2021-04-27 11:50:52 +01:00
091907f762
Rename default branch to main
...
Closes gh-26248
2021-04-27 11:27:37 +01:00
d42ad237f5
Merge branch '2.4.x'
...
Closes gh-26242
2021-04-26 17:44:26 -07:00
94a70d6837
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26241
2021-04-26 17:42:00 -07:00
1e0a3a946d
Fix binding random properties test
...
See gh-26201
2021-04-26 17:36:58 -07:00
f82b33698d
Add missing asciidoctor heading anchors
...
Closes gh-26239
2021-04-26 17:35:14 -07:00
ba5b36d733
Restore support for binding random properties
...
Revert 0588e989af
2021-04-26 15:42:15 -07:00
5e8f383947
Extract code samples from docs
...
See gh-6313
2021-04-26 14:01:37 -07:00
6de10ff791
Merge branch '2.4.x'
...
Closes gh-26237
2021-04-26 15:53:37 +01:00
11fa850b97
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26236
2021-04-26 15:53:18 +01:00
4a990f3ed2
Use bean class loader when importing auto-configuration
...
Fixes gh-26234
2021-04-26 15:38:01 +01:00
1732d8ccf7
Merge branch '2.4.x'
...
Closes gh-26233
2021-04-26 11:37:20 +02:00
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
32a87fcbda
Extract code samples from docs
...
See gh-6313
2021-04-25 16:07:26 -07:00
2f852fa256
Update copyright year of changed files
2021-04-23 23:42:14 -07:00
f30d48e3b3
Extract code samples from docs
...
See gh-6313
2021-04-23 23:41:06 -07:00
02cc778911
Extract code samples from docs
...
See gh-6313
2021-04-23 19:10:09 -07:00
3075ac0f54
Formatting
2021-04-23 11:17:49 -07:00
50118f67fd
Test Maven plugin against latest Maven versions
...
See gh-26200
2021-04-22 14:59:16 +02:00
a7b0f90609
Merge branch '2.4.x'
...
Closes gh-26211
2021-04-22 14:48:30 +02:00
e424c1c4b4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26210
2021-04-22 14:48:15 +02:00
474e460d5e
Align Maven version in system requirements with what is actually tested
...
See gh-26209
2021-04-22 14:47:29 +02:00
65a7422a45
Upgrade to Kafka 2.6.2
...
Closes gh-24247
2021-04-22 14:12:55 +02:00
e3f81f0243
Merge branch '2.4.x'
2021-04-21 17:23:42 +02:00
db7460ddd5
Polish contribution based on Andy's review
...
See gh-26188
2021-04-21 17:23:21 +02:00
3ca6ed6246
Polish
...
Closes gh-26190
2021-04-21 17:20:22 +02:00
4be48d0d50
Polish
...
See gh-26188
2021-04-21 15:20:06 +02:00
6c68f3652c
Merge branch '2.4.x'
...
Closes gh-26186
2021-04-21 10:03:41 +02:00
8edeb2c7a9
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26185
2021-04-21 10:03:32 +02:00
856e0d0535
Document that MeterFilters are only applied to a managed registry
...
Closes gh-25610
2021-04-21 10:02:57 +02:00
d403103aac
Merge branch '2.4.x'
...
Closes gh-26182
2021-04-20 17:58:30 +02:00
6fc803c5a2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26181
2021-04-20 17:58:14 +02:00
6f73fd6785
Upgrade to Testcontainers 1.15.3
...
Closes gh-26179
2021-04-20 17:05:58 +02:00
b9348c6d28
Merge branch '2.4.x'
...
Closes gh-26169
2021-04-20 11:26:46 +01:00
bc1a462143
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26168
2021-04-20 11:19:10 +01:00
82198a99e0
Polish nohttp configuration
...
Closes gh-26166
2021-04-20 11:15:13 +01:00
55b9fc12c7
Merge branch '2.4.x'
...
Closes gh-26165
2021-04-20 10:23:57 +02:00
52543b84c1
Fix sourceType for spring.profiles.include
...
Closes gh-26163
2021-04-20 10:23:42 +02:00
cf5334da35
Merge branch '2.4.x'
...
Closes gh-26164
2021-04-20 10:22:55 +02:00
2bd4ccce8a
Document spring.profiles.group in configuration metadata
...
Closes gh-26127
2021-04-20 10:22:43 +02:00
e53453c69c
Fix broken assertions in tests
...
This commit also restores the HTTP response body
assertion that has been dropped in 5873ddd
2021-04-20 10:02:26 +02:00
57d35aba12
Merge branch '2.4.x'
...
Closes gh-26160
2021-04-19 17:09:45 +02:00
6bbd36c77a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26159
2021-04-19 17:01:28 +02:00
03b65f3260
Polish "Enhance multiple entity manager factories how-to"
...
See gh-14928
2021-04-19 16:59:31 +02:00
0d9db46f68
Enhance multiple entity manager factories how-to
...
See gh-14928
2021-04-19 16:53:50 +02:00
531ee83c6a
Merge branch '2.4.x'
...
Closes gh-26156
2021-04-19 14:33:17 +02:00
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
177152e007
Merge branch '2.4.x'
...
Closes gh-26155
2021-04-19 10:24:25 +01:00
0c30a5930d
Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
...
See gh-26149
2021-04-19 10:23:27 +01:00
4268f8da84
Use ConfigDataLocationResolvers' class loader to load resolver names
...
See gh-26149
2021-04-19 10:06:07 +01:00
221f36ba93
Add missing value provider metadata for SQL init resources
...
Closes gh-26154
2021-04-19 09:51:51 +02:00
548baf7914
Update copyright year of changed file
...
See gh-26145
2021-04-19 09:34:56 +02:00
996472b42d
Polish
...
See gh-26145
2021-04-19 09:34:55 +02:00
95a9f36ac1
Fix wrong replacements for spring.datasource.[schema|data]
...
See gh-26150
2021-04-19 09:27:24 +02:00
bac101647a
Polish contribution
...
See gh-25532
2021-04-16 09:29:48 +02:00
bd9dd9d5eb
Polish KotlinConstructorParametersBinderTests
...
See gh-25532
2021-04-16 09:22:45 +02:00
e1ad2cdab3
Fix Windows build failures
...
See gh-23098
2021-04-15 18:31:01 -07:00
a48c98b469
Revert "Switch default MVC path matching strategy"
...
This reverts commit ab8e599cfe
2021-04-15 17:35:24 -07:00
beaf03a008
Update copyright year of changed files
2021-04-15 12:22:48 -07:00
238d0fed71
Improve Log4J log level reset support
...
Update `Log4J2LoggingSystem` so that call to `setLevel` with a `null`
level with remove the logger if it was previously configured by a
`LoggingSystem` call.
To track which loggers have been configured by us, and which have been
configure directly by the user, a custom `LoggerConfig` subclass is
used. We'll only remove `LevelSetLoggerConfig` classes, for any others
we'll call `setLevel(null)` on the config.
Prior to this commit, it was impossible to set then reset a logger
level using the actuator endpoint. This is because Log4J doesn't provide
a way to get the actual configured level. If the `setLevel(null)` has
been applied, then `getLevel()` will return the value of the parent
logger or a default value of `ERROR`.
Fixes gh-24298
2021-04-15 12:22:24 -07:00
96823869a9
Merge branch '2.4.x'
...
Closes gh-26139
2021-04-15 12:02:01 -07:00
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
5142fe9b8e
Fix typo in Initialize a Database using basic SQL scripts
...
Closes gh-26137
2021-04-15 17:03:31 +01:00
e27c85698d
Polish
...
See gh-26135
2021-04-15 16:31:10 +02:00
fb5a1270e8
Add RepositoryMetricsAutoConfiguration to spring.factories
...
See gh-26134
2021-04-15 16:27:49 +02:00
beb7f7b02d
Avoid some redirects in docs
...
See gh-26129
2021-04-15 10:39:07 +02:00
f814beacec
Upgrade to Spring Session Dragonfruit-SR3
...
Closes gh-25907
2021-04-15 09:05:10 +02:00
e8eb68a458
Upgrade to Spring Session Dragonfruit-SR3
...
Closes gh-25907
2021-04-15 09:01:55 +02:00
f558ceda9a
Upgrade to Spring WS 3.1.0-RC1
...
Closes gh-25933
2021-04-15 08:49:08 +02:00
0146ced614
Upgrade to Spring Session 2021.0.0-RC1
...
Closes gh-25932
2021-04-15 08:48:41 +02:00
28d27f5fe7
Upgrade to Spring Kafka 2.7.0
...
Closes gh-25930
2021-04-15 08:48:09 +02:00
28665ee93b
Upgrade to Spring Integration 5.5.0-RC1
...
Closes gh-25929
2021-04-15 08:47:41 +02:00
282a8e09d0
Merge branch '2.4.x'
...
Closes gh-26125
2021-04-14 17:43:12 -07:00
5b836f3aee
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26124
2021-04-14 17:42:38 -07:00
61ff3c98bf
Polish 'Don't detect CloudPlatform when property is set'
...
See gh-25455
2021-04-14 17:29:30 -07:00
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
b4c9bb0d5c
Merge branch '2.4.x'
...
Closes gh-26122
2021-04-14 15:05:55 -07:00
fb3796dae8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26121
2021-04-14 15:02:58 -07:00
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
bf8051cd47
Log ApplicationAvailability state changes
...
Fixes gh-23098
2021-04-14 13:54:59 -05:00
1f0127036c
Upgrade to Spring Integration 5.4.6
...
Closes gh-26113
2021-04-14 17:26:54 +01:00
e6130c6ce0
Upgrade to Spring Integration 5.3.7.RELEASE
...
Closes gh-26112
2021-04-14 17:24:22 +01:00
9d0e1a2cb3
Include SQL init auto-config in Data RDBC test slice
...
Closes gh-24741
2021-04-14 16:37:33 +01:00
05adf02a47
Include SQL init auto-config in JDBC-based test slices
...
Closes gh-25323
2021-04-14 15:11:28 +01:00
e2252c7856
Merge branch '2.4.x'
...
Closes gh-26111
2021-04-14 15:44:10 +02:00
401ebc672b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26110
2021-04-14 15:43:57 +02:00
ab785d9417
Document limitations of using deferred JPA bootstrap
...
Closes gh-24027
2021-04-14 15:38:34 +02:00
fe2e57dee8
Upgrade to Spring Data 2021.0.0
...
Closes gh-25928
2021-04-14 15:18:12 +02:00
8c15e693d3
Merge branch '2.4.x'
...
Closes gh-26109
2021-04-14 15:07:23 +02:00
0d81b4d07e
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26108
2021-04-14 15:04:28 +02:00
0fb482579b
Harmonize Neo4jContainer startup options
...
Closes gh-26084
2021-04-14 14:50:04 +02:00
c04d640452
Scan for ElasticSearch's @Document type
...
Closes gh-26028
2021-04-14 14:42:32 +02:00
517998a829
Upgrade to Infinispan 12.1.1.Final
...
Closes gh-26053
2021-04-14 13:47:57 +02:00
0cedbf6e06
Upgrade to Spring Data 2020.0.8
...
Closes gh-25910
2021-04-14 13:37:24 +02:00
1de2dd9ecb
Upgrade to Spring Data Neumann-SR9
...
Closes gh-25905
2021-04-14 13:31:16 +02:00
62a70475c2
Fix class condition on deprecated class
...
Closes gh-26107
2021-04-14 13:30:20 +02:00
c5214b3c84
Merge branch '2.4.x'
...
Closes gh-26105
2021-04-14 10:06:39 +02:00
1855f96d07
Polish "Document spring.config.additional-location should be used early"
...
See gh-26085
2021-04-14 10:06:06 +02:00
b0b1c04fc4
Document spring.config.additional-location should be used early
...
See gh-26085
2021-04-14 10:03:56 +02:00
90fccd7097
Upgrade to SAAJ Impl 1.5.3
...
Closes gh-26104
2021-04-14 08:47:27 +02:00
54d23bac9d
Upgrade to Micrometer 1.6.6
...
Closes gh-26103
2021-04-14 08:47:26 +02:00
3a8736a112
Upgrade to Lettuce 6.0.4.RELEASE
...
Closes gh-26102
2021-04-14 08:47:25 +02:00
0429ab4b88
Upgrade to HSQLDB 2.5.2
...
Closes gh-26101
2021-04-14 08:47:24 +02:00
00b53b5bdb
Upgrade to Glassfish JAXB 2.3.4
...
Closes gh-26100
2021-04-14 08:47:22 +02:00
cb2a7dd4cb
Upgrade to SAAJ Impl 1.5.3
...
Closes gh-26099
2021-04-14 08:28:19 +02:00
cb1d7a3bc8
Upgrade to Micrometer 1.5.13
...
Closes gh-26098
2021-04-14 08:28:18 +02:00
7c85ebc9c9
Upgrade to Lettuce 5.3.7.RELEASE
...
Closes gh-26097
2021-04-14 08:28:16 +02:00
274cfc0af0
Upgrade to HSQLDB 2.5.2
...
Closes gh-26096
2021-04-14 08:28:14 +02:00
4a5cb3f29e
Upgrade to Glassfish JAXB 2.3.4
...
Closes gh-26095
2021-04-14 08:28:13 +02:00
caa21b0fbe
Upgrade to Flatten Maven Plugin 1.2.7
...
Closes gh-26094
2021-04-14 08:28:12 +02:00
f8768c053a
Upgrade to Micrometer 1.7.0-RC1
...
Closes gh-25934
2021-04-14 08:17:09 +02:00
7723e7f130
Upgrade to Spring HATEOAS 1.3.0
...
Closes gh-25927
2021-04-14 08:16:30 +02:00
f45202e86f
Ensure String to RSA key converters can be used
...
Add tests to ensure that RSA key converters can be used with an
auto-configured security setup.
See gh-26089
Closes gh-24891
2021-04-13 19:13:11 -07:00
51c3e18011
Support binding with BeanFactory ConversionService
...
Update `BindConverter` so that multiple `ConverterServices` can be
specified when binding. This change allows `ConversionServiceDeducer`
to add both the `BeanFactory` conversion service as well as a
custom `ApplicationConversionService` when beans annotated with
`@ConfigurationPropertiesBinding` are found.
Fixes gh-26089
2021-04-13 19:13:06 -07:00
5581ec0e29
Make getSharedInstance() unmodifiable
...
Update `ApplicationConversionService.getSharedInstance()` so that the
instance returned is unmodifiable and converters cannot be added or
removed from it.
Closes gh-26088
2021-04-13 19:13:03 -07:00
Andy Wilkinson
Stephane Nicoll
Madhura Bhave
nguyensach
dreis2211
Phillip Webb
Scott Frederick
Matthias Stock
Roman Zabaluev
Dmitry Pavlov
Brian Clozel
Slawomir Jaranowski
Shimizu, Yuko
izeye
Niclas Fredriksson
Sriram
zuisong
katielevy1
Shannon Carey