Commit Graph

17307 Commits (1d4ec56b080ebbccfeb08c4b94e00ee22c766f0c)
 

Author SHA1 Message Date
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
Stephane Nicoll defa171a32 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 6547fc6c6e Merge pull request #13507 from izeye:management-context-configuration
* pr/13507:
  Use @ManagementContextConfiguration consistently
7 years ago
Johnny Lim dd3bfdbe42 Use @ManagementContextConfiguration consistently 7 years ago
Stephane Nicoll b4584e6a28 Support profile expression in Logback's <springProfile>
Closes gh-13496
7 years ago
Stephane Nicoll a89b2ae46e Support profile expression in yml profile matching
Closes gh-12469
7 years ago
Stephane Nicoll 0c4176f596 Drop JsonSimpleJsonParser and JSON simple dependency
Closes gh-13471
7 years ago
Stephane Nicoll fa7da40640 Upgrade to JUnit 5.2.0
Closes gh-13118
7 years ago
Andy Wilkinson f3f573a774 Merge branch '2.0.x' 7 years ago
Andy Wilkinson b3927cfd10 Start building against Spring REST Docs 2.0.2 snapshots
See gh-13505
7 years ago
Stephane Nicoll 3b0c1354cb Upgrade to Maven Surefire/Failsafe Plugin 2.22.0
Closes gh-13500
7 years ago
Stephane Nicoll da49128e69 Merge pull request #13487 from izeye:caches-endpoint
* pr/13487:
  Polish CachesEndpoint
7 years ago
Johnny Lim 403f8927c3 Polish CachesEndpoint
Closes gh-13487
7 years ago
Stephane Nicoll 7ed06f3335 Merge pull request #13484 from izeye:hibernate-properties
* pr/13484:
  Polish HibernateProperties and its test
7 years ago
Johnny Lim ec845c93f2 Polish HibernateProperties and its test
Closes gh-13484
7 years ago
Stephane Nicoll 60b109cf0c Merge branch '2.0.x' 7 years ago
Stephane Nicoll 097ab91e43 Merge pull request #13473 from izeye:empty-list
* pr/13473:
  Reduce object creation in findMatchingItemMetadata()
7 years ago
Johnny Lim f34fb5f1ee Reduce object creation in findMatchingItemMetadata()
Closes gh-13473
7 years ago
Stephane Nicoll aca9e8c9f2 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 27bb4614a9 Next development version (v2.0.4.BUILD-SNAPSHOT) 7 years ago
Stephane Nicoll 748c1704ff Merge branch '2.0.x' 7 years ago
Stephane Nicoll ed7db0f7ac Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll af126b1bb3 Fixup version numbers following release 7 years ago
Spring Buildmaster 36b8639853 Next Development Version 7 years ago
Andy Wilkinson 760a67f819 Merge branch '2.0.x' 7 years ago
Andy Wilkinson b96f9d635f Upgrade to Elasticsearch 5.6.10
Closes gh-13479
7 years ago
Stephane Nicoll 5654fb049f Merge branch '2.0.x' 7 years ago
Stephane Nicoll 438f0b008a Upgrade to Spring Amqp 2.0.4
Closes gh-13477
7 years ago
Stephane Nicoll 2483ed3e4e Upgrade to Spring Kafka 2.1.7
Closes gh-13476
7 years ago
Stephane Nicoll f217aa40f0 Merge branch '2.0.x' 7 years ago
Stephane Nicoll d47d84ff7a Merge branch '1.5.x' into 2.0.x 7 years ago
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
7 years ago
Stephane Nicoll 6e5ae0c71d Polish "Exclude JUnit from json-simple"
Closes gh-13438
7 years ago
Vivien Tintillier e9aa6dd29f Exclude JUnit from json-simple
See gh-13438
7 years ago
Stephane Nicoll de6ce79d5f Upgrade to Spring Session Apple-SR3
Closes gh-13461
7 years ago
Stephane Nicoll 40ba15047b Upgrade to Spring Integration 5.0.6
Closes gh-13457
7 years ago
Stephane Nicoll 7f209b30bc Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 93804eeb24 Upgrade to Spring Integration 4.3.17
Closes gh-13458
7 years ago
Brian Clozel b983a1a0a1 Merge branch '2.0.x' 7 years ago
Brian Clozel 6e9fee35a7 Upgrade to Spring Data Kay SR8
Closes gh-13455
7 years ago
Stephane Nicoll 48fa68890c Merge branch '2.0.x' 7 years ago
Stephane Nicoll d9400206b4 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll f030073ce2 Upgrade to Spring Data Ingalls SR13
Closes gh-13456
7 years ago
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
7 years ago
Andy Wilkinson f8eefa80df Merge branch '2.0.x' 7 years ago
Andy Wilkinson 42c307b744 Upgrade to Solr 6.6.4
Closes gh-13468
7 years ago
Andy Wilkinson bbcbc2d113 Upgrade to Reactor Bom Bismuth-SR10
Closes gh-13467
7 years ago