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
32,395 Commits 23 Branches 348 Tags 291 MiB
Commit Graph

32395 Commits

Author SHA1 Message Date
Andy Wilkinson 7a2d5d4eee Upgrade to Spring Framework 5.3.7 
Closes gh-26360
 2021-05-12 14:51:33 +01:00
Andy Wilkinson 750b5a17ce Merge branch '2.4.x' 2021-05-12 14:33:51 +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 c5b1cfc921 Merge branch '2.4.x' 2021-05-12 07:35:15 +02: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 a06b41df12 Merge branch '2.4.x' into main 
Fixes gh-26434
 2021-05-11 15:37:52 -07: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
Madhura Bhave 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
Madhura Bhave 2e1b20ce2b Polish "Process additional profiles before config files processing" 
See gh-25817
 2021-05-11 13:06:46 -07:00
nguyensach 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
Stephane Nicoll ee083acf83 Merge pull request #26416 from nguyensach 
* pr/26416:
  Polish "Polish SpringApplicationAdminJmxAutoConfigurationTests"
  Polish SpringApplicationAdminJmxAutoConfigurationTests

Closes gh-26416
 2021-05-11 17:19:31 +02:00
Stephane Nicoll 0e2bb5f179 Polish "Polish SpringApplicationAdminJmxAutoConfigurationTests" 
See gh-26416
 2021-05-11 17:19:24 +02:00
nguyensach b263f126fa Polish SpringApplicationAdminJmxAutoConfigurationTests 
See gh-26416
 2021-05-11 17:19:24 +02:00
Stephane Nicoll 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
Stephane Nicoll 2e0481ca28 Remove useless overrides of ConditionalOnProperty#matchIfMissing 
Closes gh-26432
 2021-05-11 16:48:05 +02:00
Stephane Nicoll 0512992791 Upgrade to Reactor 2020.0.7 
Closes gh-26359
 2021-05-11 15:56:26 +02:00
Stephane Nicoll b3d31a937c Merge branch '2.4.x' 2021-05-11 15:56:13 +02: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 09fb15b01b Merge branch '2.4.x' 2021-05-11 13:50:30 +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 1b9e66a7c8 Merge branch '2.4.x' 2021-05-11 11:04:59 +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 8ff07a8185 Merge pull request #26420 from dreis2211 
* pr/26420:
  Test our Gradle Plugin against Gradle 7.0.1

Closes gh-26420
 2021-05-11 08:25:37 +02:00
dreis2211 ba2a4781d2 Test our Gradle Plugin against Gradle 7.0.1 
See gh-26420
 2021-05-11 08:25:19 +02:00
Phillip Webb 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
Stephane Nicoll 65db4411ae Merge pull request #26417 from nguyensach 
* pr/26417:
  Update copyright year of changed file
  Use try-with-resources statement

Closes gh-26417
 2021-05-10 14:59:49 +02:00
Stephane Nicoll ffbd3b819f Update copyright year of changed file 
See gh-26417
 2021-05-10 14:58:14 +02:00
nguyensach c82de83202 Use try-with-resources statement 
See gh-26417
 2021-05-10 14:57:38 +02:00
Stephane Nicoll 217f6efa64 Start building against Micrometer 1.7.0 snapshots 
See gh-26379
 2021-05-10 12:46:23 +02:00
Stephane Nicoll 8d2fa26a99 Start building against Spring LDAP 2.3.4 snapshots 
See gh-26394
 2021-05-10 12:45:49 +02:00
Stephane Nicoll 14dd98c690 Start building against Spring Batch 4.3.3 snapshots 
See gh-26392
 2021-05-10 12:44:59 +02:00
Stephane Nicoll 98b48c1069 Start building against Spring WS 3.1.0 snapshots 
See gh-26390
 2021-05-10 12:44:27 +02:00
Stephane Nicoll f5cba056d7 Start building against Spring Session 2021.0.0 snapshots 
See gh-26389
 2021-05-10 12:44:00 +02:00
Stephane Nicoll 8fcba2c333 Start building against Spring Integration 5.5.0 snapshots 
See gh-26388
 2021-05-10 12:43:29 +02:00
Stephane Nicoll 55ccf9f750 Start building against Spring Security 5.5.0 snapshots 
See gh-26387
 2021-05-10 12:43:04 +02:00
Stephane Nicoll c9cd7cae51 Start building against Spring Kafka 2.7.1 snapshots 
See gh-26386
 2021-05-10 12:42:36 +02:00
Stephane Nicoll c85936f004 Start building against Spring AMQP 2.3.7 snapshots 
See gh-26384
 2021-05-10 12:42:05 +02:00
Stephane Nicoll b93263ec3c Start building against Spring Data 2021.0.1 snapshots 
See gh-26382
 2021-05-10 12:41:37 +02:00