2102 Commits

Author SHA1 Message Date
Stephane Nicoll
9e9e746554 Merge branch '1.5.x' into 2.0.x 2018-06-21 09:17:05 +02:00
Andy Wilkinson
4fc0a33094 Merge branch '1.5.x' into 2.0.x 2018-06-20 16:49:53 +01:00
Andy Wilkinson
e2d6280d83 Merge branch '1.5.x' into 2.0.x 2018-06-20 13:56:55 +01:00
Andy Wilkinson
e730382718 Merge branch '1.5.x' into 2.0.x 2018-06-20 11:12:51 +01:00
Andy Wilkinson
e1774672af Prefer servlet to reactive when Jersey and WebFlux are both available
Closes gh-13521
2018-06-20 10:10:35 +01:00
Andy Wilkinson
814e90805e Merge branch '1.5.x' into 2.0.x 2018-06-19 20:06:44 +01:00
Stephane Nicoll
864a6b3e91 Merge branch '1.5.x' into 2.0.x 2018-06-19 20:59:27 +02:00
Andy Wilkinson
497902de4e Only bridge JUL into SLF4J when JUL has not be customized
Previously, Slf4jLoggingSystem would install SLF4JBridgeHandler into
JUL but would only remove a single root handler that was a
ConsoleHandler. If there were was than one root handler or the single
root handler was of a different type, they would not be uninstalled.
When deploying an application to Tomcat, this led to duplicate log
messages appearing in Tomcat’s console output and to logging from
other application or Tomcat itself being routed into an
application-specific log file enabled using the logging.file
configuration property.

A secondary, related problem was that LogbackLoggingSystem installs a
LevelChangePropagator so that Logback’s log level configuration is
propagated into JUL. This meant that an individual Boot app with
custom log level configuration could change the log levels of Tomcat
itself and of any other applications that had been deployed to Tomcat
and use JUL.

This commit updates both Slf4jLoggingSystem and LogbackLoggingSystem
so that they only change JUL’s configuration if it hasn’t already been
customized. The configuration is deemed to have not been customised if
there’s a single root handler and its a console handler.

Closes gh-13470
2018-06-19 15:29:46 +01:00
Stephane Nicoll
7ae82b070b Stop calling Charset.availableCharsets() early
This is no longer required as Spring Framework has been updated to
invoke this method lazily as well.

Closes gh-13423
2018-06-19 14:12:00 +02:00
Johnny Lim
1e7ed2ffdb Add log level guards in ConfigFileApplicationListener
Closes gh-13512
2018-06-19 11:10:45 +02:00
Madhura Bhave
87680b4ee5 Fix profile precedence when active and include provided
Before 2.0.2, if profiles were activated via the environment using the
active and include profile property, profiles specified via the active
property would take precedence. This commit restores that behavior.

Fixes gh-13513
2018-06-18 16:24:49 -07:00
Stephane Nicoll
62c93a4b9a Add missing @ConditionalOnClass check on RedisCacheConfiguration
Closes gh-13508
2018-06-18 17:54:10 +02:00
Johnny Lim
dd3bfdbe42 Use @ManagementContextConfiguration consistently 2018-06-18 13:28:30 +02:00
Andy Wilkinson
b3927cfd10 Start building against Spring REST Docs 2.0.2 snapshots
See gh-13505
2018-06-18 08:18:15 +01:00
Johnny Lim
f34fb5f1ee Reduce object creation in findMatchingItemMetadata()
Closes gh-13473
2018-06-15 13:36:55 +02:00
Andy Wilkinson
b96f9d635f Upgrade to Elasticsearch 5.6.10
Closes gh-13479
2018-06-14 09:40:08 +01: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
d47d84ff7a Merge branch '1.5.x' into 2.0.x 2018-06-14 08:36:18 +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
Brian Clozel
6e9fee35a7 Upgrade to Spring Data Kay SR8
Closes gh-13455
2018-06-13 23:05:47 +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
a79c8918ff Upgrade to Spring Security 5.0.6.RELEASE
Closes gh-13459
2018-06-13 09:36:47 +01:00
Johnny Lim
870d7fe16a Use @SpringBootTest.properties in tests and samples
Closes gh-13453
2018-06-13 09:24:28 +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
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
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
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
Andy Wilkinson
50f3f50ebb Upgrade to Activemq 5.15.4
Closes gh-13392
2018-06-06 10:15:33 +01:00
Andy Wilkinson
2b4d51e763 Upgrade to Rxjava2 2.1.14
Closes gh-13391
2018-06-06 10:15:33 +01:00
Andy Wilkinson
d79f2401be Upgrade to Netty 4.1.25.Final
Closes gh-13390
2018-06-06 10:15:33 +01:00