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

21208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andy Wilkinson
760a67f819 Merge branch '2.0.x' 2018-06-14 09:41:19 +01: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
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
b983a1a0a1 Merge branch '2.0.x' 2018-06-13 23:08:27 +02:00
Brian Clozel
6e9fee35a7 Upgrade to Spring Data Kay SR8 
Closes gh-13455
 2018-06-13 23:05:47 +02:00
Stephane Nicoll
48fa68890c Merge branch '2.0.x' 2018-06-13 20:05:30 +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
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