Andy Wilkinson
|
2df156bd52
|
Merge branch '2.0.x'
|
2018-05-11 13:32:22 +01:00 |
|
Andy Wilkinson
|
45f4e8795e
|
Merge branch '1.5.x' into 2.0.x
|
2018-05-11 13:32:08 +01:00 |
|
Andy Wilkinson
|
a9645a3d07
|
Polish
|
2018-05-11 13:29:04 +01:00 |
Stephane Nicoll
|
ae74ce9b39
|
Merge branch '2.0.x'
|
2018-05-11 14:28:38 +02:00 |
|
Stephane Nicoll
|
065f357e79
|
Merge pull request #13137 from vpavic:update-gitignore
* pr/13137:
Add .gitignore for Gradle Plugin module
|
2018-05-11 14:28:21 +02:00 |
Vedran Pavic
|
a08fa27c39
|
Add .gitignore for Gradle Plugin module
Closes gh-13137
|
2018-05-11 14:28:02 +02:00 |
|
Stephane Nicoll
|
b0433d66c1
|
Merge branch '2.0.x'
|
2018-05-11 14:24:13 +02:00 |
|
Stephane Nicoll
|
846e43ff85
|
Merge pull request #13144 from dreis2211:remove-unnecessary-semicolons
* pr/13144:
Remove unnecessary semicolons
|
2018-05-11 14:24:01 +02:00 |
dreis2211
|
e6a23fa3ff
|
Remove unnecessary semicolons
Closes gh-13144
|
2018-05-11 14:23:47 +02:00 |
|
Andy Wilkinson
|
b88a20fabb
|
Polish
|
2018-05-11 13:05:17 +01:00 |
|
Andy Wilkinson
|
64a62db847
|
Merge pull request #11948 from Michael Simons
* gh-11948:
Polish "Auto-configure a ResourceConfig for Jersey endpoints if needed"
Auto-configure a ResourceConfig for Jersey endpoints if needed
|
2018-05-11 12:50:21 +01:00 |
|
Andy Wilkinson
|
a325b13d05
|
Polish "Auto-configure a ResourceConfig for Jersey endpoints if needed"
Closes gh-11948
|
2018-05-11 12:49:44 +01:00 |
Michael J. Simons
|
bb2864ad02
|
Auto-configure a ResourceConfig for Jersey endpoints if needed
See gh-11948
|
2018-05-11 12:49:31 +01:00 |
|
Andy Wilkinson
|
d5e4a19446
|
Upgrade to Liquibase 3.6.1 and adapt to logging changes
Closes gh-13145
|
2018-05-11 12:37:54 +01:00 |
|
Andy Wilkinson
|
39d7382129
|
Merge branch '2.0.x'
|
2018-05-11 11:54:19 +01:00 |
|
Andy Wilkinson
|
972d952716
|
Merge branch '1.5.x' into 2.0.x
|
2018-05-11 11:54:12 +01:00 |
|
Andy Wilkinson
|
e3f0a70df2
|
Merge pull request #12958 from Henri Tremblay
* gh-12958:
Polish "Unwrap InvocationTargetException in isLogConfigurationMessage"
Unwrap InvocationTargetException in isLogConfigurationMessage
|
2018-05-11 11:52:02 +01:00 |
|
Andy Wilkinson
|
678e125720
|
Polish "Unwrap InvocationTargetException in isLogConfigurationMessage"
Closes gh-12958
|
2018-05-11 11:51:18 +01:00 |
Henri Tremblay
|
2953ed1dca
|
Unwrap InvocationTargetException in isLogConfigurationMessage
See gh-12958
|
2018-05-11 11:51:02 +01:00 |
|
Andy Wilkinson
|
079b67c53b
|
Merge branch '2.0.x'
|
2018-05-11 11:16:11 +01:00 |
|
Andy Wilkinson
|
7913d9b599
|
Add methods to BootJar for adding content to BOOT-INF
Closes gh-13000
|
2018-05-11 11:14:14 +01:00 |
|
Andy Wilkinson
|
07251a09d1
|
Merge branch '2.0.x'
|
2018-05-11 10:32:05 +01:00 |
|
Andy Wilkinson
|
d9d7499ae6
|
Merge branch '1.5.x' into 2.0.x
|
2018-05-11 10:31:52 +01:00 |
|
Andy Wilkinson
|
34af02380c
|
Ensure that ZipHeaderPeekIS doesn't miss bytes on partial header read
Closes gh-13032
|
2018-05-11 10:26:44 +01:00 |
|
Andy Wilkinson
|
0d858c1278
|
Merge branch '2.0.x'
|
2018-05-11 10:04:12 +01:00 |
|
Andy Wilkinson
|
7a27882d62
|
Restrict Liberty deployment tests to Java 8
OpenLiberty does not yet support Java 9 or 10 and stopping the server
currently hangs when using Java 10.
Closes gh-13141
|
2018-05-11 10:02:50 +01:00 |
|
Stephane Nicoll
|
360f4e17c2
|
Add support for PageableHandlerMethodArgumentResolver in WebMvcTest
Closes gh-13066
|
2018-05-11 10:37:17 +02:00 |
|
Stephane Nicoll
|
5e87a3d2fa
|
Polish
See gh-13130
|
2018-05-11 10:03:03 +02:00 |
|
Stephane Nicoll
|
00a43d8f4d
|
Merge branch '2.0.x'
|
2018-05-11 10:01:30 +02:00 |
|
Stephane Nicoll
|
6ddf1c27dd
|
Merge pull request #13130 from izeye:polish-20180510
* pr/13130:
Polish
|
2018-05-11 10:00:41 +02:00 |
Johnny Lim
|
75e591e76e
|
Polish
Closes gh-13130
|
2018-05-11 10:00:15 +02:00 |
|
Stephane Nicoll
|
c35cb1b69f
|
Merge branch '2.0.x'
|
2018-05-11 09:57:18 +02:00 |
|
Stephane Nicoll
|
4683940423
|
Merge branch '1.5.x' into 2.0.x
|
2018-05-11 09:56:54 +02:00 |
|
Stephane Nicoll
|
b17a00d0c3
|
Merge pull request #13117 from reegnz:feature/support-jersey-wrapping-resource-config
* pr/13117:
Polish "Add support for Jersey WrappingResourceConfig"
Add support for Jersey WrappingResourceConfig
|
2018-05-11 09:52:30 +02:00 |
|
Stephane Nicoll
|
b48f34117e
|
Polish "Add support for Jersey WrappingResourceConfig"
Closes gh-13117
|
2018-05-11 09:29:36 +02:00 |
Zoltan Reegn
|
dfcd87207f
|
Add support for Jersey WrappingResourceConfig
See gh-13117
|
2018-05-11 09:29:09 +02:00 |
|
Stephane Nicoll
|
a11acbc829
|
Merge branch '2.0.x'
|
2018-05-11 08:55:21 +02:00 |
|
Stephane Nicoll
|
4bec3b7cd9
|
Polish
See gh-13123
|
2018-05-11 08:55:03 +02:00 |
Madhura Bhave
|
ea99d8cab0
|
Merge branch '2.0.x'
|
2018-05-10 11:53:25 -07:00 |
|
Madhura Bhave
|
05cf8229d9
|
Fix tests
|
2018-05-10 11:50:43 -07:00 |
|
Madhura Bhave
|
36c89e2383
|
Merge branch '2.0.x'
|
2018-05-10 10:01:42 -07:00 |
|
Madhura Bhave
|
c937bb68a0
|
ServletEndpoints should take servletPath into account
Fixes gh-13106
|
2018-05-10 10:01:11 -07:00 |
|
Andy Wilkinson
|
0b76fc8f8e
|
Merge branch '2.0.x'
|
2018-05-10 15:46:47 +01:00 |
|
Andy Wilkinson
|
fbf974478a
|
Merge branch '1.5.x' into 2.0.x
|
2018-05-10 15:46:28 +01:00 |
|
Andy Wilkinson
|
c8b3cea200
|
Clarify that registration bean URL patterns use Servlet spec format
Closes gh-13080
|
2018-05-10 15:45:16 +01:00 |
|
Madhura Bhave
|
36c7602f2a
|
Merge branch '2.0.x'
|
2018-05-09 12:04:34 -07:00 |
|
Madhura Bhave
|
4ec87956f9
|
Fix EndpointRequest include/exclude for ServletEndpoints
Fixes gh-13089
|
2018-05-09 12:01:58 -07:00 |
|
Andy Wilkinson
|
bdfcb0dc81
|
Merge branch '2.0.x'
|
2018-05-09 17:35:31 +01:00 |
Spring Buildmaster
|
81a4e5d58c
|
Next development version (v2.0.3.BUILD-SNAPSHOT)
|
2018-05-09 14:10:31 +00:00 |
|
Andy Wilkinson
|
dd76766a8d
|
Merge branch '2.0.x'
|
2018-05-09 14:06:55 +01:00 |