root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 17 Packages Projects Releases Wiki Activity
28,160 Commits 23 Branches 347 Tags 279 MiB
Commit Graph

28160 Commits

Author SHA1 Message Date
Stephane Nicoll 4149b66c7e Merge branch '2.1.x' into 2.2.x 2020-06-09 14:47:41 +02:00
Stephane Nicoll 36a05375c7 Start building against Spring Kafka 2.2.14 snapshots 
See gh-21780
 2020-06-09 14:23:58 +02:00
Stephane Nicoll 445a9a461b Start building against Spring Integration 5.1.11 snapshots 
See gh-21777
 2020-06-09 14:23:58 +02:00
Stephane Nicoll de6ee358fb Upgrade to Spring Framework 5.1.16 
Closes gh-21729
 2020-06-09 13:36:32 +02:00
Andy Wilkinson 8155cc5f23 Merge branch '2.2.x' into 2.3.x 
Closes gh-21786
 2020-06-09 11:02:23 +01:00
Andy Wilkinson a0f29edd4d Always initialize stompWebSocketHandlerMapping eagerly 
Previously, when lazy initialization was enabled, STOMP-based WebSocket
messaging would not work as the stompWebSocketHandlerMapping bean was
not initialized and CONNECT requests would go unanswered.

This commit adds a LazyInitializationExcludeFilter that causes the
stompWebSocketHandlerMapping bean to always be initialized eagerly.
This triggers initialization of the WebSocket transport allowing
requests to be received and processed.

Fixes gh-19611
 2020-06-09 11:02:02 +01:00
Stephane Nicoll e9f6dc9d9a Upgrade to Reactor Dysprosium-SR8 
Closes gh-21731
 2020-06-09 09:04:31 +02:00
Stephane Nicoll 1bd5b17251 Merge branch '2.2.x' into 2.3.x 2020-06-09 09:03:50 +02:00
Stephane Nicoll 3889e6336a Upgrade to Reactor Dysprosium-SR8 
Closes gh-21730
 2020-06-09 09:02:55 +02:00
Stephane Nicoll 72c2638d6f Merge branch '2.1.x' into 2.2.x 2020-06-09 09:01:55 +02:00
Stephane Nicoll 10e0ca7dce Upgrade to Reactor Californium-SR19 
Closes gh-21728
 2020-06-09 09:01:13 +02:00
Scott Frederick 97ff3a8782 Merge pull request #21702 from Aurdo 
* gh-21702:
  Improve tests for BasicErrorController
  Fix BasicErrorController include parameter parsing

Closes gh-21702
 2020-06-08 15:02:38 -05:00
Scott Frederick 73aff08535 Improve tests for BasicErrorController 
This commit improves the tests for BasicErrorController by decoupling
coverage for the include-message and include-binding-errors
parameters to ensure the options operate properly independent of
each other.

See gh-21702
 2020-06-08 15:00:55 -05:00
Aurdo e2e52a11cc Fix BasicErrorController include parameter parsing 
This commit fixes an error in BasicErrorController where the wrong
property was referenced for binding error inclusion.

See gh-21702
 2020-06-08 15:00:55 -05:00
Phillip Webb b71bab2817 Document deprecations of Archive.iterator() 
Closes gh-21695
 2020-06-08 12:08:33 -07:00
Phillip Webb 6547ea56f9 Merge pull request #21060 from dsyer 
* pr/21060:
  Polish 'Fix Mustache to not ignore native fetcher'
  Fix Mustache to not ignore native fetcher

Closes gh-21060
 2020-06-08 11:40:17 -07:00
Phillip Webb ddbecf62b3 Polish 'Fix Mustache to not ignore native fetcher' 
See gh-21060
 2020-06-08 11:10:57 -07:00
Dave Syer 5199c11e37 Fix Mustache to not ignore native fetcher 
Alter the logic of `MustacheEnvironmentCollector` so that the
native fetcher is always consulted if it exists.

When the context is a map (as it is in a web View for instance) you
can't assume a non-null fetcher actually contains the property you are
searching for.

See gh-21060
 2020-06-08 11:02:04 -07:00
Phillip Webb e9e4a34e62 Merge branch '2.2.x' into 2.3.x 2020-06-08 10:50:53 -07:00
Phillip Webb ee00b57a78 Merge branch '2.1.x' into 2.2.x 2020-06-08 10:50:28 -07:00
Dave Syer b59b48e40e Ignore 'attach_pid' files 2020-06-08 10:50:07 -07:00
Phillip Webb 8cd0f5684e Merge pull request #21650 from fastso 
* pr/21650:
  Polish 'Clarify documentation for probe ports'
  Clarify documentation for probe ports

Closes gh-21650
 2020-06-08 10:42:33 -07:00
Phillip Webb 47729be4e3 Polish 'Clarify documentation for probe ports' 
See gh-21650
 2020-06-08 10:42:01 -07:00
Hui Li e6ade05c2d Clarify documentation for probe ports 
Update the reference documentation to provide a better description of
the port that should be used for Kubernetes probes.

See gh-21650
 2020-06-08 10:41:41 -07:00
Phillip Webb 9dfb09c5d7 Merge pull request #21758 from dreis2211 
* pr/21758:
  Use supplier assertions in availability indicator

Closes gh-21758
 2020-06-08 10:30:00 -07:00
dreis2211 eeb1db2176 Use supplier assertions in availability indicator 
See gh-21758
 2020-06-08 10:29:28 -07:00
Andy Wilkinson 96ae4864a2 Merge branch '2.2.x' into 2.3.x 
Closes gh-21762
 2020-06-08 17:42:02 +01:00
Andy Wilkinson 13564b4a13 Merge pull request #20716 from norio-io 
* gh-20716:
  Polish "Clarify loss of defaults when adding custom mapping"
  Clarify loss of defaults when adding custom mapping

Closes gh-20716
 2020-06-08 17:41:46 +01:00
Andy Wilkinson 2de906caf7 Polish "Clarify loss of defaults when adding custom mapping" 
See gh-20716
 2020-06-08 17:34:11 +01:00
Norio 9f009e4445 Clarify loss of defaults when adding custom mapping 
See gh-20716
 2020-06-08 17:31:26 +01:00
Andy Wilkinson a97c63661a Merge branch '2.2.x' into 2.3.x 
Closes gh-21760
 2020-06-08 17:08:07 +01:00
Andy Wilkinson 4a0e8217f0 Merge branch '2.1.x' into 2.2.x 
Closes gh-21759
 2020-06-08 17:07:51 +01:00
Andy Wilkinson 5dce945e29 Document dispatcher-types configuration for secured error pages 
Closes gh-19293
 2020-06-08 17:06:42 +01:00
Andy Wilkinson fe265af252 Merge branch '2.2.x' into 2.3.x 
Closes gh-21755
 2020-06-08 14:43:39 +01:00
Andy Wilkinson 296da88e31 Merge branch '2.1.x' into 2.2.x 
Closes gh-21754
 2020-06-08 14:43:14 +01:00
Andy Wilkinson c96455f7cf Remove . from CLI's classpath on Unix-like platforms 
Previously, the spring bash script added . to the classpath but the
Windows spring.bat script did not. This commit aligns the classpath
of the two scripts by removing . from the classpath in the bash
script.

Fixes gh-19910
 2020-06-08 14:40:14 +01:00
Andy Wilkinson a192dcb742 Merge branch '2.2.x' into 2.3.x 
Closes gh-21752
 2020-06-08 14:30:05 +01:00
Andy Wilkinson ad158ee729 Merge branch '2.1.x' into 2.2.x 
Closes gh-21751
 2020-06-08 14:29:53 +01:00
Andy Wilkinson 020a47ba3e Document support for Gradle 5 
Closes gh-15358
 2020-06-08 14:29:07 +01:00
Andy Wilkinson 82b531b49e Merge branch '2.2.x' into 2.3.x 2020-06-08 11:35:53 +01:00
Andy Wilkinson 8da1e3addb Merge branch '2.1.x' into 2.2.x 2020-06-08 11:35:10 +01:00
Andy Wilkinson 6a9450ee8b Polish 2020-06-08 11:34:56 +01:00
Phillip Webb 8ac8329ee6 Merge pull request #21381 from evgeniycheban 
* pr/21381:
  Polish 'Support userInfo in elasticsearch URI'
  Support userInfo in elasticsearch URI

Closes gh-21381
 2020-06-07 11:57:32 -07:00
Phillip Webb f8982bdc14 Polish 'Support userInfo in elasticsearch URI' 
See gh-21381
 2020-06-07 11:56:18 -07:00
Evgeniy Cheban a72179aa4f Support userInfo in elasticsearch URI 
See gh-21381
 2020-06-07 10:38:41 -07:00
Phillip Webb abaca95467 Merge branch '2.2.x' into 2.3.x 
Closes gh-21744
 2020-06-07 10:27:35 -07:00
Phillip Webb bfe1c281f0 Merge branch '2.1.x' into 2.2.x 
Closes gh-21743
 2020-06-07 10:25:33 -07:00
Phillip Webb 70e0a27949 Drop the use of the term "white list" 
Closes gh-21737
 2020-06-07 10:22:35 -07:00
Stephane Nicoll 9fd6ff7e88 Start building against Spring Framework 5.2.7 snapshots 
See gh-21739
 2020-06-07 11:14:02 +02:00
Stephane Nicoll 83acb39a1e Merge branch '2.2.x' into 2.3.x 2020-06-07 11:13:25 +02:00