Andy Wilkinson
6219ea27e8
Remove unwanted override of resource plugin's version
...
Closes gh-13607
2018-06-28 14:41:35 +01:00
Andy Wilkinson
4cccc9a886
Merge branch '2.0.x'
2018-06-28 14:27:21 +01:00
Andy Wilkinson
a5d20ffed7
Avoid NPE when creating method tag for WebFlux req with non-standard method
...
Previously, a NullPointerException would occur when WebFluxTags
attempted to create a method Tag for a request with a non-standard
method.
This commit updates WebFluxTags to use getMethodValue(), which will
never return null, rather than getMethod(), which may return null,
when determining the tag's value for the given request.
Closes gh-13596
2018-06-28 14:27:02 +01:00
Andy Wilkinson
45fdf2ffa4
Support Tomcat 9 and Undertow 2
...
Closes gh-11749
Closes gh-12243
2018-06-28 11:33:30 +01:00
Andy Wilkinson
b4cd4f4c43
Stop mocking class that is final in latest Framework 5.1 snapshots
2018-06-28 10:51:58 +01:00
Madhura Bhave
cde3c21926
Merge branch '2.0.x'
2018-06-27 11:34:22 -07:00
Madhura Bhave
5fd30a9dc2
Merge pull request #13572 from Christoph Dreis
...
* gh-13572:
Fix typo
2018-06-27 11:32:40 -07:00
dreis2211
17edf0e2fe
Fix typo
2018-06-27 11:31:06 -07:00
Madhura Bhave
598b1f4300
Merge branch '2.0.x'
2018-06-27 11:21:18 -07:00
Madhura Bhave
a1491be636
Refine DispatcherServletPathProvider creation
...
Closes gh-13527
2018-06-27 11:06:56 -07:00
Phil Webb
f8186ce0ee
Update ISSUE_TEMPLATE.md
2018-06-26 16:50:17 -07:00
Andy Wilkinson
ca0de4385c
Upgrade to Hibernate 5.3 and JPA 2.2
...
Closes gh-11725
2018-06-26 16:51:47 +01:00
Andy Wilkinson
9281e2a410
Avoid creating JsonParser for VCAP_* parsing when running outside CF
...
Closes gh-13437
2018-06-25 17:35:30 +01:00
Andy Wilkinson
8dbeb68afa
Merge branch '2.0.x'
2018-06-25 13:13:42 +01:00
Andy Wilkinson
04119585e8
Merge branch '1.5.x' into 2.0.x
2018-06-25 13:13:34 +01:00
Andy Wilkinson
205bb764d5
Specify ID for cache providers section in reference docs
...
Closes gh-13551
2018-06-25 13:11:18 +01:00
Andy Wilkinson
8fc6d636c0
Merge branch '2.0.x'
2018-06-25 12:39:51 +01:00
Andy Wilkinson
74b8836da4
Merge branch '1.5.x' into 2.0.x
2018-06-25 12:39:47 +01:00
Andy Wilkinson
2f952fde6c
Polish
2018-06-25 12:39:31 +01:00
Andy Wilkinson
0f16287fd8
Merge branch '2.0.x'
2018-06-25 12:01:30 +01:00
Andy Wilkinson
02ad1893a2
Merge branch '1.5.x' into 2.0.x
2018-06-25 12:01:25 +01:00
Andy Wilkinson
454de0bfd7
Polish
2018-06-25 12:01:17 +01:00
Andy Wilkinson
80ede14510
Merge branch '2.0.x'
2018-06-25 11:25:21 +01:00
Andy Wilkinson
911453d478
Merge branch '1.5.x' into 2.0.x
2018-06-25 11:25:10 +01:00
Andy Wilkinson
953df7cf86
Merge pull request #13559 from Dmitry Sergeyev
...
* gh-13559:
Polish “Close Database to reset Connection's auto commit property”
Close Database to reset Connection's auto commit property
2018-06-25 11:07:47 +01:00
Andy Wilkinson
24d5209738
Polish “Close Database to reset Connection's auto commit property”
...
Closes gh-13559
2018-06-25 11:02:31 +01:00
dmsergeevp44
3498a91259
Close Database to reset Connection's auto commit property
...
Previously, LiquibaseEndpoint closed the JdbcConnection but did not
close the Database. When using a connection pool, this could leave the
underlying SQL Connection with its auto commit property set to false.
This commit updates LiquibaseEndpoint to close the Database. This
ensures that it resets that Connection's auto commit property to the
value that it had when the Database was configured to use the
Connection.
See gh-13559
2018-06-25 10:58:51 +01:00
Andy Wilkinson
a097f923c1
Provide sensible defaults for launch script properties when using Gradle
...
Closes gh-4458
2018-06-22 13:08:44 +01:00
Madhura Bhave
b01efb2392
Merge branch '2.0.x'
2018-06-21 12:00:28 -07:00
Madhura Bhave
f10972ad32
Remove redundant build_number
...
Fixes gh-13442
2018-06-21 11:59:05 -07:00
Madhura Bhave
bdd66a6003
Merge branch '2.0.x'
2018-06-21 11:55:46 -07:00
Madhura Bhave
a7fb3cf182
Remove extra / from artifactory server param
...
Fixes gh-13535
2018-06-21 11:43:19 -07:00
Andy Wilkinson
5c3b4333f8
Merge branch '2.0.x'
2018-06-21 17:31:24 +01:00
Andy Wilkinson
30f0fd1fe4
Merge branch '1.5.x' into 2.0.x
2018-06-21 17:31:16 +01:00
Andy Wilkinson
f32c66d0e1
Merge pull request #12859 from ralenmdp
...
* gh-12859:
Polish "Fix JSP availability check when not running as a packaged war"
Fix JSP availability check when not running as a packaged war
2018-06-21 17:30:24 +01:00
Andy Wilkinson
b1d8cc55fc
Polish "Fix JSP availability check when not running as a packaged war"
...
Closes gh-12859
2018-06-21 17:30:12 +01:00
Mandap
82465cf435
Fix JSP availability check when not running as a packaged war
...
See gh-12859
2018-06-21 17:21:00 +01:00
Andy Wilkinson
1ea119a4a5
Merge branch '2.0.x'
2018-06-21 16:21:44 +01:00
Andy Wilkinson
aafe754746
Merge branch '1.5.x' into 2.0.x
2018-06-21 16:21:34 +01:00
Andy Wilkinson
b35e1ad232
Avoid unbounded metrics creation for requests not handled by Spring MVC
...
Previously, if an HTTP request that used a templated URI was handled
by something other than Spring MVC, a potentially unbounded number of
metrics would be created. This happened because, in the absence of
Spring MVC's best matching pattern attribute, MetricsFilter would fall
back to using the request's path. If the handling route was templated,
MetricsFilter would be unaware and would record different metrics for
each different path, rather than a single metric for the matching
pattern.
This cimmit updates MetricsFilter so that it falls back to using
unmapped when Spring MVC's best matching pattern attribute is not
available. This ensures that an unbounded number of metrics will no
longer be created, at the cost of losing specific metrics for requests
that are not handled by Spring MVC and that do not use a templated
path.
Closes gh-5875
2018-06-21 15:10:47 +01:00
Andy Wilkinson
24dec4807f
Merge branch '2.0.x'
2018-06-21 12:47:46 +01:00
Andy Wilkinson
fd125b4a4a
Remove assumption that a file URI can be turned into a File
...
Closes gh-13493
2018-06-21 12:47:23 +01:00
Stephane Nicoll
4c172eb6cd
Merge branch '2.0.x'
2018-06-21 13:32:31 +02:00
Stephane Nicoll
f2cc6e2ef2
Fix link of RESTEasy repository
...
Closes gh-13538
2018-06-21 13:32:07 +02:00
Stephane Nicoll
c594768640
Remove wro4j starter reference
...
This starter does not look maintained anymore and there is an
alternative that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
Stephane Nicoll
8858c88a4c
Remove GraphQL starter reference
...
This starter does not look maintained anymore and there is a fork of it
that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
Andy Wilkinson
a612ba1b11
Merge branch '2.0.x'
2018-06-21 12:18:40 +01:00
Andy Wilkinson
48c5e70ac8
Merge branch '1.5.x' into 2.0.x
2018-06-21 12:18:35 +01:00
Andy Wilkinson
29e87257b4
Provide Gradle example for using Log4j2
...
Closes gh-12729
2018-06-21 12:16:12 +01:00
Andy Wilkinson
eb6898314a
Merge branch '2.0.x'
2018-06-21 11:41:15 +01:00