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

4232 Commits

Author SHA1 Message Date
Andy Wilkinson fa7be63fbb Merge branch '2.0.x' 2018-11-26 16:53:00 +00:00
Andy Wilkinson 7ddbb37bd5 Polish 2018-11-26 16:52:49 +00:00
Andy Wilkinson 073ac7bc99 Fix Thymeleaf security dialect tests on Windows 2018-11-26 16:15:15 +00:00
Andy Wilkinson a0d0ecf9d4 Test the Gradle plugin against Gradle 5.0 
Closes gh-15171
 2018-11-26 16:02:54 +00:00
Andy Wilkinson 5a9ff6a3cb Merge branch '2.0.x' 2018-11-26 15:51:52 +00:00
Andy Wilkinson 5201584c60 Upgrade to Neo4j Ogm 3.1.5 
Closes gh-15293
 2018-11-26 15:51:01 +00:00
Andy Wilkinson 55721f06df Upgrade to Kotlin 1.2.71 
Closes gh-15292
 2018-11-26 15:50:59 +00:00
Andy Wilkinson c73fdc4ce4 Merge branch '2.0.x' 2018-11-26 12:09:21 +00:00
Andy Wilkinson d2756319cb Polish 2018-11-26 12:09:14 +00:00
Andy Wilkinson 1c4a26557c Polish 2018-11-26 11:47:35 +00:00
Andy Wilkinson c1bbcb6908 Merge branch '2.0.x' 2018-11-26 11:41:55 +00:00
Andy Wilkinson 4bc32e6358 Use a HandlerInterceptor for timing long tasks 
Closes gh-15204
 2018-11-26 11:30:06 +00:00
Stephane Nicoll f43a83fa4f Upgrade to Junit Jupiter 5.3.2 
Closes gh-15286
 2018-11-26 10:41:08 +01:00
Stephane Nicoll ae1979f1ff Merge branch '2.0.x' 2018-11-26 10:35:37 +01:00
Stephane Nicoll 5f0ac46d78 Unwrap DataSource target rather than plain instanceof calls 
Closes gh-15227
 2018-11-26 10:35:10 +01:00
Stephane Nicoll e424dfbe15 Polish "Perform best effort to retrieve DataSourceProxy" 
Closes gh-15206
 2018-11-26 10:18:48 +01:00
Tadaya Tsuyukubo 26f9a92837 Perform best effort to retrieve DataSourceProxy 
Prior to this commit, `DataSourceJmxConfiguration` with tomcat
`DataSource`, it can only find `DataSourceProxy` if the given
`DataSource` is a direct child of it.  Since it uses `instanceof`, it
could not find `DataSourceProxy` if the `DataSource` is
wrapped(delegated) or proxied.

This is because `DataSourceProxy#unwrap()` always returns null; thus
cannot use this method to directly obtain `DataSourceProxy`.

In this commit, updated the check logic to perform the best effort to
retrieve `DataSourceProxy`. If given `DataSource` is wrapped or proxied
by spring, tries to unwrap or get target datasource recursively to find
`DataSourceProxy`.

See gh-15206
 2018-11-26 10:18:48 +01:00
Andy Wilkinson ee2107c91b Merge branch '2.0.x' 2018-11-23 20:15:42 +00:00
Andy Wilkinson 44632ea55c Merge branch '1.5.x' into 2.0.x 2018-11-23 20:15:26 +00:00
Andy Wilkinson 548cc05bb6 Polish 2018-11-23 19:33:33 +00:00
Andy Wilkinson 5a246ce24d Merge branch '2.0.x' 2018-11-23 17:00:24 +00:00
Andy Wilkinson 8772f90e2f Polish 2018-11-23 17:00:16 +00:00
Andy Wilkinson 35cce76ae8 Merge branch '2.0.x' 2018-11-23 16:59:27 +00:00
Andy Wilkinson 3331fa2d02 Merge branch '1.5.x' into 2.0.x 2018-11-23 16:59:18 +00:00
Andy Wilkinson 1797040e1a Merge branch '2.0.x' 2018-11-23 16:42:13 +00:00
Andy Wilkinson a54de61e61 Polish 
Revert change inadvertently committed as part of gh-15017
 2018-11-23 16:41:25 +00:00
Andy Wilkinson 4f405ed97d Merge branch '2.0.x' 2018-11-23 15:45:13 +00:00
Andy Wilkinson 058428a14c Clarify how multiple attributes are treated by ConditionalOn(Missing)Bean 
Closes gh-15177
 2018-11-23 15:44:58 +00:00
Andy Wilkinson f25c32e8b9 Merge branch '2.0.x' 2018-11-23 15:26:08 +00:00
Andy Wilkinson d104205880 Update docs to reflect that @AutoConfigureRestDocs supports WebTestClient 
Closes gh-15220
 2018-11-23 15:26:01 +00:00
Andy Wilkinson deeb961c6e Merge branch '2.0.x' 2018-11-23 15:23:14 +00:00
Andy Wilkinson 1f39b5dd7a Align MeterRegistryConfigurer's javadoc with its implementation 
Closes gh-15017
 2018-11-23 15:22:09 +00:00
Andy Wilkinson 56519e5cbb Merge branch '2.0.x' 2018-11-23 15:12:13 +00:00
Andy Wilkinson 8ee57ac574 Remove redundant suggestion to add a dependency on Woodstox 
It's now a transitive dependency of jackson-dataformat-xml so there is no
need to depend on it explicitly.

Closes gh-15092
 2018-11-23 15:11:03 +00:00
Andy Wilkinson 7790876575 Merge branch '2.0.x' 2018-11-23 14:01:12 +00:00
Andy Wilkinson c0e286b96b Test the Gradle Plugin against Gradle 5.0-rc-3 
Closes gh-15171
 2018-11-23 13:47:19 +00:00
Andy Wilkinson ce0a3d0311 Add missing classpath setters to BootJar and BootWar 
Closes gh-15087
 2018-11-23 13:46:56 +00:00
Andy Wilkinson 3bda78a3d3 Fix tests after HandlerExceptionResolver logging changes 
See gh-14936 and gh-15189
 2018-11-22 20:27:19 +00:00
Andy Wilkinson b5433cd862 Revert "Upgrade to Selenium Htmlunit 2.33.3" 
This reverts commit 3048b7a218.

See gh-15269
 2018-11-22 20:10:13 +00:00
Andy Wilkinson 27ef03a2c1 Merge branch '2.0.x' 2018-11-22 17:31:32 +00:00
Andy Wilkinson 97f7984812 Merge branch '1.5.x' into 2.0.x 2018-11-22 17:31:03 +00:00
Andy Wilkinson ee8aca77eb Start building against Spring Session Bean-SR1 snapshots 
See gh-15275
 2018-11-22 15:55:35 +00:00
Andy Wilkinson fc6df83f56 Start building against Spring Security 5.1.2 snapshots 
See gh-15274
 2018-11-22 15:55:03 +00:00
Andy Wilkinson 449b40f6fc Start building against Spring Kafka 2.2.1 snapshots 
See gh-15273
 2018-11-22 15:54:31 +00:00
Andy Wilkinson 848121288c Start building against Spring Integration 5.1.1 snapshots 
See gh-15272
 2018-11-22 15:53:52 +00:00
Andy Wilkinson 3d4838c055 Start building against Spring AMQP 2.1.2 snapshots 
See gh-15271
 2018-11-22 15:53:21 +00:00
Andy Wilkinson df918bae5d Upgrade to Maven Shade Plugin 3.2.1 
Closes gh-15270
 2018-11-22 15:50:03 +00:00
Andy Wilkinson 3048b7a218 Upgrade to Selenium Htmlunit 2.33.3 
Closes gh-15269
 2018-11-22 15:50:03 +00:00
Andy Wilkinson a2ff9b7d35 Upgrade to Lombok 1.18.4 
Closes gh-15268
 2018-11-22 15:50:02 +00:00
Andy Wilkinson b73cf9f738 Upgrade to Mockito 2.23.4 
Closes gh-15267
 2018-11-22 15:50:02 +00:00
Andy Wilkinson 1a8ac57a2f Upgrade to Jooq 3.11.7 
Closes gh-15266
 2018-11-22 15:50:02 +00:00
Andy Wilkinson 88bec38961 Upgrade to Infinispan 9.4.2.Final 
Closes gh-15265
 2018-11-22 15:50:02 +00:00
Andy Wilkinson 58750624bc Upgrade to Elasticsearch 6.4.3 
Closes gh-15264
 2018-11-22 15:48:13 +00:00
Andy Wilkinson fa4de5eb78 Upgrade to Ehcache3 3.6.2 
Closes gh-15263
 2018-11-22 15:48:12 +00:00
Andy Wilkinson e0761b814d Upgrade to Groovy 2.5.4 
Closes gh-15262
 2018-11-22 15:48:11 +00:00
Andy Wilkinson 19a8fb56c7 Upgrade to Tomcat 9.0.13 
Closes gh-15261
 2018-11-22 15:48:10 +00:00
Andy Wilkinson 6753b247e1 Upgrade to Kafka 2.0.1 
Closes gh-15260
 2018-11-22 15:48:10 +00:00
Andy Wilkinson b028ac75a6 Upgrade to Byte Buddy 1.9.4 
Closes gh-15259
 2018-11-22 15:48:08 +00:00
Andy Wilkinson c4a0364a55 Upgrade to Undertow 2.0.15.Final 
Closes gh-15258
 2018-11-22 15:48:08 +00:00
Andy Wilkinson 2ea4852575 Upgrade to Couchbase Client 2.7.1 
Closes gh-15257
 2018-11-22 15:48:07 +00:00
Andy Wilkinson 0b5f52ef0b Merge branch '2.0.x' 2018-11-22 15:42:12 +00:00
Andy Wilkinson 9ca96cb751 Start building against Spring Framework 5.1.1 snapshots 
See gh-15189
 2018-11-22 15:33:10 +00:00
Andy Wilkinson 39bec2c50f Start building against Spring Integration 5.0.10 snapshots 
See gh-15251
 2018-11-22 15:32:21 +00:00
Andy Wilkinson 00f1e92350 Start building against Spring Session Apple-SR7 snapshots 
See gh-15254
 2018-11-22 15:30:40 +00:00
Andy Wilkinson 739de913d5 Start building against Spring AMQP 2.0.10 snapshots 
See gh-15256
 2018-11-22 15:29:55 +00:00
Andy Wilkinson de84a51f26 Upgrade to Spring Cloud Connectors 2.0.4.RELEASE 
Closes gh-15250
 2018-11-22 15:21:59 +00:00
Andy Wilkinson ff22df0475 Upgrade to Jetty El 8.5.33.1 
Closes gh-15249
 2018-11-22 15:21:58 +00:00
Andy Wilkinson d08edf7e14 Upgrade to Elasticsearch 5.6.13 
Closes gh-15248
 2018-11-22 15:21:57 +00:00
Andy Wilkinson 350e397d53 Upgrade to Janino 3.0.11 
Closes gh-15247
 2018-11-22 15:21:56 +00:00
Andy Wilkinson ec219b30d2 Upgrade to Activemq 5.15.8 
Closes gh-15246
 2018-11-22 15:21:56 +00:00
Andy Wilkinson 941d8744cb Upgrade to Javax Json 1.1.4 
Closes gh-15245
 2018-11-22 15:21:55 +00:00
Andy Wilkinson 6761747e39 Upgrade to Reactor Bom Bismuth-SR14 
Closes gh-15244
 2018-11-22 15:21:54 +00:00
Andy Wilkinson 40005c0e59 Upgrade to Unboundid Ldapsdk 4.0.9 
Closes gh-15243
 2018-11-22 15:21:53 +00:00
Andy Wilkinson fa26227ae8 Merge branch '2.0.x' 2018-11-22 15:12:05 +00:00
Andy Wilkinson ba4461a7a2 Merge branch '1.5.x' into 2.0.x 2018-11-22 15:09:38 +00:00
Brian Clozel 5bb7b24d7c Fix class cast in ServletContextInitializerBeans 
See gh-15166
 2018-11-21 11:50:41 +01:00
Brian Clozel d52b599eee Improve Servlet and Filter registration logging 
Prior to this commit, the information logged at DEBUG level for the web
infrastructure was not consistent with the experience in Spring
Framework.

This commit moves some logging information about
`ServletContextInitializer` registrations from DEBUG to TRACE level and
gathers the Servlets and Filters registration logs into one-liners at
the DEBUG level.

Closes gh-15166
 2018-11-21 10:29:55 +01:00
Andy Wilkinson 3fac0f0360 Polish multi-release jar support to avoid possible StackOverflowError 
See gh-12523
 2018-11-20 17:26:28 +00:00
Andy Wilkinson 56eebc9385 Update fat jar loader to support multi-release jar files 
Closes gh-12523
 2018-11-20 15:22:30 +00:00
Eddú Meléndez 5e09a2ee55 Add reference to sentry-spring-boot-starter 
Closes gh-15205
 2018-11-20 08:14:47 +01:00
Dave Syer b6aff10244 Temporarily make @Bean methods in Spring Data JDBC public 
Closes gh-15097
 2018-11-16 14:53:33 +01:00
Brian Clozel f4db1d3c9a Upgrade to Reactor Californium-BUILD-SNAPSHOT 
See gh-15192
 2018-11-16 14:33:09 +01:00
Brian Clozel 5aabcedb24 Upgrade to Spring Framework 5.1.3.BUILD-SNAPSHOT 
See gh-15186
 2018-11-16 10:55:35 +01:00
Phillip Webb bab111b37e Fix ConfigurationPropertyName.equals for uppercase 
Commit 7f35f8a9 for gh-14665 was unfortunately incomplete as it didn't
account for uppercase values. The run-off while loop should have used
`Character.toLowerCase` in the same way as the main while loop.

Fixes gh-15152
 2018-11-15 13:48:20 -08:00
Phillip Webb dbf09de203 Merge branch '2.0.x' 2018-11-15 13:29:09 -08:00
Phillip Webb e87664f295 Add JettyAccessLogCustomizer 
Add a `JettyAccessLogCustomizer` to customize management access logs
when the management server is running on a different port.

Closes gh-15041
 2018-11-15 13:28:51 -08:00
Phillip Webb c64a007e12 Format POM file 2018-11-15 13:22:50 -08:00
Phillip Webb 12a16dcfcf Merge branch '2.0.x' 2018-11-15 10:43:40 -08:00
Phillip Webb e4d5714d50 Polish "Skip scoped targets when determining endpoints" 
See gh-15182
 2018-11-15 10:41:14 -08:00
Rahul Ahuja 4853e6a7af Skip scoped targets when determining endpoints 
Update `EndpointDiscoverer` to filter out scoped target beans when
finding endpoints.

Closes gh-15182
 2018-11-15 10:38:05 -08:00
Andy Wilkinson fe9d9ec4e2 Test the Gradle plugin against Gradle 5.0-rc-3 
Closes gh-15171
 2018-11-15 10:32:34 +00:00
Stephane Nicoll c1b1f14f5a Fix default unit for multipart properties 
This commit fixes a regression that wrongly changed the default unit of
multipart properties from bytes to megabytes.

Closes gh-15162
 2018-11-15 09:17:26 +01:00
Stephane Nicoll 2f4325d00f Polish 2018-11-15 09:06:44 +01:00
Phillip Webb cccf5e6d2b Merge branch '2.0.x' 2018-11-14 18:27:28 -08:00
Phillip Webb 3baf782822 Merge branch '1.5.x' into 2.0.x 2018-11-14 18:24:32 -08:00
Brian Clozel d84421b7e1 Improve HttpMessageConverters javadoc 
Closes gh-15027
 2018-11-14 15:06:41 +01:00
Brian Clozel 8e86bcafc1 Improve actuator endpoint mapping debug logging 
Closes gh-14292
 2018-11-14 14:36:52 +01:00
Mark Vollmary 634b92001b Add reference to ArangoDB starter 
Closes gh-15144
 2018-11-13 18:31:19 +01:00
dreis2211 3b4b0641d9 Polish some Map operations 
Closes gh-15153
 2018-11-12 09:08:25 +01:00
Stephane Nicoll a222952a77 Polish contribution 
Closes gh-15134
 2018-11-11 11:03:29 +01:00
Johnny Lim fd5aa3ebf1 Polish 
See gh-15134
 2018-11-11 11:03:13 +01:00
Stephane Nicoll 2c3b455b8b Merge branch '2.0.x' 2018-11-11 10:58:44 +01:00
Johnny Lim 8470d649bc Polish 
See gh-15134
 2018-11-11 10:58:31 +01:00
Stephane Nicoll 089ef9085a Polish "Add HANA to the lookup of well-known databases" 
Closes gh-15125
 2018-11-10 18:02:01 +01:00
Jonathan Bregler 85754eaddd Add HANA to the lookup of well-known databases 
See gh-15125
 2018-11-10 17:59:29 +01:00
Jonathan Bregler e74348ee30 Fix HANA validation query 
This commit updates the validation query for HANA. It should use the
fully qualified dummy table name (SYS.DUMMY) to avoid unexpected results
if there is a local table named DUMMY.

Closes gh-15124
 2018-11-10 17:56:51 +01:00
sreeise 6454a8f4ca Remove redundant json starter from spring-boot-starter-data-rest 
Closes gh-15137
 2018-11-09 08:31:47 +01:00
Andy Wilkinson e7d921c216 Align test expectations with styling of stack trace div 
Closes gh-15075
 2018-11-08 12:31:21 +00:00
Andy Wilkinson bfb0886495 Tolerate Hibernate 5.2 
Closes gh-15100
 2018-11-08 12:24:22 +00:00
Brian Clozel 159f947870 Polish 
Closes gh-15075
 2018-11-07 09:40:11 +01:00
up-to-you ae4bc48481 Fix stack-trace line breaks in whitelabel error views 
Since gh-12838, the WebFlux whitelabel error view also shows the
stacktrace information if it is available in the model.

This commit adds a CSS directive that preserves white spaces and breaks
lines at newline characters.
 2018-11-07 09:40:11 +01:00
dreis2211 6ac788df2f Add missing @Deprecated annotation 
Closes gh-15113
 2018-11-07 07:53:39 +01:00
Stephane Nicoll 3628c5b2dc Remove redundant declaration on spring-context 
Closes gh-15107
 2018-11-06 15:28:41 +01:00
dreis2211 3e95af2c85 Polish some Map operations 
Closes gh-15103
 2018-11-06 07:41:55 +01:00
dreis2211 5e35ac6ce5 Remove unused static methods in tests 
Closes gh-15084
 2018-11-05 07:38:49 +01:00
Stephane Nicoll 0bd69fded8 Fix detection of ScheduledExecutorService 
`@EnableScheduling` detects primarily a suitable `TaskScheduler` in the
context and fallbacks to the presence of a `ScheduledExecutorService` if
that is not the case.

This commit improves the auto-configuration to back off when such
scheduled executor service is present, so that the framework
initialization code can pick it up as usual.

Closes gh-15032
 2018-11-04 09:58:41 +01:00
Stephane Nicoll c7909318cd Merge branch '2.0.x' 2018-11-04 08:03:23 +01:00
Stephane Nicoll 69d9b7a813 Polish contribution 
Closes gh-15081
 2018-11-04 07:59:26 +01:00
Nishant Raut 08ddb59f92 Update documentation to remind how JobParameters should be specified 
See gh-15081
 2018-11-04 07:51:31 +01:00
Dmitry Zhikharev 226ccc2e84 Add reference to Hiatus starter 
Closes gh-15082
 2018-11-04 07:24:15 +01:00
Brian Clozel da53a0b8d5 Fix HTTP status error template rendering in WebFlux 
Prior to this commit, a change in `HttpStatus.toString` since SPR-16898
prevented the default WebFlux `ErrorWebExceptionHandler` to render
template views for exact HTTP status (e.g. "404.html").
This issue does not affect the resolution of series, like "4xx.html".

This commit fixes `DefaultErrorWebExceptionHandler` to use
`HttpStatus.value()` when attempting to resolve error views.

Closes gh-15083
 2018-11-03 21:28:48 +01:00
Stephane Nicoll f42a653604 Merge branch '2.0.x' 2018-11-03 16:38:16 +01:00
Stephane Nicoll f5ba9952db Make UndertowAccessLogCustomizer conditional on class 
Closes gh-15065
 2018-11-03 16:35:03 +01:00
Stephane Nicoll 7257572dbd Merge branch '2.0.x' 2018-11-02 14:00:30 +01:00
Stephane Nicoll 01091aab2a Polish "Update docs to Spock 1.2" 
Closes gh-15060
 2018-11-02 13:59:03 +01:00
Jeff Sheets 01b17af530 Update docs to Spock 1.2 
See gh-15060
 2018-11-02 13:58:47 +01:00
Stephane Nicoll 980d8ea0ad Merge branch '2.0.x' 2018-11-01 17:49:56 +09:00
Stephane Nicoll 2927195b02 Fix StaticResourceRequest javadoc examples 
Closes gh-15050
 2018-11-01 17:48:56 +09:00
Stephane Nicoll 26dc8b9fb5 Update system requirements in the reference docs 
Closes gh-15026
 2018-11-01 17:36:39 +09:00
Stephane Nicoll dc02616b78 Merge branch '2.0.x' 2018-11-01 17:15:31 +09:00
Nooheat 8380031039 Simplify ArrayList calling addAll() immediately 
Closes gh-15033
 2018-11-01 17:10:16 +09:00
Stephane Nicoll 8d6d1f4a57 Merge branch '2.0.x' 2018-11-01 10:15:26 +09:00
Misagh Moayyed e820f04926 Polish EnableConfigurationPropertiesImportSelector javadoc 
Closes gh-15049
 2018-11-01 10:13:35 +09:00
Andy Wilkinson 228e05487a Test Gradle Plugin against Gradle 5.0-rc-1 
Closes gh-15028
 2018-10-31 09:47:49 +00:00
Phillip Webb 5e50f762a3 Revert DevTools polish 
It seems like we can't use constructor injection at the
moment.
 2018-10-29 18:37:58 -07:00
Phillip Webb 8ded42ceb1 Use US spelling for "favor" 2018-10-29 18:37:58 -07:00
Madhura Bhave e41329b238 Upgrade to Spring Batch 4.1.0.RELEASE 
Closes gh-14891
 2018-10-29 18:05:05 -07:00
Phillip Webb 33d385cf7a Use US spelling for "favor" 2018-10-29 15:26:34 -07:00
Phillip Webb f3fa20b2d1 Polish 2018-10-29 14:25:45 -07:00
Andy Wilkinson 290e8886c9 Polish "Handle StepRegistry connect/read timeout deprecation" 
Closes gh-14886
 2018-10-29 21:11:11 +00:00
artsiom fe63342f52 Handle StepRegistry connect/read timeout deprecation 
See gh-14886
 2018-10-29 20:56:25 +00:00
Andy Wilkinson a984453363 Upgrade to Spring Session Bean-RELEASE 
Closes gh-14733
 2018-10-29 20:49:57 +00:00
Andy Wilkinson 53d0a63e8e Upgrade to Spring Kafka 2.2.0.RELEASE 
Closes gh-14892
 2018-10-29 20:16:57 +00:00
Andy Wilkinson 0c3d899d5d Upgrade to Spring Integration 5.1.0.RELEASE 
Closes gh-14889
 2018-10-29 20:03:56 +00:00
Brian Clozel 2232f7d82f Polish 
Closes gh-14914
 2018-10-29 18:10:10 +01:00
Julian Devia 3e6a4eb6e3 Use cluster endpoint in Jest HealthIndicator 
This commit changes the requested endpoint for the Jest
HealthIndicator. The `"/_all/_stats"` was previously used, but
the response size can be quite large and costly.

This is now using the `"/_cluster/health"` endpoint.
 2018-10-29 18:10:10 +01:00
Andy Wilkinson 1341789819 Merge branch '2.0.x' 2018-10-29 16:39:51 +00:00
Andy Wilkinson 9ea5c58e38 Remove stale mention of module layout from Maven plugin's docs 
Closes gh-14854
 2018-10-29 16:38:58 +00:00
Andy Wilkinson 743782de7e Revert reloadable message source support 
Closes gh-14882
See gh-14699
See gh-13377
 2018-10-29 16:24:59 +00:00
Andy Wilkinson 5ac9b972fe Test the Gradle Plugin against Gradle 5.0-milestone-1 
Closes gh-15005
 2018-10-29 15:15:00 +00:00