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
16,789 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

16789 Commits

Author SHA1 Message Date
Andy Wilkinson 92f62043d4 Fix placeholder support in <springProfile>'s name attribute 
Closes gh-13450
 2018-06-20 10:48:55 +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 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
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
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
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
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
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 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 27bb4614a9 Next development version (v2.0.4.BUILD-SNAPSHOT) 2018-06-14 14:54:49 +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
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 dc4691fd7f Merge pull request #13438 from vtintillier:remove-junit-dependency 
* pr/13438:
  Polish "Exclude JUnit from json-simple"
  Exclude JUnit from json-simple
 2018-06-14 08:35:50 +02:00
Stephane Nicoll 6e5ae0c71d Polish "Exclude JUnit from json-simple" 
Closes gh-13438
 2018-06-14 08:33:28 +02:00
Vivien Tintillier e9aa6dd29f Exclude JUnit from json-simple 
See gh-13438
 2018-06-14 08:32:28 +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
Stephane Nicoll 7f209b30bc Merge branch '1.5.x' into 2.0.x 2018-06-14 08:26:58 +02:00
Stephane Nicoll 93804eeb24 Upgrade to Spring Integration 4.3.17 
Closes gh-13458
 2018-06-14 08:26:15 +02:00
Brian Clozel 6e9fee35a7 Upgrade to Spring Data Kay SR8 
Closes gh-13455
 2018-06-13 23:05:47 +02:00
Stephane Nicoll d9400206b4 Merge branch '1.5.x' into 2.0.x 2018-06-13 20:05:16 +02:00
Stephane Nicoll f030073ce2 Upgrade to Spring Data Ingalls SR13 
Closes gh-13456
 2018-06-13 20:00:21 +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 9c1da51f73 Upgrade to Jetty 9.4.11.v20180605 
Closes gh-13464
 2018-06-13 10:51:16 +01:00
Andy Wilkinson 634101a333 Upgrade to Jackson 2.8.11.20180608 
Closes gh-13463
 2018-06-13 10:51:16 +01:00
Andy Wilkinson a79c8918ff Upgrade to Spring Security 5.0.6.RELEASE 
Closes gh-13459
 2018-06-13 09:36:47 +01:00
Andy Wilkinson 9418e0d6dc Merge branch '1.5.x' into 2.0.x 2018-06-13 09:35:57 +01:00
Andy Wilkinson b8247f363d Upgrade to Spring Security 4.2.7.RELEASE 
Closes gh-13196
 2018-06-13 09:35:11 +01:00
Stephane Nicoll ec02b56194 Merge pull request #13453 from izeye:spring-boot-test-properties 
* pr/13453:
  Use @SpringBootTest.properties in tests and samples
 2018-06-13 09:28:00 +02:00
Johnny Lim 870d7fe16a Use @SpringBootTest.properties in tests and samples 
Closes gh-13453
 2018-06-13 09:24:28 +02:00
Stephane Nicoll 01da6ea30a Merge pull request #13454 from jkschneider:micrometer-1.0.5 
* pr/13454:
  Upgrade to Micrometer 1.0.5
 2018-06-13 09:07:19 +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