root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity
27,468 Commits 23 Branches 348 Tags 292 MiB
Commit Graph

9882 Commits

Author SHA1 Message Date
Andy Wilkinson c258cec814 Merge branch '2.3.x' 
Closes gh-22285
 2020-07-09 12:13:58 +01:00
Andy Wilkinson b24f17b35c Rework spring-boot-docs to be a full-blown java project 
Previously, spring-boot-docs used the java-base-plugin and then added
configuration on top. This has proven to be error prone, with the most
recent problem being that the tests were not being compiled and run.

This commit changes approach and applies the java plugin to the project
instead of the java-base plugin. Now, rather than adding the necessary
configuration to the base, the unwanted pieces of the java plugin's
configuration – specifically the jar and javadoc tasks – are disabled
instead. The DeployedPlugin has also been updated so that it does not
create a publication from the java component for projects that have a
disabled jar task.

Closes gh-22284
 2020-07-09 11:21:03 +01:00
Stephane Nicoll 429a504bbe Polish "Allow data unit to be specified on the constructor parameter" 
See gh-21746
 2020-07-09 11:51:32 +02:00
Vlad Kisel ba70b79651 Allow data unit to be specified on the constructor parameter 
See gh-21746
 2020-07-09 11:51:32 +02:00
Andy Wilkinson 553d58a234 Merge branch '2.3.x' 
Closes gh-22283
 2020-07-09 10:37:18 +01:00
Andy Wilkinson c765df6e5d Merge branch '2.2.x' into 2.3.x 
Closes gh-22282
 2020-07-09 10:37:01 +01:00
Andy Wilkinson afa5b12bdb Make reactive Jetty auto-config back off without jetty-servlet 
Fixes gh-22275
 2020-07-09 10:36:32 +01:00
Andy Wilkinson cb7f99ad72 Polish "Measure with nanoseconds in HttpExchangeTracer" 
See gh-22266
 2020-07-09 10:02:09 +01:00
dreis2211 d72f5139f1 Measure with nanoseconds in HttpExchangeTracer 
See gh-22266
 2020-07-09 10:01:55 +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
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
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
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 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 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
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 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 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
XenoAmess 90d8480ffe Use new ArrayList(Collection) rather than new, iterate, and add 
See gh-22210
 2020-07-07 10:04: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
Andy Wilkinson a0f1424393 Polish "Fix unwrapping of captured PrintStream in test support's OutputCapture" 
See gh-22214
 2020-07-07 09:54:52 +01:00
XenoAmess 75a64bd901 Fix unwrapping of captured PrintStream in test support's OutputCapture 
See gh-22214
 2020-07-07 09:53:34 +01:00
Andy Wilkinson b627918011 Polish "Optionally ignore routing data sources when creating DB health indicators" 
See gh-22222
 2020-07-07 09:42:36 +01:00
Julio Gomez Diaz 13d1d2393d Optionally ignore routing data sources when creating DB health indicators 
See gh-22222
 2020-07-07 09:36:06 +01:00
Andy Wilkinson 523dd937cd Merge branch '2.3.x' 
Closes gh-22238
 2020-07-06 19:58:45 +01:00
Andy Wilkinson 28128a9577 Add support for ChronoUnit.WEEKS when using PeriodUnit 
Fixes gh-22225
 2020-07-06 19:57:26 +01:00