Commit Graph

27490 Commits

Author SHA1 Message Date
Jay Bryant
a60c575836 Cleanup asciidoctor build
Remove Guardfile for now; we might reintroduce it later, but it is
currently out of sync with the documentation changes.

Do not ignore html files in the asciidoc directory as those are needed
for docinfo parts.

See gh-12611
2018-12-05 10:32:36 +01:00
Jay Bryant
11f6a5ab70 Remove docbook toolchain
See gh-12611
2018-12-05 10:32:36 +01:00
Stephane Nicoll
096640de84 Merge branch '2.1.x' 2018-12-05 08:57:14 +01:00
Stephane Nicoll
185a49fb3b Add reference to JaVers starter 2018-12-05 08:56:50 +01:00
Stephane Nicoll
95b94c0158 Merge branch '2.1.x' 2018-12-04 10:53:41 +01:00
Stephane Nicoll
c56c0ff433 Rename OAuth2ResourceServerJwkConfiguration
Closes gh-15375
2018-12-04 10:53:01 +01:00
Andy Wilkinson
5c986b5030 Merge branch '2.1.x' 2018-12-03 16:29:36 +00:00
Andy Wilkinson
42b58f6d27 Add JAXB API dependency that is no longer transitive via testcontainers
See gh-15371
2018-12-03 16:29:10 +00:00
Andy Wilkinson
8b21044902 Merge branch '2.1.x' 2018-12-03 15:07:54 +00:00
Andy Wilkinson
917108cce7 Merge branch '2.0.x' into 2.1.x 2018-12-03 15:07:30 +00:00
Andy Wilkinson
425a3aacf5 Add JAXB API dependency that is no longer transitive via testcontainers
See gh-15371
2018-12-03 15:06:32 +00:00
Stephane Nicoll
a85e27c7cd Further replace magic number by HttpStatus
See gh-15130
2018-12-03 15:48:13 +01:00
Stephane Nicoll
9ee6303876 Merge pull request #15130 from holy12345
* pr/15130:
  Polish "Replace magic number by HttpStatus"
  Replace magic number by HttpStatus
2018-12-03 15:47:27 +01:00
Stephane Nicoll
f2ca2533d5 Polish "Replace magic number by HttpStatus"
Closes gh-15130
2018-12-03 15:33:57 +01:00
holy12345
ffdc9f0ff3 Replace magic number by HttpStatus
See gh-15130
2018-12-03 15:33:35 +01:00
Stephane Nicoll
9483c91d58 Make sure to include validation query in case of failure
See gh-15055
2018-12-03 15:27:52 +01:00
Stephane Nicoll
745ff883ac Merge pull request #15055 from Aerlant
* pr/15055:
  Polish "Add validation query to DataSourceHealthIndicator details"
  Add validation query to DataSourceHealthIndicator details
2018-12-03 15:11:40 +01:00
Stephane Nicoll
9e84abc46b Polish "Add validation query to DataSourceHealthIndicator details"
Closes gh-15055
2018-12-03 15:10:59 +01:00
Erlend Haugsnes
fc85c34dd8 Add validation query to DataSourceHealthIndicator details
See gh-15055
2018-12-03 14:33:52 +01:00
Stephane Nicoll
9686ae4f60 Merge pull request #15086 from onraz
* pr/15086:
  Polish contribution
  Fail fast if nested condition uses a phase inappropriate for its members
2018-12-03 14:24:00 +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