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
20,433 Commits 23 Branches 345 Tags 278 MiB
Commit Graph

20433 Commits

Author SHA1 Message Date
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
Andy Wilkinson 9963ed1249 Merge branch '2.0.x' into 2.1.x 2019-03-07 09:25:31 +00:00
Andy Wilkinson 83216c34e5 Merge branch '1.5.x' into 2.0.x 2019-03-07 09:25:17 +00:00
Andy Wilkinson 3fdf2818b3 Remove reliance on side-effects in LogbackLoggingSystemTests 
Closes gh-16160
 2019-03-07 09:22:42 +00:00
Andy Wilkinson 80f2e2260e Merge branch '2.0.x' into 2.1.x 2019-03-06 15:11:09 +00:00
Andy Wilkinson e56580ddc6 Merge branch '1.5.x' into 2.0.x 2019-03-06 15:10:25 +00:00
Andy Wilkinson 2916421188 Revert "Upgrade to Jetty 9.4.15.v20190215" 
This reverts commit 53e7c5cde1.

See gh-16118
 2019-03-06 15:09:21 +00:00
Andy Wilkinson a09713ee30 Upgrade to Infinispan 9.4.8.Final 
Closes gh-16134
 2019-03-06 13:34:02 +00:00
Andy Wilkinson de042114af Upgrade to Jetty Reactive Httpclient 1.0.3 
Closes gh-16133
 2019-03-06 13:34:00 +00:00
Andy Wilkinson c54ac68afa Upgrade to Undertow 2.0.19.Final 
Closes gh-16132
 2019-03-06 13:33:59 +00:00
Andy Wilkinson 33fdc5b471 Upgrade to Rxjava2 2.2.7 
Closes gh-16131
 2019-03-06 13:33:58 +00:00
Andy Wilkinson 2568bd6a83 Upgrade to Netty Tcnative 2.0.22.Final 
Closes gh-16130
 2019-03-06 13:33:57 +00:00
Andy Wilkinson 4f5eff6fa4 Upgrade to Lettuce 5.1.5.RELEASE 
Closes gh-16129
 2019-03-06 13:33:56 +00:00
Andy Wilkinson e01b76aa45 Upgrade to Hazelcast 3.11.2 
Closes gh-16128
 2019-03-06 13:33:56 +00:00
Andy Wilkinson ff64e112c9 Merge branch '2.0.x' into 2.1.x 2019-03-06 13:33:00 +00:00
Andy Wilkinson 4cfc532890 Upgrade to Spring Ws 3.0.7.RELEASE 
Closes gh-16127
 2019-03-06 13:30:51 +00:00
Andy Wilkinson 51657e1ad0 Upgrade to Spring Integration 5.0.12.RELEASE 
Closes gh-16126
 2019-03-06 13:30:49 +00:00