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
6e9fee35a7
Upgrade to Spring Data Kay SR8
...
Closes gh-13455
2018-06-13 23:05:47 +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
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
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
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
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
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
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
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
Stephane Nicoll
feacfa8120
Merge branch '1.5.x' into 2.0.x
2018-06-08 08:34:29 +02:00
Stephane Nicoll
6b86190ae8
Remove unnecessary ConfigurationProperties
...
Closes gh-13412
2018-06-08 08:33:03 +02:00
Madhura Bhave
4194baad91
Don't log p/w when AuthenticationManagerBuilder configured
...
Fixes gh-12872
2018-06-07 12:52:15 -07:00
Madhura Bhave
f7ff8dd165
Make generated password output consistent
2018-06-07 12:39:46 -07:00
Madhura Bhave
ed734d7e43
Trace filter ignores invalid requests
...
Fixes gh-12987
2018-06-07 09:27:49 -07:00
Brian Clozel
59746de63b
Backport web server configuration doc changes
...
Closes gh-13401
2018-06-07 14:38:19 +02:00
Stephane Nicoll
5c96943e59
Merge branch '1.5.x' into 2.0.x
2018-06-07 10:45:59 +02:00
Stephane Nicoll
0b644910d7
Fix typo
...
Closes gh-13368
2018-06-07 10:44:35 +02:00
Phillip Webb
3e1b163c34
Merge pull request #13344 from fahimfarookme
...
* pr/13344:
Polish "Fix caching issues with map property sources"
Fix caching issues with map property sources
2018-06-06 15:17:30 -07:00
Phillip Webb
dc1c459cde
Polish "Fix caching issues with map property sources"
...
Refine the property source cache key fix so that a copy of the
key is only taken when the values change. This allows us to
retain the previous performance optimization of not creating
unnecessary string arrays.
Closes gh-13344
2018-06-06 15:17:07 -07:00
Fahim Farook
c556d2b58f
Fix caching issues with map property sources
...
Update `SpringIterableConfigurationPropertySource` so that the cache
key from a `MapPropertySource` is invalidated when the map contents
changes.
Prior to this commit, the actual keys of the map were used as the key.
This meant that if the underlying map changed, they key wouldn't be
invalidated because it ultimately pointed to the same object instance.
See gh-13344
2018-06-06 15:02:59 -07:00
Madhura Bhave
461202bc25
EndpointRequest uses empty servlet path if not available
...
Fixes gh-13399
2018-06-06 10:48:42 -07:00
Brian Clozel
7cbbd95fc9
Ignore invalid Accept headers in WebFlux error handling
...
Prior to this commit, the `DefaultErrorWebExceptionHandler` would parse
the HTTP "Accept" headers when routing the request to the error handler;
if an error occured during parsing, an `InvalidMediaTypeException` would
be thrown and break the error handling for this request.
This commit ignores those exceptions and makes sure that the error
handling function does not override the response status or the error
itself with those exceptions.
Closes: gh-13372
2018-06-06 14:02:04 +02:00
Andy Wilkinson
47615154de
Upgrade to Mongodb 3.6.4
...
Closes gh-13397
2018-06-06 10:15:33 +01:00
Andy Wilkinson
fd56e79f7a
Upgrade to Mariadb 2.2.5
...
Closes gh-13396
2018-06-06 10:15:33 +01:00
Andy Wilkinson
6d0d66cb28
Upgrade to Narayana 5.8.2.Final
...
Closes gh-13395
2018-06-06 10:15:33 +01:00
Andy Wilkinson
a4a6f482c6
Upgrade to Hsqldb 2.4.1
...
Closes gh-13394
2018-06-06 10:15:33 +01:00
Andy Wilkinson
ecd8760514
Upgrade to Hibernate Validator 6.0.10.Final
...
Closes gh-13393
2018-06-06 10:15:33 +01:00