Commit Graph

32188 Commits (a06b41df12431b02525a9625b92a5cae27fb90cf)
 

Author SHA1 Message Date
Madhura Bhave a06b41df12 Merge branch '2.4.x' into main
Fixes gh-26434
4 years ago
Madhura Bhave eff024b0ce Polish "Process additional profiles before config files processing"
See gh-25817
4 years ago
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
4 years ago
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
4 years ago
Madhura Bhave 2e1b20ce2b Polish "Process additional profiles before config files processing"
See gh-25817
4 years ago
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
4 years ago
Stephane Nicoll ee083acf83 Merge pull request #26416 from nguyensach
* pr/26416:
  Polish "Polish SpringApplicationAdminJmxAutoConfigurationTests"
  Polish SpringApplicationAdminJmxAutoConfigurationTests

Closes gh-26416
4 years ago
Stephane Nicoll 0e2bb5f179 Polish "Polish SpringApplicationAdminJmxAutoConfigurationTests"
See gh-26416
4 years ago
nguyensach b263f126fa Polish SpringApplicationAdminJmxAutoConfigurationTests
See gh-26416
4 years ago
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.
4 years ago
Stephane Nicoll 2e0481ca28 Remove useless overrides of ConditionalOnProperty#matchIfMissing
Closes gh-26432
4 years ago
Stephane Nicoll 0512992791 Upgrade to Reactor 2020.0.7
Closes gh-26359
4 years ago
Stephane Nicoll b3d31a937c Merge branch '2.4.x' 4 years ago
Stephane Nicoll c50afc69bd Upgrade to Reactor 2020.0.7
Closes gh-26358
4 years ago
Stephane Nicoll 7539ff0b48 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 526af5a790 Upgrade to Reactor Dysprosium-SR20
Closes gh-26424
4 years ago
Stephane Nicoll 09fb15b01b Merge branch '2.4.x' 4 years ago
Stephane Nicoll 21fbb2e79c Start building against Micrometer 1.6.7 snapshots
See gh-26430
4 years ago
Stephane Nicoll 0f7db901d9 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 5cdabc9729 Start building against Spring Kafka 2.5.13 snapshots
See gh-26429
4 years ago
Stephane Nicoll 47d5592035 Start building against Spring AMQP 2.2.17 snapshots
See gh-26428
4 years ago
Stephane Nicoll 3a8500126b Start building against Micrometer 1.5.14 snapshots
See gh-26427
4 years ago
Stephane Nicoll 9772867862 Start building against Spring Batch 4.2.7 snapshots
See gh-26426
4 years ago
Stephane Nicoll 1b9e66a7c8 Merge branch '2.4.x' 4 years ago
Stephane Nicoll fc1f09b414 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 66fe98eb3f Start building against Spring Framework 5.2.15 snapshots
See gh-26425
4 years ago
Stephane Nicoll c059759c4d Start building against Reactor Dysprosium-SR20 snapshots
See gh-26424
4 years ago
Stephane Nicoll 8ff07a8185 Merge pull request #26420 from dreis2211
* pr/26420:
  Test our Gradle Plugin against Gradle 7.0.1

Closes gh-26420
4 years ago
dreis2211 ba2a4781d2 Test our Gradle Plugin against Gradle 7.0.1
See gh-26420
4 years ago
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
4 years ago
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
4 years ago
Stephane Nicoll ffbd3b819f Update copyright year of changed file
See gh-26417
4 years ago
nguyensach c82de83202 Use try-with-resources statement
See gh-26417
4 years ago
Stephane Nicoll 217f6efa64 Start building against Micrometer 1.7.0 snapshots
See gh-26379
4 years ago
Stephane Nicoll 8d2fa26a99 Start building against Spring LDAP 2.3.4 snapshots
See gh-26394
4 years ago
Stephane Nicoll 14dd98c690 Start building against Spring Batch 4.3.3 snapshots
See gh-26392
4 years ago
Stephane Nicoll 98b48c1069 Start building against Spring WS 3.1.0 snapshots
See gh-26390
4 years ago
Stephane Nicoll f5cba056d7 Start building against Spring Session 2021.0.0 snapshots
See gh-26389
4 years ago
Stephane Nicoll 8fcba2c333 Start building against Spring Integration 5.5.0 snapshots
See gh-26388
4 years ago
Stephane Nicoll 55ccf9f750 Start building against Spring Security 5.5.0 snapshots
See gh-26387
4 years ago
Stephane Nicoll c9cd7cae51 Start building against Spring Kafka 2.7.1 snapshots
See gh-26386
4 years ago
Stephane Nicoll c85936f004 Start building against Spring AMQP 2.3.7 snapshots
See gh-26384
4 years ago
Stephane Nicoll b93263ec3c Start building against Spring Data 2021.0.1 snapshots
See gh-26382
4 years ago
Stephane Nicoll 10dca8d829 Start building against Spring HATEOAS 1.3.1 snapshots
See gh-26380
4 years ago
Stephane Nicoll 907cc92497 Merge branch '2.4.x' 4 years ago
Stephane Nicoll a5cb9540ca Start building against Spring LDAP 2.3.4 snapshots
See gh-26393
4 years ago
Stephane Nicoll 0d920894b7 Start building against Spring Batch 4.3.3 snapshots
See gh-26391
4 years ago
Stephane Nicoll 618475887c Start building against Spring Kafka 2.6.8 snapshots
See gh-26385
4 years ago
Stephane Nicoll 2479f69db1 Start building against Spring AMQP 2.3.7 snapshots
See gh-26383
4 years ago
Stephane Nicoll 05a3b9bbeb Start building against Spring Data 2020.0.9 snapshots
See gh-26381
4 years ago