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,476 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

14476 Commits

Author SHA1 Message Date
Stephane Nicoll 243b126341 Merge pull request #11303 from izeye:add-abstract 
* pr/11303:
  Add missing "abstract" keywords
 2017-12-09 15:29:33 -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
Stephane Nicoll b7d08ee570 Merge pull request #11294 from izeye:remove-final 
* pr/11294:
  Remove "final" keywords
 2017-12-08 11:13:46 -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
Stephane Nicoll 846e642631 Properly handle class reference 
Previously, a condition on a class targeting an inner class would
generate an invalid String representation of it. Unfortunately, the
`toString` representation misses the `$` sign between the outer class
and the inner class name.

This commit post-processes the values to generate the appropriate
representation.

Closes gh-11282
 2017-12-07 09:42:12 -08:00
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