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
7913d9b599
Add methods to BootJar for adding content to BOOT-INF
...
Closes gh-13000
2018-05-11 11:14:14 +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
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
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
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
4bec3b7cd9
Polish
...
See gh-13123
2018-05-11 08:55:03 +02:00
Madhura Bhave
05cf8229d9
Fix tests
2018-05-10 11:50:43 -07:00
Madhura Bhave
c937bb68a0
ServletEndpoints should take servletPath into account
...
Fixes gh-13106
2018-05-10 10:01:11 -07: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
4ec87956f9
Fix EndpointRequest include/exclude for ServletEndpoints
...
Fixes gh-13089
2018-05-09 12:01:58 -07:00
Spring Buildmaster
81a4e5d58c
Next development version (v2.0.3.BUILD-SNAPSHOT)
2018-05-09 14:10:31 +00:00
Andy Wilkinson
47138af538
Correct the CI badge and link for 2.0.x builds
2018-05-09 14:06:32 +01:00
Andy Wilkinson
989975bb67
Merge branch '1.5.x' into 2.0.x
2018-05-09 11:25:48 +01:00
Andy Wilkinson
d2cef484cb
Fix up version numbers following release
2018-05-09 11:25:21 +01:00
Spring Buildmaster
010b4fccbd
Next development version
2018-05-09 09:31:46 +00:00
Andy Wilkinson
e14a2e33ab
Deprecate queue size property for StatsD metrics export
...
Closes gh-13108
2018-05-09 09:14:09 +01:00
Andy Wilkinson
c826310fd1
Polish
2018-05-09 08:44:15 +01:00
Andy Wilkinson
ba16f135a6
Merge pull request #13108 from Jon Schneider
...
* gh-13108:
Upgrade to Micrometer 1.0.4
2018-05-09 06:39:33 +01:00
Jon Schneider
c6860cb431
Upgrade to Micrometer 1.0.4
...
Closes gh-13108
2018-05-09 06:38:55 +01:00
Andy Wilkinson
33861b3608
Upgrade to Spring Integration 5.0.5.RELEASE
...
Closes gh-13016
2018-05-09 06:37:22 +01:00
Andy Wilkinson
2cb775a90c
Merge branch '1.5.x' into 2.0.x
2018-05-09 06:36:07 +01:00
Andy Wilkinson
7cfaf5e287
Upgrade to Spring Integration 4.3.16.RELEASE
...
Closes gh-13015
2018-05-09 06:35:29 +01:00
Andy Wilkinson
e407ed5f92
Upgrade to Spring Session Apple-SR2
...
Closes gh-13103
2018-05-08 21:21:08 +01:00
Andy Wilkinson
8ce4110966
Allow Jersey-based Actuator to be used with separate management port
...
Previously, when the Jersey-based Actuator was configure with a
separate management port, the resulting child context would fail to
start due to their being no ResourceConfigCustomizer beans available.
This commit updates the configuration so that the customizer's are
injected using an ObjectProvider and an empty list is used in the
event of their being no customizer beans. This aligns the child
context configuration class with JerseyAutoConfiguration which
already used this approach.
Closes gh-12975
2018-05-08 21:00:05 +01:00
Andy Wilkinson
e45384bdfa
Upgrade to Spring Kafka 2.1.6.RELEASE
...
Closes gh-13018
2018-05-08 20:16:41 +01:00
Andy Wilkinson
3243ccd8b3
Merge pull request #13090 from ifigotin
...
* gh-13090:
Polish "Clarify deployment of Spring Boot apps to App Engine Standard"
Clarify deployment of Spring Boot apps to App Engine Standard
2018-05-08 20:14:34 +01:00
Andy Wilkinson
7a53623e1c
Polish "Clarify deployment of Spring Boot apps to App Engine Standard"
...
See gh-13090
2018-05-08 20:12:46 +01:00
ifigotin
676b013998
Clarify deployment of Spring Boot apps to App Engine Standard
...
Closes gh-13090
2018-05-08 20:12:33 +01:00
Andy Wilkinson
ce8e1527ca
Merge branch '1.5.x' into 2.0.x
2018-05-08 19:18:34 +01:00
Andy Wilkinson
6ce43df110
Upgrade to Spring Security OAuth 2.0.15
...
Closes gh-13098
2018-05-08 19:17:10 +01:00
Andy Wilkinson
82bf178880
Upgrade to Spring Security 4.2.6
...
Closes gh-13028
2018-05-08 19:15:42 +01:00
Andy Wilkinson
5168766ebb
Upgrade to Spring Security 5.0.5.RELEASE
...
Closes gh-13029
2018-05-08 17:07:17 +01:00
Andy Wilkinson
bca2756b46
Upgrade to Jaybird 3.0.4
...
Closes gh-13100
2018-05-08 17:06:55 +01:00
Andy Wilkinson
47c45539d9
Upgrade to Lettuce 5.0.4.RELEASE
...
Closes gh-13099
2018-05-08 17:06:40 +01:00
Stephane Nicoll
f9134c9325
Upgrade to Spring Data Kay SR7
...
Closes gh-13017
2018-05-08 17:22:01 +02:00
Andy Wilkinson
7b6546c28c
Merge branch '1.5.x' into 2.0.x
2018-05-08 12:51:45 +01:00
Andy Wilkinson
2c865688f9
Upgrade to Spring Data Ingalls SR12
...
Closes gh-13014
2018-05-08 12:51:09 +01:00
Andy Wilkinson
bc80e90b00
Merge branch '1.5.x' into 2.0.x
2018-05-08 12:38:13 +01:00
Andy Wilkinson
2195ed1e8e
Update Jetty war package test to expect new ASM transitive dependency
...
Closes gh-13097
2018-05-08 12:37:19 +01:00
Stephane Nicoll
6577513464
Upgrade to Spring Framework 5.0.6.RELEASE
...
Closes gh-13021
2018-05-08 12:44:55 +02:00
Andy Wilkinson
874650cb33
Merge branch '1.5.x' into 2.0.x
2018-05-08 11:30:30 +01:00