Commit Graph

33172 Commits

Author SHA1 Message Date
Andy Wilkinson
000d84eedd Merge branch '2.4.x'
Closes gh-26461
2021-05-14 11:58:31 +01:00
Andy Wilkinson
c2ef7578e8 Merge branch '2.3.x' into 2.4.x
Closes gh-26460
2021-05-14 11:41:24 +01:00
Andy Wilkinson
444474926c Configure JTA tests to write logs beneath build/
Closes gh-26440
2021-05-14 11:40:43 +01:00
Phillip Webb
83668f96af Merge branch '2.4.x'
Closes gh-26458
2021-05-13 23:38:41 -07:00
Phillip Webb
73131e99da Make BufferingApplicationStartup thread safe
Update `BufferingApplicationStartup` to use thread safe data structures.

Prior to this commit, it was possible for calls from different threads
(for example due to request scope beans) to cause a
NoSuchElementException to be thrown.

Closes gh-25792
2021-05-13 23:35:36 -07:00
Andy Wilkinson
f44c99df26 Merge branch '2.4.x'
Closes gh-26452
2021-05-13 14:01:37 +01:00
Andy Wilkinson
fd3d619670 Recommend default Servlet when using Jersey as a Filter
Closes gh-25733
2021-05-13 13:58:07 +01:00
Andy Wilkinson
89b5ece9b4 Use resource loader's class loader in config loading
Previously, classes involved in config loading used a variety of
potentially different class loaders when calling SpringFactoriesLoader.
Some classes would use their own class loader and others would use null
which results in SpringFactoriesLoader's class loader being used.

This commit updates the config loading classes to consistently use the
resource loader's class loader.

Fixes gh-26126
2021-05-13 13:25:47 +01:00
Andy Wilkinson
f92510e39d Merge branch '2.4.x'
Closes gh-26451
2021-05-13 11:44:27 +01:00
Andy Wilkinson
970f933806 Merge branch '2.3.x' into 2.4.x
Closes gh-26450
2021-05-13 11:44:01 +01:00
Andy Wilkinson
64aac01272 Merge pull request #26449 from weixsun
* gh-26449:
  Polish "Use try-with-resources statement"
  Use try-with-resources statements

Closes gh-26449
2021-05-13 11:37:22 +01:00
Andy Wilkinson
2dd94b5554 Polish "Use try-with-resources statement"
See gh-26449
2021-05-13 11:37:10 +01:00
weixsun
5ba9db391f Use try-with-resources statements
See gh-26449
2021-05-13 11:36:14 +01:00
Scott Frederick
e9adb1ab88 Handle long file names in buildpack images
Fixes gh-26445
2021-05-12 18:14:56 -05:00
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
c257f2842a Merge branch '2.4.x' 2021-05-12 17:58:37 +01: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
6fb838e989 Merge branch '2.4.x' 2021-05-12 16:25:13 +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
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