Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,208 Commits 23 Branches 0 Tags
b62905b91d746e752be06fc342abffd4b83fcf23
Commit Graph

13238 Commits

Author SHA1 Message Date
Scott Frederick
b62905b91d Merge branch '2.4.x' 
Closes gh-25840
 2021-05-12 15:48:59 -05:00
Scott Frederick
8ac297d6f3 Merge branch '2.3.x' into 2.4.x 
Closes gh-25839
 2021-05-12 14:57:40 -05:00
Scott Frederick
32d378a348 Use test harness for image building integration tests 
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.

Fixes gh-25838
 2021-05-12 14:51:45 -05:00
Andy Wilkinson
e5af3dbfc7 Upgrade to Spring HATEOAS 1.2.6 
Closes gh-26442
 2021-05-12 17:57:54 +01:00
Andy Wilkinson
07de9e3920 Merge branch '2.4.x' 2021-05-12 17:40:58 +01:00
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
19fa1a6107 Upgrade to Spring HATEOAS 1.3.1 
Closes gh-26380
 2021-05-12 16:28:11 +01:00
Andy Wilkinson
827e0cf80a Upgrade to Micrometer 1.7.0 
Closes gh-26379
 2021-05-12 16:27:35 +01:00
Andy Wilkinson
0e68f3c303 Upgrade to Spring Framework 5.3.7 
Closes gh-26361
 2021-05-12 16:26:53 +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
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
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
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
c50afc69bd Upgrade to Reactor 2020.0.7 
Closes gh-26358
 2021-05-11 15:55:56 +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
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
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
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
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
Stephane Nicoll
10dca8d829 Start building against Spring HATEOAS 1.3.1 snapshots 
See gh-26380
 2021-05-10 12:41:12 +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