Phillip Webb
a5b22e2858
Merge branch '1.5.x'
2017-01-02 19:59:24 -08:00
Phillip Webb
f4f1a7f929
Revert "Upgrade to Spring HATEOAS 0.22.0"
...
This reverts commit fb4099dfb1 .
2017-01-02 19:58:22 -08:00
Phillip Webb
4026fa563f
Merge branch '1.5.x'
2017-01-02 19:54:26 -08:00
Craig Andrews
fb4099dfb1
Upgrade to Spring HATEOAS 0.22.0
...
Closes gh-7807
2017-01-02 19:49:56 -08:00
Artem Bilan
86ad50f77b
Upgrade to Spring AMQP 1.7.0.RC1
...
Closes gh-7776
2016-12-29 09:19:39 +01:00
Stephane Nicoll
09286b437a
Merge branch '1.5.x'
2016-12-27 17:39:01 +01:00
Stephane Nicoll
05ebed774c
Revert upgrade to Jersey 2.25
...
See gh-7763
2016-12-27 17:36:17 +01:00
Stephane Nicoll
968f90886f
Merge branch '1.5.x'
2016-12-27 17:20:59 +01:00
Quentin Caillard
49c77b868d
Upgrade to Jersey 2.25
...
Closes gh-7763
2016-12-27 17:20:19 +01:00
Stephane Nicoll
548ff2395c
Merge branch '1.5.x'
2016-12-25 09:33:33 +01:00
Stephane Nicoll
f0be1d9d97
Upgrade to Spring Security 4.2.1.RELEASE
...
Closes gh-7745
2016-12-25 09:32:19 +01:00
Phillip Webb
291752a317
Merge branch '1.5.x'
2016-12-24 11:26:50 -08:00
Phillip Webb
a23591e047
Support Jetty 9.4 and upgrade to 9.4.0.v20161208
...
Update `JettyEmbeddedServletContainerFactory` to support Jetty 9.4
directly and Jetty 9.3 via reflection. The primary difference between
Jetty 9.3 and 9.4 are the session management classes. Websocket suppport
has also been updates, but this is handled transparently by the
Spring Framework support.
Fixes gh-7599
2016-12-24 11:22:38 -08:00
Sebastien Deleuze
2127556121
Upgrade to Reactor Core 3.0.4.RELEASE
...
Fixes gh-7740
2016-12-23 14:11:40 +00:00
Stephane Nicoll
d91ee8d6a1
Merge branch '1.5.x'
2016-12-22 16:26:02 +01:00
Stephane Nicoll
e2e690d31c
Exclude xml-apis
...
This commit excludes the transitive dependencies on xml-apis when using
Hibernate. Such dependency is no longer required on modern JDKs
Closes gh-7554
2016-12-22 16:12:55 +01:00
Stephane Nicoll
33a655791c
Merge branch '1.4.x' into 1.5.x
2016-12-21 18:49:34 +01:00
Stephane Nicoll
a2cf7bed63
Upgrade to Spring Integration 4.3.6.RELEASE
...
Closes gh-7710
2016-12-21 18:47:48 +01:00
Stephane Nicoll
8becbcd6af
Upgrade to Spring AMQP 1.6.6.RELEASE
...
Closes gh-7707
2016-12-21 18:47:36 +01:00
Stephane Nicoll
d87d3fde02
Merge branch '1.4.x' into 1.5.x
2016-12-21 13:29:15 +01:00
Stephane Nicoll
d4b8755a7d
Start building against Spring AMQP snapshots
...
See gh-7707
2016-12-21 13:25:33 +01:00
Stephane Nicoll
1673ce4a31
Start building against Spring Integration snapshots
...
See gh-7710
2016-12-21 13:24:46 +01:00
Stephane Nicoll
718ede943b
Upgrade to Spring Framework 4.3.5.RELEASE
...
Closes gh-7601
2016-12-21 13:18:53 +01:00
Stephane Nicoll
0b77f2fe83
Merge branch '1.5.x'
2016-12-20 15:10:34 +01:00
Stephane Nicoll
b084e1824c
Merge branch '1.4.x' into 1.5.x
2016-12-20 15:09:18 +01:00
Stephane Nicoll
bc63d5a918
Revert upgrade to Aspectj 1.8.10
...
See gh-7681
2016-12-20 15:06:55 +01:00
Phillip Webb
87547f208a
Add test for @SpyBean for generic bean definition
...
Add an integration test to check that @SpyBean can be used with on a
bean definition that returns a generic type.
Closes gh-7625
2016-12-19 15:58:25 -08:00
Stephane Nicoll
053783abdd
Merge branch '1.4.x' into 1.5.x
2016-12-19 11:06:25 +01:00
Stephane Nicoll
baaf8e01b5
Start building against Spring Framework 4.3.5 snapshots
...
See gh-7601
2016-12-19 11:04:48 +01:00
Andy Wilkinson
eb2901dfd3
Merge branch '1.5.x'
2016-12-16 20:54:28 +00:00
Andy Wilkinson
647057403e
Merge branch '1.4.x' into 1.5.x
2016-12-16 20:53:44 +00:00
Andy Wilkinson
80a6f42a04
Upgrade to Thymeleaf Extras Springsecurity4 2.1.3.RELEASE
...
Closes gh-7686
2016-12-16 20:20:27 +00:00
Andy Wilkinson
b6a64c55e3
Upgrade to Slf4j 1.7.22
...
Closes gh-7685
2016-12-16 20:20:27 +00:00
Andy Wilkinson
3e9fdcc579
Upgrade to Jooq 3.8.6
...
Closes gh-7684
2016-12-16 20:20:27 +00:00
Andy Wilkinson
dfb3493123
Upgrade to Infinispan 8.2.5.Final
...
Closes gh-7683
2016-12-16 20:20:26 +00:00
Andy Wilkinson
3ead8c03e8
Upgrade to Elasticsearch 2.4.3
...
Closes gh-7682
2016-12-16 20:20:26 +00:00
Andy Wilkinson
d9a77f0372
Upgrade to Aspectj 1.8.10
...
Closes gh-7681
2016-12-16 20:20:26 +00:00
Andy Wilkinson
6736b2b2cc
Upgrade to Joda Time 2.9.6
...
Closes gh-7680
2016-12-16 20:20:26 +00:00
Andy Wilkinson
0afb5f4392
Upgrade to Jest 2.0.4
...
Closes gh-7679
2016-12-16 20:20:25 +00:00
Andy Wilkinson
cda3ced402
Upgrade to Hazelcast 3.6.7
...
Closes gh-7678
2016-12-16 20:20:25 +00:00
Andy Wilkinson
9f41129ebd
Upgrade to Appengine 1.9.48
...
Closes gh-7677
2016-12-16 20:20:25 +00:00
Andy Wilkinson
7d87adb036
Upgrade to Caffeine 2.3.5
...
Closes gh-7676
2016-12-16 20:20:24 +00:00
Andy Wilkinson
0c8a2cc32f
Upgrade to Jackson 2.8.5
...
Closes gh-7675
2016-12-16 20:20:24 +00:00
Andy Wilkinson
929316e2ed
Merge branch '1.5.x'
2016-12-16 16:35:08 +00:00
Vedran Pavic
64eb69edd7
Upgrade Spring Session to 1.3.0.RELEASE
2016-12-16 17:07:41 +01:00
Andy Wilkinson
943262bb97
Raise the minimum supported version of Hibernate to 5.2.x
...
Closes gh-7586
2016-12-15 21:31:53 +00:00
Raja Dilip Kolli
caf5327149
Upgrade to Lombok 1.16.12
...
Closes gh-7590
2016-12-15 14:27:53 +01:00
Stephane Nicoll
1302d1b0e4
Merge branch '1.5.x'
2016-12-15 14:16:28 +01:00
Raja Dilip Kolli
4ce91a5366
Upgrade to Lombok 1.16.12
...
Closes gh-7590
2016-12-15 14:12:38 +01:00
Stephane Nicoll
1d8783b5b3
Add dependency management for javax.validation
...
Closes gh-7641
2016-12-15 14:10:45 +01:00