root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
14,466 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

14466 Commits

Author SHA1 Message Date
Andy Wilkinson 6d6abce55c Merge pull request #11232 from Johnny Lim 
* gh-11232:
  Polish "Fix system properties in file-appender.xml"
  Fix system properties in file-appender.xml
 2017-12-06 15:31:32 +00: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
Andy Wilkinson 082a96776d Merge pull request #11233 from Johnny Lim 
* gh-11233:
  Use volatile for ReactiveTokenValidator.cacheTokenKeys
 2017-12-06 15:10:23 +00:00
Johnny Lim d33c6773da Use volatile for ReactiveTokenValidator.cacheTokenKeys 
Closes gh-11233
 2017-12-06 15:10:01 +00:00
Andy Wilkinson b1dd5319c2 Merge pull request #11272 from Henning Hoefer 
* gh-11272:
  Upgrade to Mockito 2.13.0
 2017-12-06 15:06:41 +00:00
Henning Hoefer c34eb3f762 Upgrade to Mockito 2.13.0 
Closes gh-11272
 2017-12-06 15:06:03 +00:00
Andy Wilkinson 154d9284a8 Merge pull request #11240 from Johnny Lim 
* gh-11240:
  Polish "Use LoggingSystemProperties constants"
  Use LoggingSystemProperties constants
 2017-12-06 15:00:50 +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
Andy Wilkinson 654fe9a31c Use Checkstyle to police accidental use of unwanted imports 
Closes gh-11271
 2017-12-06 13:56:17 +00:00
Stephane Nicoll 7380920ed4 Remove wrong usage of commons-lang3 
Closes gh-11267
 2017-12-05 17:43:56 -08:00
Stephane Nicoll c5a8c8134e Merge pull request #11262 from izeye:document-binders 
* pr/11262:
  Document spring.metrics.binders.*
 2017-12-05 15:58:24 -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
Stephane Nicoll 32b817e78d Merge pull request #11242 from izeye:polish-20171202 
* pr/11242:
  Polish
 2017-12-02 09:04:15 +01:00
Johnny Lim 2c204f2154 Polish 
Closes gh-11242
 2017-12-02 09:03:59 +01:00
Stephane Nicoll eec9597d91 Merge branch '1.5.x' 2017-12-02 08:59:26 +01:00
Stephane Nicoll b7baf6d381 Fix broken link 
Closes gh-11244
 2017-12-02 08:57:28 +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
Stephane Nicoll 7b8adfab41 Polish 2017-11-30 18:00:43 +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 8aeb245393 Merge pull request #11213 from vpavic:fix-docs 
* pr/11213:
  Polish "Update documentation references to `/status` endpoint"
  Update documentation references to `/status` endpoint
 2017-11-30 11:42:40 +01: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 a7fac3cbae Merge pull request #11202 from ptahchiev:11201 
* pr/11202:
  Polish "Fix NullPointer when requesting a session that does not exist"
  Fix NullPointer when requesting a session that does not exist
 2017-11-30 10:05:49 +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
Andy Wilkinson a491727b7c Avoid creating unnecessary garbage during URL normalization 
Closes gh-11207
 2017-11-29 20:33:02 +00:00
Phillip Webb 07b7d1cbb1 Merge pull request #11206 from izeye/polish-20171130 
* pr/11206:
  Polish
 2017-11-29 09:37:49 -08: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
Stephane Nicoll 5fd529279d Merge pull request #11190 from slachiewicz:fix/maven-central-url 
* pr/11190:
  Update Apache Maven Central repository url
 2017-11-29 14:20:29 +01:00
Sylwester Lachiewicz 0a6f5fb2be Update Apache Maven Central repository url 
Closes gh-11190
 2017-11-29 14:19:15 +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
Stephane Nicoll d5c32333d5 Merge branch '1.5.x' 2017-11-29 11:19:24 +01:00
Stephane Nicoll ac316b502d Merge pull request #11189 from slachiewicz:fix/plexus-typo 
* pr/11189:
  Fix typo in StringUtils import
 2017-11-29 11:17:14 +01:00
Sylwester Lachiewicz 7224d35322 Fix typo in StringUtils import 
Closes gh-11189
 2017-11-29 11:16:45 +01:00