root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
19,156 Commits 23 Branches 353 Tags 301 MiB
Commit Graph

19156 Commits

Author SHA1 Message Date
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
Stephane Nicoll 6b3a2ac469 Upgrade to Maven Surefire Plugin 2.22.1 
Closes gh-14870
 2018-10-17 14:38:19 +02:00
Stephane Nicoll 40b56040d2 Upgrade to Spring Amqp 2.1.0.RELEASE 
Closes gh-14869
 2018-10-17 14:38:18 +02:00
Stephane Nicoll e6f5e8933a Upgrade to Influxdb Java 2.14 
Closes gh-14868
 2018-10-17 14:38:18 +02:00
Stephane Nicoll c5c646f841 Upgrade to Hibernate 5.3.7.Final 
Closes gh-14867
 2018-10-17 14:38:18 +02:00
Stephane Nicoll 57c2507db9 Upgrade to Lettuce 5.1.1.RELEASE 
Closes gh-14865
 2018-10-17 14:31:16 +02:00
Stephane Nicoll bc1c0dc93c Upgrade to Sendgrid 4.3.0 
Closes gh-14864
 2018-10-17 14:31:15 +02:00
Stephane Nicoll 5e96daab58 Upgrade to Hazelcast 3.10.6 
Closes gh-14863
 2018-10-17 14:31:15 +02:00
Stephane Nicoll 2c383859f0 Upgrade to Couchbase Client 2.7.0 
Closes gh-14862
 2018-10-17 14:31:14 +02:00
Stephane Nicoll 474da80b4d Revert "Restructure of security packages" 
See gh-14412
 2018-10-17 12:22:51 +02:00
Stephane Nicoll ea42fb4433 Merge pull request #14859 from izeye 
* pr/14859:
  Polish "Fix a broken table in doc"
  Fix a broken table in doc
 2018-10-17 08:47:34 +02:00
Stephane Nicoll 5805c0fc0a Polish "Fix a broken table in doc" 
Closes gh-14859
 2018-10-17 08:47:10 +02:00
Johnny Lim 9e25fa1247 Fix a broken table in doc 
See gh-14859
 2018-10-17 08:46:59 +02:00
Madhura Bhave 8a94c5581c Merge branch '2.0.x' 2018-10-16 16:39:32 -07:00