root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
17,180 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

17180 Commits

Author SHA1 Message Date
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
Andy Wilkinson 6081db5c34 Make ZipHeaderInputStream read sub 5 byte entries correctly 
Closes gh-13525
 2018-06-19 19:48:14 +01:00
Stephane Nicoll 99f993bc82 Add tests for JndiConnectionFactoryAutoConfiguration 
Closes gh-13526
 2018-06-19 20:47:23 +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
Stephane Nicoll deea8ebc0d Merge pull request #13512 from izeye:config-file-application-listener-log-level-guard 
* pr/13512:
  Add log level guards in ConfigFileApplicationListener
 2018-06-19 11:11:04 +02:00
Johnny Lim 1e7ed2ffdb Add log level guards in ConfigFileApplicationListener 
Closes gh-13512
 2018-06-19 11:10:45 +02:00
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
 2018-06-19 10:56:51 +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
Stephane Nicoll 5ca1e117b0 Merge pull request #13517 from izeye:jackson-properties-final 
* pr/13517:
  Use final keywords for Map fields in JacksonProperties
 2018-06-19 09:13:52 +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
Stephane Nicoll 6547fc6c6e Merge pull request #13507 from izeye:management-context-configuration 
* pr/13507:
  Use @ManagementContextConfiguration consistently
 2018-06-18 13:41:23 +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
Stephane Nicoll da49128e69 Merge pull request #13487 from izeye:caches-endpoint 
* pr/13487:
  Polish CachesEndpoint
 2018-06-15 13:57:17 +02:00
Johnny Lim 403f8927c3 Polish CachesEndpoint 
Closes gh-13487
 2018-06-15 13:56:39 +02:00
Stephane Nicoll 7ed06f3335 Merge pull request #13484 from izeye:hibernate-properties 
* pr/13484:
  Polish HibernateProperties and its test
 2018-06-15 13:50:49 +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
Stephane Nicoll 097ab91e43 Merge pull request #13473 from izeye:empty-list 
* pr/13473:
  Reduce object creation in findMatchingItemMetadata()
 2018-06-15 13:37:42 +02:00
Johnny Lim f34fb5f1ee Reduce object creation in findMatchingItemMetadata() 
Closes gh-13473
 2018-06-15 13:36:55 +02:00
Stephane Nicoll aca9e8c9f2 Merge branch '2.0.x' 2018-06-14 14:55:07 +02:00
Stephane Nicoll 27bb4614a9 Next development version (v2.0.4.BUILD-SNAPSHOT) 2018-06-14 14:54:49 +02:00
Stephane Nicoll 748c1704ff Merge branch '2.0.x' 2018-06-14 12:35:25 +02:00
Stephane Nicoll ed7db0f7ac Merge branch '1.5.x' into 2.0.x 2018-06-14 12:35:11 +02:00
Stephane Nicoll af126b1bb3 Fixup version numbers following release 2018-06-14 12:34:39 +02:00
Spring Buildmaster 36b8639853 Next Development Version 2018-06-14 10:05:31 +00:00