Commit Graph

2457 Commits

Author SHA1 Message Date
Andy Wilkinson
7571f10ae3 Merge branch '2.0.x' 2018-06-20 11:41:54 +01:00
Andy Wilkinson
e730382718 Merge branch '1.5.x' into 2.0.x 2018-06-20 11:12:51 +01:00
Andy Wilkinson
20546024d3 Merge branch '2.0.x' 2018-06-20 10:11:44 +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
Stephane Nicoll
8b35d06cf6 Share RetryTemplate infrastructure for Rabbit listener and template
Closes gh-13529
2018-06-20 09:28:00 +02:00
Stephane Nicoll
65cc7c72f4 Harmonize JNDI lookups to enable resourceRef
This commit makes sure that JMS and Mail JNDI lookups behave the same
way as DataSource JNDI lookups by enabling the "resourceRef" flag.

This will make sure to add "java:comp/env" to the lookup if the JNDI
name doesn't already contain it. If that name does not exist, a second
attempt to the original name will be issued automatically.

Closes gh-12803
2018-06-19 21:51:18 +02:00
Andy Wilkinson
c12f8298e6 Merge branch '2.0.x' 2018-06-19 20:06:58 +01:00
Andy Wilkinson
814e90805e Merge branch '1.5.x' into 2.0.x 2018-06-19 20:06:44 +01:00
Stephane Nicoll
3fdb2b3c85 Merge branch '2.0.x' 2018-06-19 20:59:43 +02:00
Stephane Nicoll
864a6b3e91 Merge branch '1.5.x' into 2.0.x 2018-06-19 20:59:27 +02:00
Stephane Nicoll
9d3ba14686 Fix conditions for CachingConnectionFactory support
Closes gh-12161
2018-06-19 19:58:48 +02:00
Andy Wilkinson
12eafc84b0 Merge branch '2.0.x' 2018-06-19 15:45:16 +01: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
Brian Clozel
cc894ce4f2 Fix Micrometer tag providers after HttpStatus changes
Since SPR-16898, `HttpStatus.toString()` has changed and we should
instead rely on `HttpStatus.value()` to get the HTTP status number.
2018-06-19 16:05:40 +02:00
Stephane Nicoll
8365d53554 Add support for JMS session caching
This commit adds support for CachingConnectionFactory for both Artemis
and ActiveMQ. If connection pooling is not enabled explicitly, sessions,
producers and consumers are cached. The factory can be further
customized, including reverting to the raw ConnectionFactory, using the
`spring.jms.*` namespace.

Closes gh-12161
2018-06-19 15:17:00 +02:00
Stephane Nicoll
0ef54a79b1 Add support for connection pooling with Artemis
This commit expands ActiveMQ's connection pooling to artemis. The same
pooling features are now shared by the two brokers and a
PooledConnectionFactory can be auto-configured when the necessary jar is
present.

Closes gh-13523
2018-06-19 15:05:32 +02:00
Brian Clozel
28c1bc9986 Fix DefaultErrorViewResolver after HttpStatus changes
Since SPR-16898, `HttpStatus.toString()` has changed and we should
instead rely on `HttpStatus.value()` to get the HTTP status number.
2018-06-19 15:02:45 +02:00
Stephane Nicoll
6970f19ce3 Merge branch '2.0.x' 2018-06-19 14:12:25 +02: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
Stephane Nicoll
ae12d515ee Merge branch '2.0.x' 2018-06-19 11:11:18 +02:00
Johnny Lim
1e7ed2ffdb Add log level guards in ConfigFileApplicationListener
Closes gh-13512
2018-06-19 11:10:45 +02:00
Stephane Nicoll
f682c77691 Polish "Add reference to dozer-spring-boot-starter"
Closes gh-13501
2018-06-19 10:54:01 +02:00
Kazuki Shimizu
9308904af7 Add reference to dozer-spring-boot-starter
See gh-13501
2018-06-19 10:52:45 +02:00
Johnny Lim
fb834898ab Use final keywords for Map fields in JacksonProperties
Closes gh-13517
2018-06-19 09:13:33 +02:00
Madhura Bhave
3a01914b63 Merge branch '2.0.x' 2018-06-18 17:18:16 -07: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
165d993e5d Merge branch '2.0.x' 2018-06-18 17:54:39 +02:00
Stephane Nicoll
62c93a4b9a Add missing @ConditionalOnClass check on RedisCacheConfiguration
Closes gh-13508
2018-06-18 17:54:10 +02:00
Stephane Nicoll
defa171a32 Merge branch '2.0.x' 2018-06-18 13:41:36 +02:00
Johnny Lim
dd3bfdbe42 Use @ManagementContextConfiguration consistently 2018-06-18 13:28:30 +02:00
Stephane Nicoll
b4584e6a28 Support profile expression in Logback's <springProfile>
Closes gh-13496
2018-06-18 13:23:58 +02:00
Stephane Nicoll
a89b2ae46e Support profile expression in yml profile matching
Closes gh-12469
2018-06-18 13:05:52 +02:00
Stephane Nicoll
0c4176f596 Drop JsonSimpleJsonParser and JSON simple dependency
Closes gh-13471
2018-06-18 10:11:50 +02:00
Stephane Nicoll
fa7da40640 Upgrade to JUnit 5.2.0
Closes gh-13118
2018-06-18 09:19:13 +02:00
Andy Wilkinson
f3f573a774 Merge branch '2.0.x' 2018-06-18 08:18:41 +01: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
Stephane Nicoll
3b0c1354cb Upgrade to Maven Surefire/Failsafe Plugin 2.22.0
Closes gh-13500
2018-06-17 16:43:27 +02:00
Johnny Lim
403f8927c3 Polish CachesEndpoint
Closes gh-13487
2018-06-15 13:56:39 +02:00
Johnny Lim
ec845c93f2 Polish HibernateProperties and its test
Closes gh-13484
2018-06-15 13:44:35 +02:00
Stephane Nicoll
60b109cf0c Merge branch '2.0.x' 2018-06-15 13:38:29 +02: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
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
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