fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,878 Commits 22 Branches 339 Tags
Commit Graph

3687 Commits

Author SHA1 Message Date
dreis2211
e6313fd96f Fix @Cacheable typo 
Closes gh-14720
 2018-10-08 16:28:05 +01:00
Andy Wilkinson
b413333abb Merge branch '2.0.x' 2018-10-08 16:10:21 +01:00
Andy Wilkinson
9afd6f53e5 Document need for -parameters compilation with @SpyBean and @Cacheable 
Closes gh-13945
 2018-10-08 16:10:15 +01:00
Andy Wilkinson
c4ba05f092 Merge branch '2.0.x' 2018-10-08 15:59:37 +01:00
Andy Wilkinson
4f51a83ab3 Add a note recommending the use of containers' multipart upload 
Closes gh-2958
 2018-10-08 15:58:48 +01:00
Andy Wilkinson
2216b78f1e Merge branch '2.0.x' 2018-10-08 15:53:09 +01:00
Andy Wilkinson
d3b3c8c64e Honour management.metrics.web.server.auto-time-requests with WebFlux 
Closes gh-13895
 2018-10-08 15:52:50 +01:00
Andy Wilkinson
3f1b3db25a Merge branch '2.0.x' 2018-10-08 15:07:28 +01:00
Andy Wilkinson
1f34da9025 Document application plugin's need for mainClassName to be set 
Closes gh-14250
 2018-10-08 15:06:37 +01:00
Andy Wilkinson
749fa96a8b Polish 2018-10-08 13:34:25 +01:00
Andy Wilkinson
1e0f2b652e Merge branch '2.0.x' 2018-10-08 12:41:16 +01:00
Andy Wilkinson
5d3f30ee94 Honour SSL key and trust store providers when configuring Netty 
Closes gh-14714
 2018-10-08 12:39:09 +01:00
Andy Wilkinson
1afdfef83a Merge branch '2.0.x' 2018-10-08 12:20:11 +01:00
Andy Wilkinson
d6d59edb35 Merge branch '1.5.x' into 2.0.x 2018-10-08 12:19:52 +01:00
Stephane Nicoll
7da3396555 Merge branch '2.0.x' 2018-10-08 10:45:49 +02:00
dreis2211
55ec016bac Remove unused fields in tests 
Closes gh-14707
 2018-10-08 10:40:04 +02:00
Andy Wilkinson
43c0d42dc2 Merge branch '2.0.x' 2018-10-06 13:06:53 +01:00
Andy Wilkinson
bbdd6cc9cb Merge branch '1.5.x' 2018-10-06 13:06:37 +01:00
Andy Wilkinson
8259c6397e Merge branch '2.0.x' 2018-10-06 12:59:42 +01:00
Andy Wilkinson
ca329d3d03 Update Jersey indicator class to one that requires the Servlet API 
Previously, if WebFlux and Jersey were on the classpath, but there was
no Servlet API (and no embedded container) on the classpath, the web
application type would be prevented from being reactive. The absence
of the Servlet API would then prevent the web application type from
being servlet so it would be none.

By contrast, if Spring MVC was on the classpath in place of Jersey
the absence of the Servlet API would allow the web application type to
be reactive. This happened because the Spring MVC indicator class is
DispatcherServlet which requires the Servlet API.

This commit updates the Jersey indicator class to be ServletContainer.
This class is both an HttpServlet and a Filter so it too requires the
Servlet API and, therefore, further aligns the deduction behaviour for
Jersey and Spring MVC.

Closes gh-14701
 2018-10-06 12:59:25 +01:00
Madhura Bhave
670aaf7875 Make prometheus push gateway available to javadoc generation 
See gh-14353
 2018-10-05 19:24:38 -07:00
Phillip Webb
20ecf73cd1 Polish "Add Prometheus push gateway support" 
Rework Prometheus push gateway support so that the central class can
be used outside of auto-configuration. The shutdown flags have also
been replaced with a single "shutdown-operation" property since it's
unlikely that both "push" and "delete" will be required.

It's also possible now to supply a `TaskScheduler` to the manager.

See gh-14353
 2018-10-05 18:12:41 -07:00
David J. M. Karlsen
4e71981f77 Add Prometheus push gateway support 
Add support for Prometheus push gateway so that short lived processes
(for example batch jobs) can still submit metrics to Prometheus.

Closes gh-14353
 2018-10-05 18:12:19 -07:00
Stephane Nicoll
35752a54d2 Adapt to latest change in Micrometer 1.1 2018-10-05 23:42:16 +02:00
Phillip Webb
1d8e4a8f5c Make devtools set spring.messages.reloadable=true 
Update `DevToolsPropertyDefaultsPostProcessor` to automatically set
the recently introduced `spring.messages.reloadable` property to
`true`.

Closes gh-14699
 2018-10-05 13:59:26 -07:00
Phillip Webb
01b8667dd7 Update copyright year for changed files 2018-10-05 13:40:07 -07:00
Phillip Webb
2cdd3dd20f Move to micrometer SNAPSHOT 2018-10-05 13:39:49 -07:00
Phillip Webb
5c7a4523ea Merge '2.0.x' 2018-10-05 13:34:12 -07:00
Phillip Webb
6aedb69443 Update copyright year for changed files 2018-10-05 13:31:33 -07:00
Andy Wilkinson
80d27f7129 Make micrometer-jersey2's classes available to javadoc generation 
See gh-12482
 2018-10-05 21:31:06 +01:00
Phillip Webb
456d1af443 Polish 2018-10-05 13:30:24 -07:00
Andy Wilkinson
72e2313fe8 Polish "Auto-configure Micrometer's Jersey 2 server instrumentation" 
Closes gh-12482
 2018-10-05 16:40:57 +01:00
Michael Weirauch
dd126faf5a Auto-configure Micrometer's Jersey 2 server instrumentation 
See gh-12482

Co-authored-by: Michael J. Simons <michael@simons.ac>
 2018-10-05 16:07:10 +01:00
Stephane Nicoll
40de371a52 Fix build failure 2018-10-05 16:50:41 +02:00
Stephane Nicoll
bb89012922 Merge branch '2.0.x' 2018-10-05 16:43:30 +02:00
Stephane Nicoll
febaf15b61 Guard WebApplicationType detection in case spring web is not present 
Closes gh-14589
 2018-10-05 16:41:22 +02:00
Andy Wilkinson
4108f4a478 Merge branch '2.0.x' 2018-10-05 15:18:49 +01:00
Andy Wilkinson
8573edc03e Provide complete dependency management for Micrometer 
Closes gh-14700
 2018-10-05 15:11:54 +01:00
Andy Wilkinson
4d1fc196de Use Windows-specific custom features so download URI is correct 
Closes gh-14690
 2018-10-05 14:56:07 +01:00
Stephane Nicoll
bdd8e53124 Improve filtering of actuator auto-configurations 
This commit splits auto-configurations that require different
environments so that they can be filtered early.

Closes gh-12260
 2018-10-05 14:57:17 +02:00
Andy Wilkinson
9bc6dbd8d8 Merge branch '2.0.x' 2018-10-05 13:06:38 +01:00
Andy Wilkinson
ad647ba073 Make JSON-B auto-config back of if no JSON-P implementation is available 
Closes gh-14675
 2018-10-05 13:05:14 +01:00
Andy Wilkinson
2d3bd62353 Merge branch '2.0.x' 2018-10-05 12:59:35 +01:00
Stephane Nicoll
91b4dc2f69 Polish "Add reactive health indicator for Couchbase" 
Closes gh-13926
 2018-10-05 13:57:31 +02:00
Mikalai Lushchytski
20ff0d97e4 Add reactive health indicator for Couchbase 
See gh-13926
 2018-10-05 13:57:17 +02:00
Stephane Nicoll
36e2c8bcb5 Add missing entry for Couchbase health indicator 2018-10-05 13:56:50 +02:00
Andy Wilkinson
8ee4c5e4a1 Use offical JSON API jar rather than Geronimo's in Artemis starter 
Closes gh-14691
 2018-10-05 12:44:53 +01:00
Andy Wilkinson
b915234513 Merge branch '2.0.x' 2018-10-05 12:11:24 +01:00
Andy Wilkinson
0ad0785bf7 Provide complete dependency management for Apache Johnzon 
Closes gh-14692
 2018-10-05 12:00:26 +01:00
Andy Wilkinson
5bbdca8cdb Use offical JSON API jar rather than Geronimo's in Artemis starter 
Closes gh-14691
 2018-10-05 11:48:47 +01:00