Commit Graph

26227 Commits

Author SHA1 Message Date
Andy Wilkinson
30f0fd1fe4 Merge branch '1.5.x' into 2.0.x 2018-06-21 17:31:16 +01:00
Andy Wilkinson
24dec4807f Merge branch '2.0.x' 2018-06-21 12:47:46 +01:00
Andy Wilkinson
fd125b4a4a Remove assumption that a file URI can be turned into a File
Closes gh-13493
2018-06-21 12:47:23 +01:00
Stephane Nicoll
4c172eb6cd Merge branch '2.0.x' 2018-06-21 13:32:31 +02:00
Stephane Nicoll
f2cc6e2ef2 Fix link of RESTEasy repository
Closes gh-13538
2018-06-21 13:32:07 +02:00
Stephane Nicoll
c594768640 Remove wro4j starter reference
This starter does not look maintained anymore and there is an
alternative that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
Stephane Nicoll
8858c88a4c Remove GraphQL starter reference
This starter does not look maintained anymore and there is a fork of it
that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
Andy Wilkinson
a612ba1b11 Merge branch '2.0.x' 2018-06-21 12:18:40 +01:00
Andy Wilkinson
48c5e70ac8 Merge branch '1.5.x' into 2.0.x 2018-06-21 12:18:35 +01:00
Andy Wilkinson
eb6898314a Merge branch '2.0.x' 2018-06-21 11:41:15 +01:00
Andy Wilkinson
2624748911 Merge branch '1.5.x' into 2.0.x 2018-06-21 11:41:02 +01:00
Stephane Nicoll
56a7aa552f Polish 2018-06-21 10:40:33 +02:00
Johnny Lim
bb60edaca6 Polish
Closes gh-13534
2018-06-21 09:24:36 +02:00
Stephane Nicoll
d4d169277d Merge branch '2.0.x' 2018-06-21 09:23:43 +02:00
Johnny Lim
b9ea0fd5a7 Polish
See gh-13534
2018-06-21 09:20:50 +02:00
Stephane Nicoll
9e9e746554 Merge branch '1.5.x' into 2.0.x 2018-06-21 09:17:05 +02:00
Andy Wilkinson
3ea7c2e003 Merge branch '2.0.x' 2018-06-20 16:51:56 +01:00
Andy Wilkinson
4fc0a33094 Merge branch '1.5.x' into 2.0.x 2018-06-20 16:49:53 +01:00
Andy Wilkinson
c90f589906 Merge branch '2.0.x' 2018-06-20 13:57:05 +01:00
Andy Wilkinson
e2d6280d83 Merge branch '1.5.x' into 2.0.x 2018-06-20 13:56:55 +01:00
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