Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,169 Commits 23 Branches 0 Tags
eb61b2bbded7e4bd5fc47e3e64c8a3b60a7e9a6d
Commit Graph

19169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Bhave
eb61b2bbde Merge branch '2.0.x' 2018-10-23 14:21:31 -07:00
Madhura Bhave
4322b9781b Polish 2018-10-23 14:21:06 -07:00
Madhura Bhave
b04d3f507c Merge pull request #14915 from michaldo 
* gh-14915:
  Polish
  Skip restarter for JUnit5
 2018-10-23 13:52:14 -07:00
Madhura Bhave
5f24af6c3c Polish 
Closes gh-14915
 2018-10-23 13:51:13 -07:00
michal
7181e76135 Skip restarter for JUnit5 
See gh-14915
 2018-10-23 13:50:57 -07:00
Madhura Bhave
80bb7ea9d6 Merge branch '2.0.x' 2018-10-23 13:43:40 -07:00
Madhura Bhave
bc58d4456f Rationalize DefaultRestartInitializerTests 
Closes gh-14927
 2018-10-23 13:43:11 -07:00
Brian Clozel
1651690d57 Fix tests after HandlerExceptionResolver logging changes 
See gh-14936
 2018-10-23 15:34:06 +02:00
Madhura Bhave
45a0bfd870 Merge pull request #14910 from izeye 
* gh-14910:
  Use Commons Logging for PrometheusPushGatewayManager
 2018-10-22 21:58:53 -07:00
Johnny Lim
c3ac423fdd Use Commons Logging for PrometheusPushGatewayManager 
Closes gh-14910
 2018-10-22 21:58:00 -07:00
Madhura Bhave
fd20618f4b Merge branch '2.0.x' 2018-10-22 21:55:01 -07:00
Madhura Bhave
44e96013ff Merge pull request #14912 from dreis2211 
* gh-14912:
  Use Errors.hasErrors() in DefaultErrorAttributes
 2018-10-22 21:51:56 -07:00
dreis2211
3fea487c7b Use Errors.hasErrors() in DefaultErrorAttributes 
Closes gh-14912
 2018-10-22 21:51:21 -07:00
Madhura Bhave
0dc4afdefd Merge branch '2.0.x' 2018-10-22 15:05:16 -07:00
Madhura Bhave
d6991e6d91 Fix formatting violation 2018-10-22 15:02:31 -07:00
Madhura Bhave
f0004c4ade Merge branch '2.0.x' 2018-10-22 14:57:10 -07:00
Madhura Bhave
5742c2383c Merge pull request #14916 from dreis2211 
* gh-14916:
  Avoid creation of unnecessary collections
 2018-10-22 14:56:00 -07:00
dreis2211
5c0d7f4ac0 Avoid creation of unnecessary collections 
Closes gh-14916
 2018-10-22 14:54:39 -07:00
Phillip Webb
31335bb50f Merge branch '2.0.x' 2018-10-22 14:35:03 -07:00
Phillip Webb
35221c1142 Polish 2018-10-22 14:26:01 -07:00
Phillip Webb
de7eeb5014 Fix ResourceUrlEncodingFilter conditions 
Fix `ResourceUrlEncodingFilter` conditions which were inadvertently
changed in commits 64f04fce and 6cc272ec and would back off if any
`FilterRegistrationBean` was found.

The updated conditions restores the behavior of Spring Boot 2.0.5 and
allows users to directly register their own `ResourceUrlEncodingFilter`
beans (as long as they don't use a `FilterRegistrationBean`).

Fixes gh-14897
 2018-10-22 14:17:49 -07:00
Madhura Bhave
520ce148f5 Merge branch '2.0.x' 2018-10-19 16:21:20 -07:00
Madhura Bhave
f145e81354 Use github release resource for publishing release notes 
This commit also marks a release as pre-release for milestones and RCs

Closes gh-14908
Closes gh-14875
 2018-10-19 16:17:11 -07:00
Andy Wilkinson
660b912100 Merge branch '2.0.x' 2018-10-19 18:21:55 +01:00
Andy Wilkinson
2110215559 Provide more detailed uri tag for calls to Data REST repositories 
Closes gh-14872
 2018-10-19 18:19:58 +01:00
Andy Wilkinson
d838787e70 Start building against Spring Data snapshots for Kay-SR12 
See gh-14893
 2018-10-19 17:52:52 +01:00
Andy Wilkinson
4e27d17b7e Starting building against Spring Session snapshots for Bean-RELEASE 
See gh-14733
 2018-10-19 17:50:07 +01:00
Andy Wilkinson
6b84fac8f6 Start building against Spring Kafka snapshots for 2.2.0.RELEASE 
See gh-14892
 2018-10-19 17:50:07 +01:00
Andy Wilkinson
21100d83ae Start building against Spring Integration snapshots for 5.1.0.RELEASE 
See gh-14889
 2018-10-19 17:50:07 +01:00
Andy Wilkinson
e504c6b193 Start building against Spring Data snapshots for Lovelace-SR2 
See gh-14888
 2018-10-19 17:50:07 +01:00
Andy Wilkinson
ad5f308f32 Start building against Spring Batch snapshots for 4.1.0.RELEASE 
See gh-14891
 2018-10-19 17:50:07 +01:00
Andy Wilkinson
4d9714a0cb Start building against Micrometer snapshots for 1.1.0 
See gh-14890
 2018-10-19 17:50:07 +01:00
Andy Wilkinson
efbc0fc2ca Merge branch '2.0.x' 2018-10-19 11:41:38 +01:00
Andy Wilkinson
76ad197584 Deallocate servlet after forcing initialization in mappings endpoint 
Previously, when using Tomcat, a call to mappings endpoint would force
the initialization of any DispatcherServlets in the context. This was
done by calling allocate on Tomcat's StandardWrapper. This left the
wrapper in a state that would cause it to block for two seconds during
shutdown as the wrapper has an outstanding allocation.

This commit immediately deallocates the servlet after it has been
allocated. This ensures that the DispatcherServlet has been initialized
while also leaving the wrapper in a state that it can shut down
immediately when asked to do so.

Closes gh-14898
 2018-10-19 10:43:23 +01:00
Andy Wilkinson
22e722d9f9 Polish 2018-10-18 15:51:20 +01:00
Andy Wilkinson
cefc7842d6 Merge branch '2.0.x' 2018-10-18 15:38:17 +01:00
Andy Wilkinson
9b8ead825c Polish 2018-10-18 15:38:06 +01:00
Brian Clozel
5bf51f52b9 Fix WebFlux instrumentation after SPR-17395 
SPR-17395 ensures that WebFlux.fn is adding a request attribute of type
`PathPattern` on the `HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE`.

A specific tag provider for WebFlux.fn is no longer necessary.

See gh-14876
 2018-10-18 14:58:39 +02:00
Brian Clozel
64c9dfe7d6 Upgrade to Spring Framework 5.1.2.BUILD-SNAPSHOT 
See gh-14887
 2018-10-18 14:58:01 +02:00
Andy Wilkinson
1b0677bdd9 Merge branch '2.0.x' 2018-10-18 11:10:22 +01:00
Andy Wilkinson
d5201070e6 Cross-link to Gradle Plugin docs rather than duplicating example 
Closes gh-14878
 2018-10-18 11:09:16 +01:00
Andy Wilkinson
3995c66b37 Merge branch '2.0.x' 2018-10-18 10:47:46 +01:00
Andy Wilkinson
993c75ea38 Merge branch '1.5.x' into 2.0.x 2018-10-18 10:47:35 +01:00
Andy Wilkinson
fdca475be4 Use canonical link to project page for homepage in Homebrew formula 
Closes gh-14851
 2018-10-18 10:45:59 +01:00
Andy Wilkinson
3177584588 Back off auto-config of Log4J2Metrics when context is backed by SLF4J 
Closes gh-14883
 2018-10-18 10:31:10 +01:00
Stephane Nicoll
ebcc5d8b1f Merge pull request #14884 from izeye 
* pr/14884:
  Polish
 2018-10-18 09:36:43 +02:00
Johnny Lim
c8c3f59e93 Polish 
Closes gh-14884
 2018-10-18 09:36:27 +02:00
Stephane Nicoll
2a0451c461 Merge branch '2.0.x' 2018-10-17 18:06:19 +02:00
Stephane Nicoll
696c621f35 Merge pull request #14836 from goughy000 
* pr/14836:
  Force JMX hostname to 127.0.0.1
 2018-10-17 18:06:05 +02:00
Jack Gough
94770cc0fd Force JMX hostname to 127.0.0.1 
Closes gh-14836
 2018-10-17 18:05:28 +02:00