Andy Wilkinson
d5d84265f4
Merge branch '2.3.x'
...
Closes gh-22270
2020-07-09 09:43:11 +01:00
Andy Wilkinson
888bea5224
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22268
2020-07-09 09:41:55 +01:00
Andy Wilkinson
efad6c16d1
Merge branch '2.1.x' into 2.2.x
...
Closes gh-22269
2020-07-09 09:40:50 +01:00
Andy Wilkinson
9800804b65
Upgrade CI images to use ubuntu:bionic-20200630
...
Closes gh-22271
2020-07-09 09:39:52 +01:00
Andy Wilkinson
41ce1c9de2
Update JDK 15 CI to use 2020-07-08-05-49
...
Closes gh-22267
2020-07-09 09:36:42 +01:00
Scott Frederick
6b7640ba2e
Merge branch '2.3.x'
...
Closes gh-22272
2020-07-08 15:10:42 -05:00
Scott Frederick
1e2176b6c9
Improve Redis URL validation
...
This commit improves the validation of URLs provided in the property
'spring.redis.url' used to auto-configure a Spring Data Redis
connection. In particular, only the URL schemes 'redis://' and
'rediss://' are allowed, and any other scheme will result in a
configuration error. A failure analyzer is also provided to improve
diagnostics for common mis-configurations detected by this validation.
Fixes gh-21999
2020-07-08 14:50:26 -05:00
Andy Wilkinson
1f1c6fd3ea
Merge branch '2.3.x'
...
Closes gh-22265
2020-07-08 18:00:26 +01:00
Andy Wilkinson
d84aeef529
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22264
2020-07-08 18:00:07 +01:00
Andy Wilkinson
66987533d1
Link to application properties section from externalized config list
...
Closes gh-22262
2020-07-08 17:58:35 +01:00
Andy Wilkinson
3e33b6c854
Merge branch '2.3.x'
...
Closes gh-22263
2020-07-08 17:23:13 +01:00
Andy Wilkinson
502ccb6586
Honor spring.autoconfigure.exclude in test slices
...
Previously, the import selector for `@ImportAutoConfiguration` did not
consider the spring.autoconfigure.exclude property when determining
which auto-configurations to exclude. This meant that tests using a
slice that included a particular auto-configuration would include it
even if the application's configuration excluded it via
spring.autoconfigure.exclude. Confusingly, this could result in a
sliced test using an auto-configuration that would be excluded in a
broader `@SpringBootTest`.
This commit updates the ImportAutoConfigurationImportSelector to
consider the spring.autoconfigure.exclude property so that sliced tests
will use a subset of the auto-configurations that a `@SpringBootTest`
would use.
Fixes gh-21736
2020-07-08 17:22:32 +01:00
Stephane Nicoll
456cb2da51
Merge pull request #22261 from izeye
...
* pr/22261:
Replace ReflectionUtils with AssertJ's extracting()
Closes gh-22261
2020-07-08 14:00:29 +02:00
Johnny Lim
df34d26f4f
Replace ReflectionUtils with AssertJ's extracting()
...
See gh-22261
2020-07-08 13:57:59 +02:00
Andy Wilkinson
9894be8f1e
Merge branch '2.3.x'
...
Closes gh-22255
2020-07-07 17:29:20 +01:00
Andy Wilkinson
0af8c35428
Auto-configure Rabbit CF with credentials provider and refresh service
...
Closes gh-22016
2020-07-07 13:07:40 +01:00
Stephane Nicoll
14c80c73c8
Merge pull request #22240 from izeye
...
* pr/22240:
Polish ErrorPage.equals()
Closes gh-22240
2020-07-07 14:01:37 +02:00
Johnny Lim
4ab4c61761
Polish ErrorPage.equals()
...
See gh-22240
2020-07-07 14:01:16 +02:00
Andy Wilkinson
1b85ce0769
Streamline OAuth2 resource server auto-config class conditions
...
Fixes gh-22233
2020-07-07 12:22:27 +01:00
Andy Wilkinson
247fd59422
Merge branch '2.3.x'
...
Closes gh-22252
2020-07-07 11:52:50 +01:00
Andy Wilkinson
b8bc219b25
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22251
2020-07-07 11:52:34 +01:00
Andy Wilkinson
4e79bb1cff
Disable bean method proxying in SpringBootJdbcConfiguration
...
Closes gh-22231
2020-07-07 11:51:07 +01:00
Andy Wilkinson
29b69bfbdf
Merge branch '2.3.x'
...
Closes gh-22250
2020-07-07 11:43:17 +01:00
Andy Wilkinson
da319f5f59
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22249
2020-07-07 11:43:03 +01:00
Andy Wilkinson
14f24dbecc
Merge branch '2.1.x' into 2.2.x
...
Closes gh-22248
2020-07-07 11:42:43 +01:00
Andy Wilkinson
26f591264c
Fix handling of NestedServletException with no root cause
...
Fixes gh-22169
2020-07-07 11:34:25 +01:00
Andy Wilkinson
c3c1f2d29f
Merge pull request #21913 from dreis2211
...
* gh-21913:
Use Class.getDeclaredConstructor().newInstance()
Closes gh-21913
2020-07-07 11:14:01 +01:00
dreis2211
507eb9498b
Use Class.getDeclaredConstructor().newInstance()
...
See gh-21913
2020-07-07 11:12:35 +01:00
Andy Wilkinson
fbfb7df3e1
Merge branch '2.3.x'
...
Closes gh-22247
2020-07-07 10:54:00 +01:00
Andy Wilkinson
24e1a1dddf
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22246
2020-07-07 10:53:45 +01:00
Andy Wilkinson
1ad66cf92b
Merge pull request #22207 from Sineaggi
...
* gh-22207:
Polish "Rename NoneOfNestedConditions to NoneNestedConditions in example docs"
Rename NoneOfNestedConditions to NoneNestedConditions in example docs
Closes gh-22207
2020-07-07 10:46:44 +01:00
Andy Wilkinson
a8d3f9af31
Polish "Rename NoneOfNestedConditions to NoneNestedConditions in example docs"
...
See gh-22207
2020-07-07 10:46:32 +01:00
Clayton Walker
7fee70a625
Rename NoneOfNestedConditions to NoneNestedConditions in example docs
...
See gh-22207
2020-07-07 10:46:20 +01:00
Andy Wilkinson
0200a3783b
Merge pull request #22212 from XenoAmess
...
* gh-22212:
Polish "Remove redundant bitwise operations"
Remove redundant bitwise operations
Closes gh-22212
2020-07-07 10:37:54 +01:00
Andy Wilkinson
7864a7da52
Polish "Remove redundant bitwise operations"
...
See gh-22212
2020-07-07 10:37:44 +01:00
XenoAmess
de46d4bfd3
Remove redundant bitwise operations
...
See gh-22212
2020-07-07 10:37:26 +01:00
Andy Wilkinson
a118668212
Merge pull request #22209 from XenoAmess
...
* gh-22209:
Use valueOf rather than parseInt as result is assigned to an int
Closes gh-22209
2020-07-07 10:27:14 +01:00
XenoAmess
7c73ed69e1
Use valueOf rather than parseInt as result is assigned to an int
...
See gh-22209
2020-07-07 10:26:25 +01:00
Andy Wilkinson
e5b5622b1f
Merge pull request #22213 from XenoAmess
...
* gh-22213:
Polish "Remove redundant close() call from JarResourceManagerTests"
Remove redundant close() call from JarResourceManagerTests
Closes gh-22213
2020-07-07 10:17:31 +01:00
Andy Wilkinson
3c7f54b97f
Polish "Remove redundant close() call from JarResourceManagerTests"
...
See gh-22213
2020-07-07 10:17:22 +01:00
XenoAmess
623b3ab96e
Remove redundant close() call from JarResourceManagerTests
...
See gh-22213
2020-07-07 10:16:20 +01:00
Andy Wilkinson
eb56bb5797
Merge pull request #22211 from XenoAmess
...
* gh-22211:
Polish "Use new ArrayList(Collection) rather than new and addAll"
Use new ArrayList(Collection) rather than new and addAll
Closes gh-22211
2020-07-07 10:14:21 +01:00
Andy Wilkinson
cd8081f952
Polish "Use new ArrayList(Collection) rather than new and addAll"
...
See gh-22211
2020-07-07 10:09:48 +01:00
XenoAmess
fb70c529d4
Use new ArrayList(Collection) rather than new and addAll
...
See gh-22211
2020-07-07 10:07:29 +01:00
Andy Wilkinson
54ce2905af
Merge pull request #22210 from XenoAmess
...
* gh-22210:
Use new ArrayList(Collection) rather than new, iterate, and add
Closes gh-22210
2020-07-07 10:05:56 +01:00
XenoAmess
90d8480ffe
Use new ArrayList(Collection) rather than new, iterate, and add
...
See gh-22210
2020-07-07 10:04:13 +01:00
Andy Wilkinson
597d6acabc
Merge pull request #22218 from XenoAmess
...
* gh-22218:
Fix typos in test code
Closes gh-22218
2020-07-07 10:02:13 +01:00
XenoAmess
66dc24062f
Fix typos in test code
...
See gh-22218
2020-07-07 10:01:48 +01:00
Andy Wilkinson
2a9193f6d9
Merge branch '2.3.x'
...
Closes gh-22244
2020-07-07 09:56:34 +01:00
Andy Wilkinson
96e6b74894
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22243
2020-07-07 09:56:21 +01:00