8ef08e5c0b
Merge pull request #13623 from Christoph Dreis
...
* gh-13623:
Fix deprecation warning in SpringPhysicalNamingStrategyTests
2018-07-03 08:29:39 +01:00
d641249ca8
Fix deprecation warning in SpringPhysicalNamingStrategyTests
...
Closes gh-13623
2018-07-03 08:29:11 +01:00
fb443aa3bf
Merge branch '2.0.x'
2018-07-02 14:03:32 -07:00
d15ca6e0de
Update sync-to-maven-central CI job
...
Closes gh-13296
2018-07-02 13:57:34 -07:00
149c7a85c3
Merge branch '2.0.x'
2018-07-02 13:18:45 -07:00
673a08d228
Support microseconds in Duration conversions
...
Closes gh-13624
2018-07-02 13:18:09 -07:00
c3641c480b
Merge branch '2.0.x'
2018-07-02 19:18:30 +01:00
06a8c41943
Preserve trailing whitespace in origin-tracked property values
...
Closes gh-13602
2018-07-02 19:17:02 +01:00
de900e71a3
Merge branch '2.0.x'
2018-07-02 16:26:27 +01:00
032d5488cd
Tolerate non-existent source folders in DevTools
...
Closes gh-13620
2018-07-02 16:26:19 +01:00
4eff07f6c0
Merge branch '2.0.x'
2018-06-28 12:49:34 -07:00
fddc9e9c7e
Support multiple paths in DispatcherServletPathProvider
...
Closes gh-13603
2018-06-28 12:36:58 -07:00
c321fdadfa
Merge branch '2.0.x'
2018-06-28 14:42:22 +01:00
43ea78f2ce
Merge branch '1.5.x' into 2.0.x
2018-06-28 14:42:17 +01:00
6219ea27e8
Remove unwanted override of resource plugin's version
...
Closes gh-13607
2018-06-28 14:41:35 +01:00
4cccc9a886
Merge branch '2.0.x'
2018-06-28 14:27:21 +01:00
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
45fdf2ffa4
Support Tomcat 9 and Undertow 2
...
Closes gh-11749
Closes gh-12243
2018-06-28 11:33:30 +01:00
b4cd4f4c43
Stop mocking class that is final in latest Framework 5.1 snapshots
2018-06-28 10:51:58 +01:00
cde3c21926
Merge branch '2.0.x'
2018-06-27 11:34:22 -07:00
5fd30a9dc2
Merge pull request #13572 from Christoph Dreis
...
* gh-13572:
Fix typo
2018-06-27 11:32:40 -07:00
17edf0e2fe
Fix typo
2018-06-27 11:31:06 -07:00
598b1f4300
Merge branch '2.0.x'
2018-06-27 11:21:18 -07:00
a1491be636
Refine DispatcherServletPathProvider creation
...
Closes gh-13527
2018-06-27 11:06:56 -07:00
f8186ce0ee
Update ISSUE_TEMPLATE.md
2018-06-26 16:50:17 -07:00
ca0de4385c
Upgrade to Hibernate 5.3 and JPA 2.2
...
Closes gh-11725
2018-06-26 16:51:47 +01:00
9281e2a410
Avoid creating JsonParser for VCAP_* parsing when running outside CF
...
Closes gh-13437
2018-06-25 17:35:30 +01:00
8dbeb68afa
Merge branch '2.0.x'
2018-06-25 13:13:42 +01:00
04119585e8
Merge branch '1.5.x' into 2.0.x
2018-06-25 13:13:34 +01:00
205bb764d5
Specify ID for cache providers section in reference docs
...
Closes gh-13551
2018-06-25 13:11:18 +01:00
8fc6d636c0
Merge branch '2.0.x'
2018-06-25 12:39:51 +01:00
74b8836da4
Merge branch '1.5.x' into 2.0.x
2018-06-25 12:39:47 +01:00
2f952fde6c
Polish
2018-06-25 12:39:31 +01:00
0f16287fd8
Merge branch '2.0.x'
2018-06-25 12:01:30 +01:00
02ad1893a2
Merge branch '1.5.x' into 2.0.x
2018-06-25 12:01:25 +01:00
454de0bfd7
Polish
2018-06-25 12:01:17 +01:00
80ede14510
Merge branch '2.0.x'
2018-06-25 11:25:21 +01:00
911453d478
Merge branch '1.5.x' into 2.0.x
2018-06-25 11:25:10 +01:00
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
24d5209738
Polish “Close Database to reset Connection's auto commit property”
...
Closes gh-13559
2018-06-25 11:02:31 +01:00
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
a097f923c1
Provide sensible defaults for launch script properties when using Gradle
...
Closes gh-4458
2018-06-22 13:08:44 +01:00
b01efb2392
Merge branch '2.0.x'
2018-06-21 12:00:28 -07:00
f10972ad32
Remove redundant build_number
...
Fixes gh-13442
2018-06-21 11:59:05 -07:00
bdd66a6003
Merge branch '2.0.x'
2018-06-21 11:55:46 -07:00
a7fb3cf182
Remove extra / from artifactory server param
...
Fixes gh-13535
2018-06-21 11:43:19 -07:00
5c3b4333f8
Merge branch '2.0.x'
2018-06-21 17:31:24 +01:00
30f0fd1fe4
Merge branch '1.5.x' into 2.0.x
2018-06-21 17:31:16 +01:00
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
b1d8cc55fc
Polish "Fix JSP availability check when not running as a packaged war"
...
Closes gh-12859
2018-06-21 17:30:12 +01:00
Andy Wilkinson
dreis2211
Madhura Bhave
Phil Webb
dmsergeevp44