Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,823 Commits 23 Branches 0 Tags
205a25c0d42931d242bf6e8d855f44dc4042e4f8
Commit Graph

18823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
205a25c0d4 Merge branch '2.0.x' 2018-10-09 11:35:02 +01:00
Andy Wilkinson
1b4a60e65c Start building against Spring Session snapshots for Apple-SR6 
See gh-14732
 2018-10-09 11:33:34 +01:00
Andy Wilkinson
e2b589547c Start building against Spring Data snapshots for Kay-SR11 
See gh-14728
 2018-10-09 11:32:21 +01:00
Andy Wilkinson
a99b5ab96e Merge branch '1.5.x' into 2.0.x 2018-10-09 11:31:50 +01:00
Andy Wilkinson
d6f01951f4 Start building against Spring Data snapshots for Ingalls-SR16 
See gh-14727
 2018-10-09 11:30:49 +01:00
Stephane Nicoll
50e089076e Merge pull request #14712 from dreis2211 
* pr/14712:
  Fix actuator endpoint tables in docs
 2018-10-09 08:29:06 +02:00
dreis2211
6a66a333ae Fix actuator endpoint tables in docs 
Closes gh-14712
 2018-10-09 08:27:35 +02:00
Andy Wilkinson
2ae58b66f0 Merge branch '2.0.x' 2018-10-08 20:08:57 +01:00
Andy Wilkinson
508bfda9ad Start building against Spring Framework 5.0.10 snapshots 
See gh-14722
 2018-10-08 20:08:24 +01:00
Andy Wilkinson
f5367a9e1f Merge branch '1.5.x' into 2.0.x 2018-10-08 20:06:56 +01:00
Andy Wilkinson
c428eaa8c0 Start building against Spring Framework 4.3.20 snapshots 
See gh-14721
 2018-10-08 20:06:26 +01:00
Andy Wilkinson
04d69f10e0 Merge branch '2.0.x' 2018-10-08 16:29:37 +01:00
Andy Wilkinson
07dd689c9c Polish 2018-10-08 16:29:21 +01:00
Andy Wilkinson
d20dfa4f2f Merge pull request #14720 from Christoph Dreis 
* gh-14720:
  Fix @Cacheable typo
 2018-10-08 16:29:07 +01:00
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
Andy Wilkinson
52361e6400 Honour SSL key and trust store providers when configuring Undertow 
Closes gh-14713
 2018-10-08 12:10:23 +01:00
Stephane Nicoll
7da3396555 Merge branch '2.0.x' 2018-10-08 10:45:49 +02:00
Stephane Nicoll
8600489775 Merge pull request #14707 from dreis2211 
* pr/14707:
  Remove unused fields in tests
 2018-10-08 10:40:16 +02:00
dreis2211
55ec016bac Remove unused fields in tests 
Closes gh-14707
 2018-10-08 10:40:04 +02:00
Andy Wilkinson
5ef9b0f901 Increase the maximum heap size that is available to Maven 2018-10-06 19:38:32 +01: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
2c7b74db00 Merge pull request #14708 from Johnny Lim 
* gh-14708:
  Fix broken Asciidoctor syntax
 2018-10-06 13:04:56 +01:00
Johnny Lim
2ba3080508 Fix broken Asciidoctor syntax 
Closes gh-14708
 2018-10-06 13:04:22 +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
f4cc3ade88 Merge pull request #14353 from davidkarlsen 
* pr/14353:
  Polish "Add Prometheus push gateway support"
  Add Prometheus push gateway support
 2018-10-05 18:15:43 -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
Stephane Nicoll
12cb478b0d Restore files changes by accident 2018-10-05 23:07:08 +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