Stephane Nicoll
5654fb049f
Merge branch '2.0.x'
2018-06-14 08:52:24 +02:00
Stephane Nicoll
438f0b008a
Upgrade to Spring Amqp 2.0.4
...
Closes gh-13477
2018-06-14 08:48:36 +02:00
Stephane Nicoll
2483ed3e4e
Upgrade to Spring Kafka 2.1.7
...
Closes gh-13476
2018-06-14 08:47:20 +02:00
Stephane Nicoll
f217aa40f0
Merge branch '2.0.x'
2018-06-14 08:38:33 +02:00
Stephane Nicoll
d47d84ff7a
Merge branch '1.5.x' into 2.0.x
2018-06-14 08:36:18 +02:00
Stephane Nicoll
dc4691fd7f
Merge pull request #13438 from vtintillier:remove-junit-dependency
...
* pr/13438:
Polish "Exclude JUnit from json-simple"
Exclude JUnit from json-simple
2018-06-14 08:35:50 +02:00
Stephane Nicoll
6e5ae0c71d
Polish "Exclude JUnit from json-simple"
...
Closes gh-13438
2018-06-14 08:33:28 +02:00
Vivien Tintillier
e9aa6dd29f
Exclude JUnit from json-simple
...
See gh-13438
2018-06-14 08:32:28 +02:00
Stephane Nicoll
de6ce79d5f
Upgrade to Spring Session Apple-SR3
...
Closes gh-13461
2018-06-14 08:30:11 +02:00
Stephane Nicoll
40ba15047b
Upgrade to Spring Integration 5.0.6
...
Closes gh-13457
2018-06-14 08:28:17 +02:00
Stephane Nicoll
7f209b30bc
Merge branch '1.5.x' into 2.0.x
2018-06-14 08:26:58 +02:00
Stephane Nicoll
93804eeb24
Upgrade to Spring Integration 4.3.17
...
Closes gh-13458
2018-06-14 08:26:15 +02:00
Brian Clozel
b983a1a0a1
Merge branch '2.0.x'
2018-06-13 23:08:27 +02:00
Brian Clozel
6e9fee35a7
Upgrade to Spring Data Kay SR8
...
Closes gh-13455
2018-06-13 23:05:47 +02:00
Stephane Nicoll
48fa68890c
Merge branch '2.0.x'
2018-06-13 20:05:30 +02:00
Stephane Nicoll
d9400206b4
Merge branch '1.5.x' into 2.0.x
2018-06-13 20:05:16 +02:00
Stephane Nicoll
f030073ce2
Upgrade to Spring Data Ingalls SR13
...
Closes gh-13456
2018-06-13 20:00:21 +02:00
Brian Clozel
cb6c8f76e2
Configure X-Forwarded-* support with Reactor Netty
...
This commit configures the new X-Forwarded-* / Forwarded HTTP headers
support with Reactor Netty in its 0.8.0 version.
Closes gh-10900
2018-06-13 14:55:33 +02:00
Andy Wilkinson
f8eefa80df
Merge branch '2.0.x'
2018-06-13 10:55:24 +01:00
Andy Wilkinson
42c307b744
Upgrade to Solr 6.6.4
...
Closes gh-13468
2018-06-13 10:54:36 +01:00
Andy Wilkinson
bbcbc2d113
Upgrade to Reactor Bom Bismuth-SR10
...
Closes gh-13467
2018-06-13 10:54:35 +01:00
Andy Wilkinson
ed3f43fd25
Upgrade to Jackson 2.9.6
...
Closes gh-13466
2018-06-13 10:54:34 +01:00
Andy Wilkinson
0e867aec97
Upgrade to Couchbase Client 2.5.9
...
Closes gh-13465
2018-06-13 10:54:33 +01:00
Andy Wilkinson
71b8b2d242
Merge branch '1.5.x' into 2.0.x
2018-06-13 10:52:27 +01:00
Andy Wilkinson
9c1da51f73
Upgrade to Jetty 9.4.11.v20180605
...
Closes gh-13464
2018-06-13 10:51:16 +01:00
Andy Wilkinson
634101a333
Upgrade to Jackson 2.8.11.20180608
...
Closes gh-13463
2018-06-13 10:51:16 +01:00
Andy Wilkinson
482c840dd8
Merge branch '2.0.x'
2018-06-13 09:37:37 +01:00
Andy Wilkinson
a79c8918ff
Upgrade to Spring Security 5.0.6.RELEASE
...
Closes gh-13459
2018-06-13 09:36:47 +01:00
Andy Wilkinson
9418e0d6dc
Merge branch '1.5.x' into 2.0.x
2018-06-13 09:35:57 +01:00
Andy Wilkinson
b8247f363d
Upgrade to Spring Security 4.2.7.RELEASE
...
Closes gh-13196
2018-06-13 09:35:11 +01:00
Stephane Nicoll
c738b73c6f
Merge branch '2.0.x'
2018-06-13 09:29:36 +02:00
Stephane Nicoll
ec02b56194
Merge pull request #13453 from izeye:spring-boot-test-properties
...
* pr/13453:
Use @SpringBootTest.properties in tests and samples
2018-06-13 09:28:00 +02:00
Johnny Lim
870d7fe16a
Use @SpringBootTest.properties in tests and samples
...
Closes gh-13453
2018-06-13 09:24:28 +02:00
Stephane Nicoll
f8eedb04cc
Merge branch '2.0.x'
2018-06-13 09:08:57 +02:00
Stephane Nicoll
01da6ea30a
Merge pull request #13454 from jkschneider:micrometer-1.0.5
...
* pr/13454:
Upgrade to Micrometer 1.0.5
2018-06-13 09:07:19 +02:00
Jon Schneider
96a6d2923c
Upgrade to Micrometer 1.0.5
...
Closes gh-13454
2018-06-13 08:56:04 +02:00
Stephane Nicoll
e92e97d4b0
Merge branch '2.0.x'
2018-06-13 08:53:40 +02:00
Stephane Nicoll
d24647b07c
Upgrade to Spring Framework 5.0.7.RELEASE
...
Closes gh-13353
2018-06-13 08:51:40 +02:00
Stephane Nicoll
56755b759a
Merge branch '1.5.x' into 2.0.x
2018-06-13 08:51:09 +02:00
Stephane Nicoll
678d3dc394
Upgrade to Spring Framework 4.3.18.RELEASE
...
Closes gh-13352
2018-06-13 08:49:57 +02:00
Brian Clozel
1b81f6f4c0
Fix security test with changes in SPR-16836
...
This commit replaces the use of a GET method by a DELETE method for
testing that the HiddenHttpMethodFilter is ordered before the security
filter. With SPR-16836 changes, only PUT DELETE and PATCH are now
allowed.
2018-06-12 16:39:42 +02:00
Brian Clozel
ae35c17e8c
Merge pull request #13446 from izeye:client-name-none
...
* pr/13446:
Add CLIENT_NAME_NONE to WebClientExchangeTags
2018-06-12 09:21:01 +02:00
Johnny Lim
de3c3cd755
Add CLIENT_NAME_NONE to WebClientExchangeTags
2018-06-12 09:20:46 +02:00
Brian Clozel
2ecd70416c
Merge pull request #13447 from izeye:pattern-before-path
...
* pr/13447:
Use a precompiled pattern in WebClientExchangeTags.extractPath()
2018-06-12 09:17:03 +02:00
Johnny Lim
c908445bff
Use a precompiled pattern in WebClientExchangeTags.extractPath()
2018-06-12 14:56:02 +09:00
Andy Wilkinson
5bd9a445ae
Merge branch '2.0.x'
2018-06-08 18:09:00 +01:00
Andy Wilkinson
6f2171c282
Improve error message when BootJar or BootWar has no known main class
...
Closes gh-12712
2018-06-08 18:07:24 +01:00
Andy Wilkinson
db7789ad87
Merge branch '2.0.x'
2018-06-08 15:47:55 +01:00
Andy Wilkinson
7b3be82cfa
Merge branch '1.5.x' into 2.0.x
2018-06-08 15:47:50 +01:00
Andy Wilkinson
9d9acc92e3
Strengthen wording in JSP limitations regarding jar support
...
Closes gh-13420
2018-06-08 15:44:59 +01:00