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

641 Commits

Author SHA1 Message Date
Stephane Nicoll f75ab21c7e Upgrade to Spring Batch 4.0.0.RELEASE 
Closes gh-11305
 2017-12-09 15:53:42 -08:00
Johnny Lim 96250743b5 Add missing "abstract" keywords 
Closes gh-11303
 2017-12-09 15:29:15 -08:00
Madhura Bhave 954cf72de4 Fix javadoc 2017-12-08 15:32:40 -08:00
Johnny Lim 6d54072e04 Remove "final" keywords 
Closes gh-11294
 2017-12-08 11:13:07 -08:00
Stephane Nicoll bd7bd6edc8 Fix session timeout conversion for Undertow 
Closes gh-11283
 2017-12-07 16:48:42 -08:00
Andy Wilkinson c0e3ae9042 Polish 2017-12-07 18:27:52 +00:00
Andy Wilkinson 996a7cf013 Upgrade to Flyway 5.0.0 
Closes gh-11287
 2017-12-07 18:21:55 +00:00
Stephane Nicoll 36ea2ee87b Merge branch '1.5.x' 2017-12-07 09:43:01 -08:00
Andy Wilkinson 953d69ce0b Polish "Fix system properties in file-appender.xml" 
Closes gh-11232
 2017-12-06 15:31:06 +00:00
Johnny Lim d4d6a43fc2 Fix system properties in file-appender.xml 
See gh-11232
 2017-12-06 15:30:57 +00:00
Johnny Lim d33c6773da Use volatile for ReactiveTokenValidator.cacheTokenKeys 
Closes gh-11233
 2017-12-06 15:10:01 +00:00
Henning Hoefer c34eb3f762 Upgrade to Mockito 2.13.0 
Closes gh-11272
 2017-12-06 15:06:03 +00:00
Andy Wilkinson 54369a72ca Polish "Use LoggingSystemProperties constants" 
Closes gh-11240
 2017-12-06 15:00:29 +00:00
Johnny Lim 4c5de416ef Use LoggingSystemProperties constants 
See gh-11240
 2017-12-06 15:00:20 +00:00
Andy Wilkinson adeca6ea01 Merge branch '1.5.x' 2017-12-06 14:05:25 +00:00
Stephane Nicoll 7380920ed4 Remove wrong usage of commons-lang3 
Closes gh-11267
 2017-12-05 17:43:56 -08:00
Johnny Lim ada4d13a4e Document spring.metrics.binders.* 
Closes gh-11262
 2017-12-05 15:57:46 -08:00
Brian Clozel 9cc9cdfc1e Fix typo 
See gh-11246
 2017-12-03 11:57:43 -08:00
Brian Clozel eec7a8f075 Remove Web depedency from Freemarker starter 
Now that Spring Boot supports Freemarker for both Spring MVC and Spring
WebFlux, the dedicated starter should not pull the Web starter
transitively and let developers manually choose the web stack.

Closes gh-11246
 2017-12-03 11:23:43 -08:00
Johnny Lim 2c204f2154 Polish 
Closes gh-11242
 2017-12-02 09:03:59 +01:00
Stephane Nicoll a4913712cb Do not expose the composite ReactiveHealthIndicator as a bean 
Previously, a `ReactiveHealthIndicator` bean was exposed to define the
health indicator to use for the reactive endpoint. Having it exposed as
a bean has the side effect that the regular `HealthIndicator` composite
is picked up and a "reactive" entry is added to the health details.

This commit creates such indicator internally as it should be.

Closes gh-11222
 2017-12-02 08:29:07 +01:00
Stephane Nicoll 5dc28ec446 Merge branch '1.5.x' 2017-11-30 18:01:36 +01:00
Andy Wilkinson e16579b416 Support Integer to Duration conversion during property binding 
Closes gh-11216
 2017-11-30 12:30:42 +00:00
Stephane Nicoll a43dcfec6c Polish "Update documentation references to `/status` endpoint" 
Closes gh-11213
 2017-11-30 11:42:06 +01:00
Vedran Pavic e88c266285 Update documentation references to `/status` endpoint 
See gh-11213
 2017-11-30 11:20:29 +01:00
Stephane Nicoll b6609ff392 Polish "Fix NullPointer when requesting a session that does not exist" 
Closes gh-11202
 2017-11-30 10:05:30 +01:00
petar.tahchiev 35c6dc4e3b Fix NullPointer when requesting a session that does not exist 
See gh-11202
 2017-11-30 09:56:43 +01:00
Andy Wilkinson 6cae9257fe Merge branch '1.5.x' 2017-11-29 20:33:38 +00:00
Johnny Lim 44299bb980 Polish 
Closes gh-11206
 2017-11-29 09:37:36 -08:00
Phillip Webb 7ebe4935ac Restore dependency in `maven-shade-plugin` 
Restore `spring-boot-maven-plugin` dependency in `maven-shade-plugin`
starter configuration. Required so that the shade plugin can use
`PropertiesMergingResourceTransformer` if wanted.

Fixes gh-11200
 2017-11-29 09:30:53 -08:00
Phillip Webb d7251f52a4 Polish 2017-11-29 09:09:53 -08:00
Andy Wilkinson 159a758e19 Revert change accidentally committed in eb6182f5 2017-11-29 14:38:38 +00:00
Stephane Nicoll b365e37850 Fix typo 
Closes gh-11204
 2017-11-29 14:25:32 +01:00
Stephane Nicoll 9965221378 Merge branch '1.5.x' 2017-11-29 14:21:45 +01:00
Andy Wilkinson eb6182f587 Remove redundant commons-logging exclusions 
Closes gh-11148
 2017-11-29 13:17:01 +00:00
Andy Wilkinson 80543250a2 Rework properties for enabling Spring Data repositories 
Rather than using two properties to enable or disable reactive and
imperative repositories for a particular store, this commit introduces
a new repository type condition that's backed by a single
spring.data.<store>.repositories.type property. The type can be
auto (automatically enables whatever's available), imperative (enables
imperative repositories), none (enables nothing), or reactive (enables
reactive repositories). The default is auto.

Repositories do not have a reactive option (such as JPA) continue to
have a spring.data.<store>.repositories.enabled property that takes a
boolean value.

Closes gh-11134
 2017-11-29 13:02:45 +00:00
Brian Clozel 8b98db401c Polish 
Closes gh-11090
 2017-11-29 12:00:00 +01:00
Brian Clozel de208cd372 Do not handle WebFlux errors if response is committed 
If the WebFlux handler commits the response but still sends an error
signal in the reactive pipeline, Spring Boot error handling should not
try to handle that error: once committed, it is impossible to change the
response status or the response headers. Writing to the body might also
lead to invalid responses.

This commit skips error handling if the response is committed and
delegates to Spring Framework's `HttpWebHandlerAdapter` which will log
the error.

Fixes gh-11168
 2017-11-29 11:45:12 +01:00
Stephane Nicoll 6be30045ec Polish 
See gh-11071
 2017-11-29 11:44:46 +01:00
Brian Clozel e3c3bb0076 Rename spring.cache.control to spring.cache.cachecontrol 
Closes #11090
 2017-11-29 11:14:31 +01:00
Stephane Nicoll 55f7b3a535 Rename nettyServerCustomizers to serverCustomizers 
Closes gh-11155
 2017-11-29 11:11:00 +01:00
Johnny Lim 952224ef56 Polish 
Closes gh-11193
 2017-11-29 10:50:42 +01:00
Stephane Nicoll 33bd7ccc91 Merge branch '1.5.x' 2017-11-29 10:47:52 +01:00
Brian Clozel ee62633e33 Auto-Configure Freemarker in WebFlux 
This commit adds support for basic auto-configuration for the Freemarker
template engine in WebFlux.

A few configuration properties in the `spring.freemarker.*` namespace
aren't supported yet, since they mostly apply to MVC (Servlet request
and session attributes).

Closes gh-10094
 2017-11-29 10:37:39 +01:00
Phillip Webb 2c959b8e2a Polish health indicators 
Align reactive and non-reactive web extensions and update `showDetails`
so that it only applies to web exposure.

See gh-11113
See gh-11192
 2017-11-28 21:19:53 -08:00
Madhura Bhave 9e95483645 Add cloudfoundry health extensions 
Fixes gh-11192
 2017-11-28 18:49:17 -08:00
Phillip Webb e1306c6228 Polish micrometer rc.5 upgrade 
Closes gh-11071
 2017-11-28 16:58:53 -08:00
Jon Schneider 2e0a915281 Upgrade to micrometer 1.0.0-rc.5 
See gh-11071
 2017-11-28 16:58:53 -08:00
Phillip Webb 960083bd33 Polish 2017-11-28 16:21:09 -08:00
Madhura Bhave 2319d01feb Prevent race condition in ReactiveTokenValidator 2017-11-28 14:24:22 -08:00
Stephane Nicoll 85ba361198 Upgrade to Spring Integration 5.0.0.RELEASE 
Closes gh-11085
 2017-11-28 22:54:12 +01:00
Andy Wilkinson acce64b47b Upgrade to Spring Amqp 2.0.1.RELEASE 
Closes gh-11186
 2017-11-28 18:45:28 +00:00
Andy Wilkinson 2db40db27a Upgrade to Groovy 2.5.0-beta-2 
Closes gh-11184
 2017-11-28 18:29:05 +00:00
Andy Wilkinson 1fbf5f5b27 Complete the removal of Spring Social starters and auto-configuration 
Closes gh-11117
 2017-11-28 15:32:19 +00:00
Craig Walls 64d02f8bb5 Remove Spring Social starters and auto-configuration 
See gh-11117
 2017-11-28 14:53:36 +00:00
Andy Wilkinson 93cac333e8 Clean up logging dependencies and exclusions 
Closes gh-11148
 2017-11-28 13:05:05 +00:00
Andy Wilkinson 74200f27a6 Drop jackson-module-kotlin from spring-boot-starter-json 
Previously, a dependency on jackson-module-kotlin with Kotlin excluded
was added to spring-boot-starter-json. This gave Kotlin users a smooth
experience with Jackson and JSON at minimal, we thought, cost to other
users. We have since learned that this arrangement causes a
ClassNotFoundException at runtime when Jackson is configured to find
modules via the service loader. This makes the cost of including
jackson-module-kotlin to high for non-Kotlin users so this commit
removes it.

Closes gh-11133
 2017-11-28 12:41:37 +00:00
Andy Wilkinson 579b36b502 Upgrade to Spring REST Docs 2.0.0.RELEASE 
Closes gh-11174
 2017-11-28 12:38:30 +00:00
Andy Wilkinson bead5cfd2e Ignore duplicate module-info when validating starter dependencies 
See gh-11178
 2017-11-28 12:35:41 +00:00
Andy Wilkinson a803b88b03 Upgrade to Rxjava2 2.1.7 
Closes gh-11180
 2017-11-28 11:07:03 +00:00
Andy Wilkinson 22a426fe39 Polish 2017-11-28 10:50:28 +00:00
Andy Wilkinson a454c1c121 Upgrade to Selenium Htmlunit 2.28.2 
Closes gh-11179
 2017-11-28 10:50:28 +00:00
Andy Wilkinson 69dcead839 Upgrade to Log4j2 2.10.0 
Closes gh-11178
 2017-11-28 10:50:28 +00:00
Andy Wilkinson ac1b6f10d6 Upgrade to Rest Assured 3.0.6 
Closes gh-11177
 2017-11-28 10:50:28 +00:00
Andy Wilkinson 23d9019051 Upgrade to Hikaricp 2.7.4 
Closes gh-11176
 2017-11-28 10:50:28 +00:00
Andy Wilkinson deb6879563 Upgrade to Atomikos 4.0.5 
Closes gh-11175
 2017-11-28 10:50:28 +00:00
Johnny Lim decf2dc1b7 Fix assertion locations 
Closes gh-11171
 2017-11-28 09:44:45 +01:00
Andy Wilkinson 92d7395110 Upgrade to Spring Session Data MongoDB 5.0.0.RC2 
Closes gh-11083
 2017-11-28 08:40:13 +00:00
Andy Wilkinson e40a038484 Upgrade to Spring Session 5.0.0.RC2 
Closes gh-11082
 2017-11-28 08:39:43 +00:00
Andy Wilkinson ce26325a38 Upgrade to Spring Security 5.0.0.RELEASE 
Closes gh-11069
 2017-11-28 08:37:38 +00:00
Andy Wilkinson 8d6e3dd73b Upgrade to Spring Framework 5.0.2.RELEASE 
Closes gh-10982
 2017-11-28 08:36:47 +00:00
Madhura Bhave 9f76832488 Optimize fetching tokenKeys for reactive actuators 
Closes gh-10899
 2017-11-27 12:32:21 -08:00
Andy Wilkinson 1886791c73 Upgrade to Spring Data Kay-SR2 
Closes gh-11166
 2017-11-27 17:03:34 +00:00
Andy Wilkinson ecdbc52fc5 Make log4j-core available to Elasticsearch tests 
Elasticsearch server requires log4j-core but we don't want the entire
module to have a test dependency on log4j-core as it already uses
Logback. This commit uses the modified class path runner to make
log4j-core available specifically to the Elasticsearch-related tests.

See gh-11166
 2017-11-27 13:36:06 +00:00
Andy Wilkinson 03fce55cdb Polish "Remove a redundant dash in TestPropertyValues.Type" 
Closes gh-11156
 2017-11-27 10:44:53 +00:00
Johnny Lim f21737a675 Remove a redundant dash in TestPropertyValues.Type 
Prior to this change, the dash was duplicated. For example
"test--systemEnvironment". This commit removes the redundant dash
and corrects the assertion in the test that should have caught the
problem.

See gh-11156
 2017-11-27 10:43:38 +00:00
Stephane Nicoll 89054d32fa Polish "Fix CouchbaseReactiveRepositoriesAutoConfigurationTests" 
Closes gh-11151
 2017-11-27 10:59:21 +01:00
Eddú Meléndez ef3d44f680 Fix CouchbaseReactiveRepositoriesAutoConfigurationTests 
See gh-11151
 2017-11-27 10:56:35 +01:00
Stephane Nicoll 116d763d52 Start building against Spring Data Key snapshots 
See gh-11166
 2017-11-27 10:55:57 +01:00
Stephane Nicoll 9543327406 Polish "Use BeanIds.SPRING_SECURITY_FILTER_CHAIN" 
Closes gh-11162
 2017-11-27 10:32:28 +01:00
Johnny Lim 70d92037bd Use BeanIds.SPRING_SECURITY_FILTER_CHAIN 
See gh-11162
 2017-11-27 10:31:32 +01:00
Stephane Nicoll c4387e1e8a Polish "Add CouchbaseHealthIndicatorTests" 
Closes gh-11161
 2017-11-27 10:30:31 +01:00
Eddú Meléndez 2e9ca06688 Add CouchbaseHealthIndicatorTests 
See gh-11161
 2017-11-27 10:29:25 +01:00
Eddú Meléndez 5c216c2029 Clean LdapHealthIndicatorTests 
Closes gh-11158
 2017-11-27 10:27:29 +01:00
Stephane Nicoll 1620ac42b3 Polish contribution 
Closes gh-11143
 2017-11-27 10:14:34 +01:00
Johnny Lim d9828a0aaa Polish 
See gh-11143
 2017-11-27 10:14:18 +01:00
sdeleuze 65c777986d Upgrade to Kotlin 1.1.61 
Closes gh-11154
 2017-11-26 17:25:12 +01:00
Johnny Lim dea95b2b67 Make CouchbaseReactiveRepositoriesAutoConfigureRegistrar package-private 
Closes gh-11142
 2017-11-26 11:30:17 +01:00
Kazuki Shimizu bd8834568d Add @Inherited on spring-boot-test-autoconfigure 
Closes gh-11139
 2017-11-26 11:27:49 +01:00
Andy Wilkinson 61f9d240df Polish 2017-11-24 16:31:31 +00:00
Johnny Lim 7d94695936 Harmonize CouchbaseReactiveRepositoriesAutoConfiguration conditions 
Closes gh-11138
 2017-11-24 16:51:29 +01:00
Andy Wilkinson 16b090c9bc Polish 2017-11-24 15:46:19 +00:00
Andy Wilkinson 23014d97a2 Add new Devtools restart property to the appendix 
Closes gh-9115
 2017-11-24 14:56:50 +00:00
Andy Wilkinson 7674841946 Log condition evaluation delta upon DevTools restart 2017-11-24 14:49:53 +00:00
Stephane Nicoll 480039f212 Fix default value of management.endpoints.web.expose 2017-11-24 15:22:57 +01:00
Stephane Nicoll 1235d8f813 Polish Actuator doc 
Closes gh-10861
 2017-11-24 14:05:21 +01:00
Stephane Nicoll a12bab453c Polish "Fix PropertiesConfigAdapter delegation logic" 
Closes gh-11135
 2017-11-24 13:48:06 +01:00
Nikolay Rybak 9163d65b0e Fix PropertiesConfigAdapter delegation logic 
This change replaces fallback logic in PropertiesConfigAdapter and its
descendants such that instead of falling back to default "empty" config
it delegates to superinterface default implementation of the same class.

This allows default implementation to call back to other properties,
like DatadogConfig.uri() does.

See gh-11135
 2017-11-24 13:31:00 +01:00
Andy Wilkinson b3c5a050ad Polish message for matching beans produced by OnBeanCondition 2017-11-24 12:01:20 +00:00
Andy Wilkinson 51b56782a3 Apply customizers to build when created embedded Mongo client 
Closes gh-11132
 2017-11-24 10:59:29 +00:00