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

20249 Commits

Author SHA1 Message Date
Madhura Bhave 988ba3ff78 Fix author tag 2019-03-18 14:10:28 -07:00
Stephane Nicoll 24d478d037 Merge pull request #16099 from mhewedy 
* pr/16099:
  Polish "Order the search locations in javadoc by precedence order"
  Order the search locations in javadoc by precedence order
 2019-03-16 08:26:55 +01:00
Stephane Nicoll 372802a203 Polish "Order the search locations in javadoc by precedence order" 
Closes gh-16099
 2019-03-16 08:23:57 +01:00
Muhammad Hewedy 4bac6c6688 Order the search locations in javadoc by precedence order 
See gh-16099
 2019-03-16 08:23:01 +01:00
Madhura Bhave 28175c8635 Merge pull request #16219 from izeye 
* pr/16219:
  Polish
 2019-03-15 17:55:32 -07:00
Johnny Lim c5b5f752ed Polish 
Closes gh-16219
 2019-03-15 17:54:48 -07:00
Madhura Bhave b7b2798f13 Merge pull request #16108 from nosan 
* pr/16108:
  Test server port shouldn't affect management port when random
 2019-03-15 17:24:37 -07:00
Dmytro Nosan 2f3e5d65be Test server port shouldn't affect management port when random 
Closes gh-16108
 2019-03-15 17:21:29 -07:00
Stephane Nicoll 07d95ce086 Merge pull request #16224 from xak2000 
* pr/16224:
  Fix typo in logging.group property description
 2019-03-13 17:51:23 +01:00
Ruslan Stelmachenko fcde648c50 Fix typo in logging.group property description 
Closes gh-16224
 2019-03-13 17:47:51 +01:00
Brian Clozel 9906ef2400 Merge branch '2.0.x' into 2.1.x 2019-03-13 12:52:47 +01:00
Brian Clozel 8866a25ef7 Polish Undertow tests 2019-03-13 11:55:53 +01:00
Brian Clozel 6138041578 Polish 
Fixes gh-16014
 2019-03-13 11:55:41 +01:00
Johnny Lim a6ccdbe19f Handle missing exceptions in WebMvcMetricsFilter 
Prior to this commit, exceptions nested in
`NestedServletExceptions` would not be recorded by the
`WebMvcMetricsFilter`. This commit ensures that exceptions
happening downstream (e.g. happening while writing the response
body itself) are properly recorded.

See https://github.com/micrometer-metrics/micrometer/issues/1190
See gh-16014
 2019-03-13 11:07:32 +01:00
Stephane Nicoll b7ca103125 Merge pull request #16213 from orangeroad0922 
* pr/16213:
  Polish "Fix typo in spring-boot-features.adoc"
  Fix typo in spring-boot-features.adoc
 2019-03-12 17:21:37 +01:00
Stephane Nicoll 765801983b Polish "Fix typo in spring-boot-features.adoc" 
Closes gh-16213
 2019-03-12 17:21:18 +01:00
Orangeroad0922 47169436ed Fix typo in spring-boot-features.adoc 
See gh-16213
 2019-03-12 17:20:43 +01:00
Stephane Nicoll d77f69cfa9 Merge pull request #16166 from viktoriya-kutsarova 
* pr/16166:
  Polish "Update ambiguous documentation about ConfigurationProperties"
  Update ambiguous documentation about ConfigurationProperties
 2019-03-12 11:13:07 +01:00
Stephane Nicoll f07de1bbe2 Polish "Update ambiguous documentation about ConfigurationProperties" 
Closes gh-16166
 2019-03-12 11:12:45 +01:00
Viktoriya Kutsarova 6b6ac28430 Update ambiguous documentation about ConfigurationProperties 
See gh-16166
 2019-03-12 11:12:21 +01:00
Stephane Nicoll 015de55f58 Merge pull request #16170 from ayudovin 
* pr/16170:
  Polish contribution
  Add support for Mustache, FreeMarker and Thymeleaf in WebFluxTest
 2019-03-12 11:07:02 +01:00
Stephane Nicoll 161c0b9fad Polish contribution 
Closes gh-16170
 2019-03-12 11:06:19 +01:00
ayudovin 51013421f2 Add support for Mustache, FreeMarker and Thymeleaf in WebFluxTest 
See gh-16170
 2019-03-12 11:06:18 +01:00
Stephane Nicoll 078bd890a6 Merge branch '2.0.x' into 2.1.x 2019-03-12 11:05:23 +01:00
Stephane Nicoll 50d0b4df46 Polish 2019-03-12 11:04:00 +01:00
Stephane Nicoll 7b78367eb9 Merge pull request #16178 from izeye 
* pr/16178:
  Add dependency management for micrometer-registry-stackdriver
 2019-03-12 10:52:14 +01:00
Johnny Lim 00bda4dc2a Add dependency management for micrometer-registry-stackdriver 
Closes gh-16178
 2019-03-12 10:51:54 +01:00
Stephane Nicoll 7f582cc707 Merge pull request #16193 from izeye 
* pr/16193:
  Polish
 2019-03-12 10:50:54 +01:00
Johnny Lim bcfbabe6cd Polish 
Closes gh-16193
 2019-03-12 10:50:32 +01:00
Andy Wilkinson 8a0dc61c59 Polish prohibited version of Couchbase's client 2019-03-12 09:33:55 +00:00
Stephane Nicoll 1e2177d45d Merge pull request #16203 from izeye 
* pr/16203:
  Add more indentation settings to .editorconfig
 2019-03-12 09:16:30 +01:00
Johnny Lim bcec2bbb58 Add more indentation settings to .editorconfig 
Closes gh-16203
 2019-03-12 09:16:04 +01:00
Phillip Webb fc3aa43cc2 Update copyright year for changed files 2019-03-11 22:14:53 -07:00
Phillip Webb f02887b6c6 Merge branch '2.0.x' into 2.1.x 2019-03-11 22:14:21 -07:00
Phillip Webb 9c3af103e0 Fix ScheduledTasksEndpointAutoConfigurationTests 
Update the `CustomEndpointConfiguration` class in
`ScheduledTasksEndpointAutoConfigurationTests` to be package private
so that it can be enhanced by cglib.

Prior to merge commit 361437f4 the class was a lite configuration so
it didn't matter that it was a private class.
 2019-03-11 22:12:36 -07:00
Phillip Webb 45ae97a4e9 Merge branch '2.0.x' into 2.1.x 2019-03-11 21:09:35 -07:00
Phillip Webb 03beed603c Fix ScheduledTasksEndpointTests BaseConfiguration 
Update the `BaseConfiguration` class in `ScheduledTasksEndpointTests`
to be package private so that it can be enhanced by cglib.

Prior to merge commit 361437f4 the class was a lite configuration so
it didn't matter that it was a private class.
 2019-03-11 21:07:20 -07:00
Andy Wilkinson f0ef693376 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:28:29 +00:00
Andy Wilkinson c2eeeb032c Work around javac bug 2019-03-11 16:27:56 +00:00
Andy Wilkinson 8c3cec8f13 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:14:19 +00:00
Andy Wilkinson 361437f4e2 Merge branch '1.5.x' into 2.0.x 2019-03-11 15:53:34 +00:00
Andy Wilkinson 821ee0cf83 Ensure that @Bean methods are only declared on @Configuration classes 
Closes gh-16190
 2019-03-11 15:01:59 +00:00
Andy Wilkinson f574213cc8 Mark log file endpoint as producing text/plain 
Closes gh-16188
 2019-03-11 08:30:31 +00:00
Andy Wilkinson 7153525ee2 Annotation @JsonTest with @ExtendWith(SpringExtension.class) 
Closes gh-16183
 2019-03-09 20:00:06 +00:00
Andy Wilkinson eeaf057f47 Merge branch '2.0.x' into 2.1.x 2019-03-08 08:20:24 +00:00
Andy Wilkinson fd8a2691a5 Upgrade Maven Wrapper and drop back to Maven 3.5.4 
See gh-16167
 2019-03-08 08:19:42 +00:00
Andy Wilkinson 9d06d22b99 Merge branch '2.0.x' into 2.1.x 2019-03-07 10:17:01 +00:00
Andy Wilkinson affdbeef41 Polish 2019-03-07 10:08:39 +00:00
Andy Wilkinson f46894dfd3 Merge branch '2.0.x' into 2.1.x 2019-03-07 09:43:02 +00:00
Andy Wilkinson 17a1b2822c Isolate LoggerContext state to each test 
Closes gh-16162
 2019-03-07 09:37:41 +00:00