Commit Graph

17253 Commits (cde3c219262a566120c63b0466484b6ee6543d24)
 

Author SHA1 Message Date
Stephane Nicoll 7683d346e3 Merge pull request #13534 from izeye:polish-20180621
* pr/13534:
  Polish
7 years ago
Johnny Lim b9ea0fd5a7 Polish
See gh-13534
7 years ago
Stephane Nicoll 9e9e746554 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 36605b3b49 Polish
See gh-13534
7 years ago
Andy Wilkinson b18da6a11c Merge branch '2.0.x' 7 years ago
Andy Wilkinson 9b4680c3fd Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 9f7106c778 Polish 7 years ago
Andy Wilkinson 52716b2dbe Merge branch '2.0.x' 7 years ago
Andy Wilkinson e6222ce6d3 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 6cc0968b8d Polish 7 years ago
Andy Wilkinson 3ea7c2e003 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 4fc0a33094 Merge branch '1.5.x' into 2.0.x 7 years ago
Phillip Webb 2bb7a430cf Clean up access logging threads when Undertow is stopped
Closes gh-12742
7 years ago
Andy Wilkinson c90f589906 Merge branch '2.0.x' 7 years ago
Andy Wilkinson e2d6280d83 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson e7b03f7ca3 Don't auto-configure MultipartConfigElement when using Commons FileUpload
Previously, when a user had declared a custom MultipartResolver bean
that is a CommonsMultipartResolver, part resolution would fail. The
failure was occurring as the servlet container was consuming the parts
before CommonsMultipartResolver had a chance to read them. This was
happening because a MultipartConfigElement was being auto-configured.

This commit updates the multipart auto-configuration so that a
MultipartConfigElement is not auto-configured when there is a
CommonsMultipartResolver bean in the context.

Closes gh-7735
7 years ago
Andy Wilkinson 7571f10ae3 Merge branch '2.0.x' 7 years ago
Andy Wilkinson e730382718 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 92f62043d4 Fix placeholder support in <springProfile>'s name attribute
Closes gh-13450
7 years ago
Andy Wilkinson 20546024d3 Merge branch '2.0.x' 7 years ago
Andy Wilkinson e1774672af Prefer servlet to reactive when Jersey and WebFlux are both available
Closes gh-13521
7 years ago
Stephane Nicoll 8b35d06cf6 Share RetryTemplate infrastructure for Rabbit listener and template
Closes gh-13529
7 years ago
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
7 years ago
Andy Wilkinson c12f8298e6 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 814e90805e Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 3fdb2b3c85 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 864a6b3e91 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 6081db5c34 Make ZipHeaderInputStream read sub 5 byte entries correctly
Closes gh-13525
7 years ago
Stephane Nicoll 99f993bc82 Add tests for JndiConnectionFactoryAutoConfiguration
Closes gh-13526
7 years ago
Stephane Nicoll 9d3ba14686 Fix conditions for CachingConnectionFactory support
Closes gh-12161
7 years ago
Andy Wilkinson 12eafc84b0 Merge branch '2.0.x' 7 years ago
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
7 years ago
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.
7 years ago
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
7 years ago
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
7 years ago
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.
7 years ago
Stephane Nicoll 6970f19ce3 Merge branch '2.0.x' 7 years ago
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
7 years ago
Stephane Nicoll ae12d515ee Merge branch '2.0.x' 7 years ago
Stephane Nicoll deea8ebc0d Merge pull request #13512 from izeye:config-file-application-listener-log-level-guard
* pr/13512:
  Add log level guards in ConfigFileApplicationListener
7 years ago
Johnny Lim 1e7ed2ffdb Add log level guards in ConfigFileApplicationListener
Closes gh-13512
7 years ago
Stephane Nicoll 65b0daffbe Merge pull request #13501 from kazuki43zoo:dozer
* pr/13501:
  Polish "Add reference to dozer-spring-boot-starter"
  Add reference to dozer-spring-boot-starter
7 years ago
Stephane Nicoll f682c77691 Polish "Add reference to dozer-spring-boot-starter"
Closes gh-13501
7 years ago
Kazuki Shimizu 9308904af7 Add reference to dozer-spring-boot-starter
See gh-13501
7 years ago
Stephane Nicoll 5ca1e117b0 Merge pull request #13517 from izeye:jackson-properties-final
* pr/13517:
  Use final keywords for Map fields in JacksonProperties
7 years ago
Johnny Lim fb834898ab Use final keywords for Map fields in JacksonProperties
Closes gh-13517
7 years ago
Madhura Bhave 3a01914b63 Merge branch '2.0.x' 7 years ago
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
7 years ago
Stephane Nicoll 165d993e5d Merge branch '2.0.x' 7 years ago
Stephane Nicoll 62c93a4b9a Add missing `@ConditionalOnClass` check on RedisCacheConfiguration
Closes gh-13508
7 years ago