Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,208 Commits 23 Branches 0 Tags
5f1bbf8c72da1702081da57226304ccb9008a642
Commit Graph

5332 Commits

Author SHA1 Message Date
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
Brian Clozel
cb6c8f76e2 Configure X-Forwarded-* support with Reactor Netty 
This commit configures the new X-Forwarded-* / Forwarded HTTP headers
support with Reactor Netty in its 0.8.0 version.

Closes gh-10900
 2018-06-13 14:55:33 +02:00
Andy Wilkinson
f8eefa80df Merge branch '2.0.x' 2018-06-13 10:55:24 +01: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
a79c8918ff Upgrade to Spring Security 5.0.6.RELEASE 
Closes gh-13459
 2018-06-13 09:36:47 +01:00
Stephane Nicoll
c738b73c6f Merge branch '2.0.x' 2018-06-13 09:29:36 +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
f8eedb04cc Merge branch '2.0.x' 2018-06-13 09:08:57 +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
Johnny Lim
de3c3cd755 Add CLIENT_NAME_NONE to WebClientExchangeTags 2018-06-12 09:20:46 +02:00
Johnny Lim
c908445bff Use a precompiled pattern in WebClientExchangeTags.extractPath() 2018-06-12 14:56:02 +09:00
Andy Wilkinson
5bd9a445ae Merge branch '2.0.x' 2018-06-08 18:09:00 +01:00
Andy Wilkinson
6f2171c282 Improve error message when BootJar or BootWar has no known main class 
Closes gh-12712
 2018-06-08 18:07:24 +01:00
Andy Wilkinson
db7789ad87 Merge branch '2.0.x' 2018-06-08 15:47:55 +01:00
Andy Wilkinson
7b3be82cfa Merge branch '1.5.x' into 2.0.x 2018-06-08 15:47:50 +01:00
Madhura Bhave
87506248b0 Merge branch '2.0.x' 2018-06-07 12:53:37 -07:00
Madhura Bhave
4194baad91 Don't log p/w when AuthenticationManagerBuilder configured 
Fixes gh-12872
 2018-06-07 12:52:15 -07:00
Madhura Bhave
f7ff8dd165 Make generated password output consistent 2018-06-07 12:39:46 -07:00
Madhura Bhave
ed734d7e43 Trace filter ignores invalid requests 
Fixes gh-12987
 2018-06-07 09:27:49 -07:00
Brian Clozel
751a2b438e Upgrade duplicate finder maven plugin to 1.3.0 
Closes gh-13411
 2018-06-07 15:24:32 +02:00
Brian Clozel
59746de63b Backport web server configuration doc changes 
Closes gh-13401
 2018-06-07 14:38:19 +02:00