Commit Graph

16945 Commits (283ceaa0714c5936622746ce1f3f5987b69e3291)
 

Author SHA1 Message Date
Stephane Nicoll 283ceaa071 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 6be208ed04 Merge pull request #13345 from dreis2211:remove-deprecated-matcher
* pr/13345:
  Remove usage of deprecated Matchers class
7 years ago
dreis2211 8bb7b8af51 Remove usage of deprecated Matchers class
Closes gh-13345
7 years ago
Stephane Nicoll d924c89525 Merge branch '2.0.x' 7 years ago
Stephane Nicoll d5ccd43feb Merge pull request #13343 from dreis2211:property-source-stream-polish
* pr/13343:
  Polish stream creation in some PropertySources
7 years ago
dreis2211 29605bacd2 Polish stream creation in some PropertySources
Closes gh-13343
7 years ago
Madhura Bhave 37a7457f36 Polish 7 years ago
Madhura Bhave 458d574d1f Merge branch '2.0.x' 7 years ago
Madhura Bhave 95174a0773 Don't fail if aggregate merge can't get existing value
Fixes gh-13303
7 years ago
Madhura Bhave 8ce13c765b Support binding to immutable maps
Closes gh-13323
7 years ago
Andy Wilkinson 78b1a37d7d Merge branch '2.0.x' 7 years ago
Andy Wilkinson 68cd27c47b Do not require DataSourcePoolMetrics to auto-configure Hikari meters
Closes gh-13330
7 years ago
Andy Wilkinson e306aad28c Merge branch '2.0.x' 7 years ago
Andy Wilkinson 27267a7090 Ensure that condition evaluator uses runner’s class loader
Closes gh-13319
7 years ago
Stephane Nicoll 68c10ea0cd Merge pull request #13322 from vpavic:upgrade-hazelcast
* pr/13322:
  Upgrade to Hazelcast 3.10.1
7 years ago
Vedran Pavic 205b1c1327 Upgrade to Hazelcast 3.10.1
Closes gh-13322
7 years ago
Stephane Nicoll d350345721 Merge pull request #13324 from izeye:metrics-properties-final
* pr/13324:
  Make MetricsProperties fields final if possible
7 years ago
Johnny Lim 5d5a14e4f7 Make MetricsProperties fields final if possible
Closes gh-13324
7 years ago
Stephane Nicoll 77dcbdb1e5 Polish
See gh-13320
7 years ago
Stephane Nicoll bc47bf44a9 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 152ce145fd Merge pull request #13320 from izeye:polish-20180601
* pr/13320:
  Polish
7 years ago
Johnny Lim 6b0ce46491 Polish
Closes gh-13320
7 years ago
Stephane Nicoll 81ef6fec7b Add reference to Gitter 7 years ago
Madhura Bhave 817c228906 Merge branch '2.0.x' 7 years ago
Madhura Bhave 0afd947350 BindFailureAnalyzer should show original failure message
Fixes gh-13122
7 years ago
Stephane Nicoll 58d634f498 Merge branch '2.0.x' 7 years ago
Stephane Nicoll fa21333e4d Upgrade to Spring Cloud Connectors 2.0.2.RELEASE
Closes gh-13318
7 years ago
Stephane Nicoll 5790a26bcb Merge branch '2.0.x' 7 years ago
Stephane Nicoll 20e349c332 Polish 7 years ago
Stephane Nicoll fec75c42fa Move unused property in code to metadata 7 years ago
Stephane Nicoll 74379da726 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 32aa5b9bae Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll f745f20c8c Clarify scope of JNDI-based MailSenderAutoConfiguration
This commit separates the auto-configuration of JavaMailSender in two
distinct configuration: one based on existing Session available on JNDI
and the other one based on properties configuration.

This clarifies the auto-configuration report and the fact that the JNDI
variant overrides any Session-related properties that would have been
set in the environment

Closes gh-13026
7 years ago
Andy Wilkinson cff5c1ec72 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 0d7d95d8a9 Align RestTemplateBuilder with Framework's removal of OkHttp 2 support
Closes gh-13314
7 years ago
Stephane Nicoll 55d70d5691 Merge branch '2.0.x' 7 years ago
Stephane Nicoll f56cd789ac Merge pull request #13308 from jmcshane:patch-1
* pr/13308:
  Remove outdated reference to @EnableReactor
7 years ago
James McShane d74c768cdd Remove outdated reference to @EnableReactor
Closes gh-13308
7 years ago
Phillip Webb 92b9b234f1 Merge branch '2.0.x' 7 years ago
Phillip Webb 3751968ecd Add missing ExpectedException rule
Add ExpectedException rule which was missed from the 1.5.x merge.
7 years ago
Phillip Webb 840948c6c9 Polish 7 years ago
Phillip Webb 3fb79194a0 Merge branch '2.0.x' 7 years ago
Phillip Webb f8ec2e6176 Polish 7 years ago
Phillip Webb cf27917e86 Merge branch '2.0.x' 7 years ago
Phillip Webb bdd541b2cc Merge branch '1.5.x' into 2.0.x 7 years ago
Phillip Webb bb0550ab95 Polish 7 years ago
Phillip Webb 5ae061f491 Merge branch '1.5.x' into 2.0.x 7 years ago
Phillip Webb 55d0611bc3 Guard against JarURLConnection with wrong JAR
Update `JarURLConnection.get()` to guard against the wrong nested JAR
being used as context.

Closes gh-11367
7 years ago
Madhura Bhave 9ec9a74a58 Merge branch '2.0.x' 7 years ago
Madhura Bhave 1758d8c106 Remove email resource from pipeline
Closes gh-13307
7 years ago