root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
19,671 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

19671 Commits

Author SHA1 Message Date
Erlend Haugsnes fc85c34dd8 Add validation query to DataSourceHealthIndicator details 
See gh-15055
 2018-12-03 14:33:52 +01:00
Stephane Nicoll bbad720e23 Polish contribution 
Closes gh-15086
 2018-12-03 14:23:16 +01:00
Razib Shahriar 9e571a2827 Fail fast if nested condition uses a phase inappropriate for its members 
See gh-15086
 2018-12-03 14:14:29 +01:00
Andy Wilkinson 0f474ec08f Merge branch '2.1.x' 2018-12-03 13:01:56 +00:00
Andy Wilkinson 07065532fe Replace accidental use of code shaded by Testcontainers 
See gh-15371
 2018-12-03 13:01:27 +00:00
Andy Wilkinson 910a0e57b8 Drop dependency management for DropWizard Metrics modules removed in v4 
Closes gh-15370
 2018-12-03 12:49:15 +00:00
Andy Wilkinson b05abe8ca0 Merge branch '2.1.x' 2018-12-03 12:16:18 +00:00
Andy Wilkinson 72ad0cc6be Merge branch '2.0.x' into 2.1.x 2018-12-03 12:15:36 +00:00
Andy Wilkinson 3fd0380359 Correct optional dependency declarations in spring-boot-test-support 
Closes gh-15371
 2018-12-03 12:14:18 +00:00
Stephane Nicoll cc69b08cbe Merge pull request #15145 from ayudovin 
* pr/15145:
  Polish "Add configurable property for JWK encryption algorithm"
  Add configurable property for JWK encryption algorithm
 2018-12-03 11:50:10 +01:00
Stephane Nicoll 0df13baa0f Polish "Add configurable property for JWK encryption algorithm" 
Closes gh-15145
 2018-12-03 11:49:18 +01:00
artsiom 460fdaf52f Add configurable property for JWK encryption algorithm 
See gh-15145
 2018-12-03 11:35:10 +01:00
Stephane Nicoll 5674a53d67 Merge pull request #15212 from cac03 
* pr/15212:
  Polish "Configure MessageSource if no "messageSource" bean defined"
  Configure MessageSource if no "messageSource" bean defined
 2018-12-03 11:32:23 +01:00
Stephane Nicoll ec678eaa3b Polish "Configure MessageSource if no "messageSource" bean defined" 
Closes gh-15212
 2018-12-03 11:28:26 +01:00
cac03 82d99da32a Configure MessageSource if no "messageSource" bean defined 
Enable MessageSourceAutoConfiguration OnMissingBeanCondition by name
rather than class since AbstractApplicationContext expects MessageSource
to be defined only with "messageSource" name.

See gh-15212
 2018-12-03 11:28:07 +01:00
Stephane Nicoll 2ac76b368d Merge pull request #15054 from ayudovin 
* pr/15054:
  Polish contribution
  Add configuration property for configuring Tomcat's processor cache
 2018-12-03 11:18:44 +01:00
Stephane Nicoll 1b40b0edf1 Polish contribution 
Closes gh-15054
 2018-12-03 11:16:54 +01:00
artsiom 3059f0e2e2 Add configuration property for configuring Tomcat's processor cache 
See gh-15054
 2018-12-03 11:13:19 +01:00
Stephane Nicoll 2f4751a648 Merge pull request #15297 from dreis2211 
* pr/15297:
  Remove unnecessary cast in LoggingSystemProperties
 2018-12-03 11:03:14 +01:00
dreis2211 b528eb8a7e Remove unnecessary cast in LoggingSystemProperties 
Closes gh-15297
 2018-12-03 11:01:30 +01:00
Stephane Nicoll 577d5c9730 Merge pull request #15215 from dreis2211 
* pr/15215:
  Avoid premature declaration of variables
 2018-12-03 11:00:14 +01:00
dreis2211 f57f16c190 Avoid premature declaration of variables 
Closes gh-15215
 2018-12-03 10:59:20 +01:00
Stephane Nicoll 6d2a91ed83 Merge pull request #15181 from dreis2211 
* pr/15181:
  Avoid instantiation of BeanPropertyBinder in Binder
 2018-12-03 10:54:48 +01:00
dreis2211 a1a8a8cef0 Avoid instantiation of BeanPropertyBinder in Binder 
Closes gh-15181
 2018-12-03 10:54:36 +01:00
Stephane Nicoll c65b21124a Merge pull request #15142 from ayudovin 
* pr/15142:
  Use varargs for DefaultApplicationArguments
 2018-12-03 10:52:59 +01:00
artsiom e2d5dfad3a Use varargs for DefaultApplicationArguments 
Closes gh-15142
 2018-12-03 10:48:10 +01:00
Stephane Nicoll 389ab9579f Merge pull request #15089 from TwinProduction 
* pr/15089:
  Polish "Rename logging.file to logging.file.name"
  Rename logging.file to logging.file.name
 2018-12-03 10:42:44 +01:00
Stephane Nicoll 7939b8b4da Polish "Rename logging.file to logging.file.name" 
Closes gh-15089
 2018-12-03 10:42:30 +01:00
TwinProduction 21da4a5d12 Rename logging.file to logging.file.name 
See gh-15089
 2018-12-03 10:42:30 +01:00
Stephane Nicoll 56ae9cfc7a Merge pull request #15136 from restolho 
* pr/15136:
  Change DataSourceHealthIndicator details from "hello" to "result"
 2018-12-03 09:35:46 +01:00
Andre Restolho d9586d94f6 Change DataSourceHealthIndicator details from "hello" to "result" 
Closes gh-15136
 2018-12-03 09:34:17 +01:00
Andy Wilkinson 84ace92a27 Merge branch '2.1.x' 2018-11-30 18:12:55 +00:00
Andy Wilkinson a3c7401c5a Merge branch '2.0.x' into 2.1.x 2018-11-30 18:12:27 +00:00
Andy Wilkinson 4b6f6512ea Ensure that the java binary is extracted to the correct location 
Closes gh-15357
 2018-11-30 18:02:20 +00:00
Andy Wilkinson 2033cf327f Merge branch '2.1.x' 2018-11-30 13:30:23 +00:00
Andy Wilkinson 4a351f6c58 Update pipeline name in CI README 2018-11-30 13:29:22 +00:00
Stephane Nicoll 0d4fe4417d Switch master to 2.2.0.BUILD-SNAPSHOT 2018-11-30 12:52:56 +01:00
Stephane Nicoll bfb2f246ca Merge branch '2.1.x' 2018-11-30 12:51:45 +01:00
Stephane Nicoll 2ba5f4a63e Setup CI 2018-11-30 12:50:59 +01:00
Spring Buildmaster 8e1c9b1d4e Next development version (v2.1.2.BUILD-SNAPSHOT) 2018-11-30 09:26:01 +00:00
Phillip Webb 9c426c63bf Polish 2018-11-29 22:57:04 -08:00
Phillip Webb ed9468a31a Update copyright year for changed files 2018-11-29 22:02:45 -08:00
Phillip Webb 81896e0222 Upgrade to Micrometer 1.1.1 
Closes gh-15328
 2018-11-29 21:29:25 -08:00
Phillip Webb 30898ca9be Merge branch '2.0.x' 2018-11-29 21:20:24 -08:00
Phillip Webb 7cc1e0e4d6 Fix release notes generation script 
Script was accidentally trying to import `common.sh`.

Closes gh-15349
 2018-11-29 21:19:49 -08:00
Phillip Webb d7b84a1cbf Merge branch '2.0.x' 2018-11-29 21:00:31 -08:00
Spring Buildmaster cd4492d91a Next development version (v2.0.8.BUILD-SNAPSHOT) 2018-11-30 03:12:11 +00:00
Phillip Webb 8564a4f0ec Merge branch '2.0.x' 2018-11-29 15:35:47 -08:00
Phillip Webb 73d87ac112 Upgrade to Micrometer 1.0.8 
Closes gh-15327
 2018-11-29 15:33:19 -08:00
Phillip Webb ba1ef52e39 Merge branch '2.0.x' 2018-11-29 15:32:48 -08:00