root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
31,113 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

31113 Commits

Author SHA1 Message Date
Andy Wilkinson e29d2e208e Merge branch '2.3.x' into 2.4.x 2021-05-12 17:40:48 +01:00
Andy Wilkinson b3af6d6403 Polish 
See gh-25798
 2021-05-12 17:40:33 +01:00
Andy Wilkinson 322d6455db Upgrade to Micrometer 1.6.7 
Closes gh-26430
 2021-05-12 14:52:05 +01:00
Andy Wilkinson 7a2d5d4eee Upgrade to Spring Framework 5.3.7 
Closes gh-26360
 2021-05-12 14:51:33 +01:00
Andy Wilkinson 7205e55a0d Merge branch '2.3.x' into 2.4.x 2021-05-12 14:33:40 +01:00
Andy Wilkinson ece845a4e0 Upgrade to Micrometer 1.5.14 
Closes gh-26427
 2021-05-12 14:09:27 +01:00
Andy Wilkinson 1a32a864d4 Upgrade to Spring Framework 5.2.15.RELEASE 
Closes gh-26425
 2021-05-12 11:30:57 +01:00
Stephane Nicoll 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
Madhura Bhave eff024b0ce Polish "Process additional profiles before config files processing" 
See gh-25817
 2021-05-11 15:04:34 -07:00
nguyensach 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
Stephane Nicoll c50afc69bd Upgrade to Reactor 2020.0.7 
Closes gh-26358
 2021-05-11 15:55:56 +02:00
Stephane Nicoll 7539ff0b48 Merge branch '2.3.x' into 2.4.x 2021-05-11 15:55:33 +02:00
Stephane Nicoll 526af5a790 Upgrade to Reactor Dysprosium-SR20 
Closes gh-26424
 2021-05-11 15:55:14 +02:00
Stephane Nicoll 21fbb2e79c Start building against Micrometer 1.6.7 snapshots 
See gh-26430
 2021-05-11 13:47:38 +02:00
Stephane Nicoll 0f7db901d9 Merge branch '2.3.x' into 2.4.x 2021-05-11 13:47:21 +02:00
Stephane Nicoll 5cdabc9729 Start building against Spring Kafka 2.5.13 snapshots 
See gh-26429
 2021-05-11 13:29:00 +02:00
Stephane Nicoll 47d5592035 Start building against Spring AMQP 2.2.17 snapshots 
See gh-26428
 2021-05-11 13:28:28 +02:00
Stephane Nicoll 3a8500126b Start building against Micrometer 1.5.14 snapshots 
See gh-26427
 2021-05-11 13:27:57 +02:00
Stephane Nicoll 9772867862 Start building against Spring Batch 4.2.7 snapshots 
See gh-26426
 2021-05-11 13:26:58 +02:00
Stephane Nicoll fc1f09b414 Merge branch '2.3.x' into 2.4.x 2021-05-11 11:04:48 +02:00
Stephane Nicoll 66fe98eb3f Start building against Spring Framework 5.2.15 snapshots 
See gh-26425
 2021-05-11 10:05:47 +02:00
Stephane Nicoll c059759c4d Start building against Reactor Dysprosium-SR20 snapshots 
See gh-26424
 2021-05-11 10:05:00 +02:00
Stephane Nicoll a5cb9540ca Start building against Spring LDAP 2.3.4 snapshots 
See gh-26393
 2021-05-10 09:38:41 +02:00
Stephane Nicoll 0d920894b7 Start building against Spring Batch 4.3.3 snapshots 
See gh-26391
 2021-05-10 09:03:43 +02:00
Stephane Nicoll 618475887c Start building against Spring Kafka 2.6.8 snapshots 
See gh-26385
 2021-05-10 09:03:14 +02:00
Stephane Nicoll 2479f69db1 Start building against Spring AMQP 2.3.7 snapshots 
See gh-26383
 2021-05-10 09:02:27 +02:00
Stephane Nicoll 05a3b9bbeb Start building against Spring Data 2020.0.9 snapshots 
See gh-26381
 2021-05-10 09:01:56 +02:00
Andy Wilkinson fe4d20c976 Merge branch '2.3.x' into 2.4.x 
Closes gh-26411
 2021-05-07 11:25:10 +01:00
Andy Wilkinson 6daf67a88c Upgrade to Gradle 6.9 
Closes gh-26408
 2021-05-07 11:21:24 +01:00
Stephane Nicoll 559af275a4 Merge branch '2.3.x' into 2.4.x 
Closes gh-26405
 2021-05-07 09:14:35 +02:00
Stephane Nicoll 22e965fd61 Merge pull request #26399 from nguyensach 
* pr/26399:
  Fix wrong reference to Cassandra in DockerImageNames#couchbase

Closes gh-26399
 2021-05-07 09:14:26 +02:00
Sach Nguyen afa77b8253 Fix wrong reference to Cassandra in DockerImageNames#couchbase 
See gh-26399
 2021-05-07 09:12:43 +02:00
Phillip Webb 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
Phillip Webb 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.

Closes gh-26400

Co-authored-by: Scott Frederick <sfrederick@vmware.com>
Co-authored-by: Madhura Bhave <mbhave@vmware.com>
 2021-05-06 19:43:40 -07:00
Scott Frederick 922517c0e5 Polish 2021-05-06 19:43:31 -07:00
Andy Wilkinson fe696ee22a Merge branch '2.3.x' into 2.4.x 
Closes gh-26396
 2021-05-06 20:11:59 +01:00
Andy Wilkinson ef9e3bafff Test our Gradle plugin against 6.9-rc-2 
Closes gh-26395
 2021-05-06 20:10:54 +01:00
Stephane Nicoll 3a596ed130 Start building against Spring Framework 5.3.7 snapshots 
See gh-26360
 2021-05-06 16:43:17 +02:00
Stephane Nicoll 17fdd5a79f Start building against Reactor 2020.0.7 snapshots 
See gh-26358
 2021-05-06 16:42:45 +02:00
Andy Wilkinson f7fae8f0f2 Merge branch '2.3.x' into 2.4.x 
Closes gh-26364
 2021-05-05 09:52:53 +01:00
Andy Wilkinson b3275c5647 Align productionRuntimeClasspath with runtimeClasspath 
Fixes gh-25798
 2021-05-05 09:52:44 +01:00
Andy Wilkinson 75bb50bd02 Merge branch '2.3.x' into 2.4.x 
Closes gh-26353
 2021-05-04 10:33:06 +01:00
Andy Wilkinson deca737b01 Configure source and target compatibility at the task level 
Closes gh-26350
 2021-05-04 10:29:54 +01:00
Andy Wilkinson 1417c1b0c4 Merge branch '2.3.x' into 2.4.x 
Closes gh-26351
 2021-05-04 10:22:12 +01:00
Andy Wilkinson 4c42810df9 Ensure that server tests pick up latest snapshots 
Closes gh-25921
 2021-05-04 09:51:15 +01:00
Andy Wilkinson cb1af35dde Merge branch '2.3.x' into 2.4.x 
Closes gh-26348
 2021-05-04 09:46:01 +01:00
Andy Wilkinson 6440843358 Do not wait indefinitely in initialize test if refresh fails 
Closes gh-26286
 2021-05-04 09:44:56 +01:00
Scott Frederick 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
Scott Frederick 65cb654a22 Merge branch '2.3.x' into 2.4.x 
Closes gh-26333
 2021-04-30 14:15:30 -05:00
Scott Frederick 524ab4cea7 Move content from CONTRIBUTING.adoc to the wiki 
Closes gh-26332
 2021-04-30 14:14:22 -05:00