Stephane Nicoll
31441a7590
Add a note to explain how to disable the web server
...
See gh-12853
2018-04-13 15:18:08 +02:00
Stephane Nicoll
2fd5cebe31
Merge branch '2.0.x'
2018-04-13 14:51:07 +02:00
Stephane Nicoll
7550f92ea5
Clarify DataSource metrics section for custom DataSources
...
Closes gh-12851
2018-04-13 14:50:44 +02:00
Brian Clozel
02b0b6ff9c
Merge branch '2.0.x'
2018-04-13 11:50:03 +02:00
Brian Clozel
29a719dfb3
Upgrade to Undertow 1.4.24.Final
...
This commit also updates tests since UNDERTOW-1260 has been fixed in
this release.
Closes gh-12852
2018-04-13 11:48:09 +02:00
Brian Clozel
33c7401e10
Merge branch '2.0.x'
2018-04-12 22:52:51 +02:00
Brian Clozel
b2e7be17ab
Polish gh-11514
...
As pointed out by Rossen in gh-11514 comments, a handler might commit
the response and then send an error signal in the pipeline. In this
case, adding a callback to `beforeCommit` is useless because it won't be
triggered. In those cases, we need to collect metrics right away.
2018-04-12 22:50:16 +02:00
Madhura Bhave
20acd2a89b
Merge branch '2.0.x'
2018-04-12 10:33:11 -07:00
Madhura Bhave
9c7612e681
Fix NPE in WaitStrategy used for test containers
2018-04-12 10:30:36 -07:00
Madhura Bhave
3f34f25d10
Use the right image
2018-04-12 10:10:04 -07:00
Madhura Bhave
0ffede920e
Merge branch '2.0.x'
2018-04-12 09:46:58 -07:00
Madhura Bhave
eaa8faae09
Apply email notification config to jdk9 & 10 builds
...
See gh-10790
2018-04-12 09:46:03 -07:00
Brian Clozel
5e1d0d7bdd
Merge branch '2.0.x'
2018-04-12 18:02:04 +02:00
Brian Clozel
b7695fabab
Switch to Reactor Bismuth SNAPSHOTs
2018-04-12 18:01:33 +02:00
Stephane Nicoll
c322930671
Merge pull request #12082 from vpavic:jersey-bom
...
* pr/12082:
Use Jersey BOM in dependency management
Upgrade to Jersey 2.27
2018-04-12 15:59:34 +02:00
Vedran Pavic
7b9c5a3dc3
Use Jersey BOM in dependency management
...
Closes gh-12847
2018-04-12 15:58:32 +02:00
Vedran Pavic
ec4f054497
Upgrade to Jersey 2.27
...
Closes gh-12847
2018-04-12 15:56:19 +02:00
Stephane Nicoll
ed19f20ca0
Merge branch '2.0.x'
2018-04-12 15:48:57 +02:00
Stephane Nicoll
38bd4bd58c
Stop associating an Executor bean to Quartz
...
This commits make sure that the Quartz auto-configuration no longer
associates an `Executor` bean if present in the context as Quartz offers
properties to tune it, which would mutate and lead to unexpected
results.
Closes gh-12823
2018-04-12 15:48:20 +02:00
Stephane Nicoll
e4e56bbcc3
Migrate to ApplicationContextRunner
2018-04-12 15:48:20 +02:00
Brian Clozel
70826f5478
Merge branch '2.0.x'
2018-04-12 14:51:34 +02:00
Brian Clozel
3fa8fe85af
Deprecate RouterFunctionMetrics
...
Spring Boot now deploys both annotation-based and functional endpoints
under the same `HttpHandler`; this means the currently auto-configured
`MetricsWebFilter` is instrumenting all endpoints to produce metrics.
There is no need for a WebFlux functional specific support.
This commit removes mentions of `RouterFunctionMetrics` in the docs and
deprecates that class.
Closes gh-12833
2018-04-12 12:08:44 +02:00
Brian Clozel
efd4245785
Merge branch '2.0.x'
2018-04-12 11:44:45 +02:00
Brian Clozel
77be10e7bc
Fix "status" metrics tag for error responses
...
Prior to this commit, the metrics `WebFilter` would handle exceptions
flowing through the pipeline and extract tag information right away.
Since error handling turns the exception information into error HTTP
responses later in the chain, the information extracted from the
response earlier is invalid.
In this case, the "status" information could be "200" whereas error
handlers would later set that status to "500".
This commit delays the tags extraction later in the process, right
before the response is comitted. The happy path is not changed, as
handlers signal that the response is fully taken care of at that point.
Fixes gh-11514
2018-04-12 11:30:43 +02:00
Stephane Nicoll
7198b038aa
Merge branch '2.0.x'
2018-04-12 09:44:49 +02:00
Stephane Nicoll
68c6860d88
Merge pull request #12842 from origoni:document-fix-typo-constructor-name
...
* pr/12842:
Fix WebClient example constructor name
2018-04-12 09:44:39 +02:00
DK Lee
1f91ae541f
Fix WebClient example constructor name
...
Closes gh-12842
2018-04-12 09:44:03 +02:00
Madhura Bhave
94362d51ec
Merge branch '2.0.x'
2018-04-11 19:36:35 -07:00
Madhura Bhave
62a8f60bb3
Second attempt at fixing email notification script
2018-04-11 19:34:44 -07:00
Madhura Bhave
d375808d42
Merge branch '2.0.x'
2018-04-11 19:21:52 -07:00
Madhura Bhave
68a9aa56f0
Fix determine email body script
2018-04-11 18:09:08 -07:00
Madhura Bhave
eff6ce5c3c
Merge branch '2.0.x'
2018-04-11 14:32:07 -07:00
Madhura Bhave
8d4e5cbfb7
No need to create output directory
2018-04-11 14:13:11 -07:00
Madhura Bhave
ad5b8e8bfb
Merge branch '2.0.x'
2018-04-11 13:50:39 -07:00
Madhura Bhave
ee8188a19c
Send email if build is successful after failure
...
See gh-10790
2018-04-11 13:41:52 -07:00
Madhura Bhave
d27ad41a88
Merge branch '2.0.x'
2018-04-11 10:42:22 -07:00
Madhura Bhave
4fab679829
Upgrade testcontainers to 1.7.0
...
Closes gh-12821
2018-04-11 10:40:54 -07:00
Stephane Nicoll
8944fa503b
Upgrade to AspectJ 1.9.0
...
Closes gh-12834
2018-04-11 18:28:10 +02:00
Stephane Nicoll
eabe9949dd
Merge branch '2.0.x'
2018-04-11 17:43:44 +02:00
Stephane Nicoll
f55753c1dc
Add reference to Axon Framework
2018-04-11 17:43:33 +02:00
Stephane Nicoll
2d0e3fb81c
Merge branch '2.0.x'
2018-04-11 11:53:46 +02:00
Stephane Nicoll
5cba7400e1
Add reference to Flowable
2018-04-11 11:53:33 +02:00
Stephane Nicoll
105105db3e
Merge branch '2.0.x'
2018-04-11 11:37:16 +02:00
Stephane Nicoll
3c169b4e0a
Fix bean name of EnvironmentEndpointWebExtension
...
Closes gh-12827
2018-04-11 11:34:44 +02:00
Stephane Nicoll
5f3bccc3ba
Merge branch '2.0.x'
2018-04-11 10:52:03 +02:00
Stephane Nicoll
8d81bcd101
Merge pull request #12825 from thsnoopy:fix-typo
...
* pr/12825:
Fix typo
2018-04-11 10:51:53 +02:00
Ken Kwon
16ad34aa19
Fix typo
...
Closes gh-12825
2018-04-11 10:51:20 +02:00
Madhura Bhave
5cfbd33235
Merge branch '2.0.x'
2018-04-10 12:00:31 -07:00
Madhura Bhave
a09a6f223b
Reinstate commit status for concourse builds
...
Fixes gh-10851
2018-04-10 11:59:17 -07:00
Stephane Nicoll
55ea9f796f
Merge branch '2.0.x'
2018-04-10 20:24:19 +02:00