root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
10,684 Commits 28 Branches 365 Tags 289 MiB
Commit Graph

10684 Commits

Author SHA1 Message Date
Madhura Bhave 3fe0b844a6 Make HealthMvcEndpoint conditional on missing bean 2017-04-17 14:49:45 -07:00
Madhura Bhave 9e2d54feae Support json view with JacksonTester 
Closes gh-8672
 2017-04-17 11:14:26 -07:00
Stephane Nicoll e1f727719a Merge branch '1.4.x' into 1.5.x 2017-04-14 16:04:22 +02:00
Stephane Nicoll b7efec5401 Support case insensitive value for Cassandra's SchemaAction 
Closes gh-8903
 2017-04-14 16:04:04 +02:00
Stephane Nicoll 8c21e16cf1 Add reference to Infinispan starter 
Closes gh-8592
 2017-04-14 13:57:47 +02:00
Stephane Nicoll 9d0340a5ae Merge pull request #8889 from rajadilipkolli:patch-3 
* pr/8889:
  Upgrade to Apache Maven 3.5.0
 2017-04-14 09:29:00 +02:00
Raja Kolli 01da13cfe3 Upgrade to Apache Maven 3.5.0 
Closes gh-8889
 2017-04-14 09:28:16 +02:00
Stephane Nicoll b3c8511fb6 Merge branch '1.4.x' into 1.5.x 2017-04-13 10:24:07 +02:00
Stephane Nicoll 4fd9a8c468 Add missing spring.datasource.xa properties in the appendix 
Closes gh-8895
 2017-04-13 10:23:44 +02:00
Stephane Nicoll 584b61ecc1 Remove deprecated property 2017-04-12 16:16:19 +02:00
Stephane Nicoll 6567018b70 Merge branch '1.4.x' into 1.5.x 2017-04-12 14:36:48 +02:00
Stephane Nicoll 2579023035 Fix javadoc 
Closes gh-8892
 2017-04-12 14:36:02 +02:00
Stephane Nicoll f4ab574ea1 Merge branch '1.4.x' into 1.5.x 2017-04-12 11:46:43 +02:00
Stephane Nicoll 072160863a Add a note about transactional tests and `webEnvironment` 
Closes gh-8232
 2017-04-12 11:46:06 +02:00
Stephane Nicoll 68c90b24c2 Merge branch '1.4.x' into 1.5.x 2017-04-12 11:15:51 +02:00
Stephane Nicoll 40f4c89602 Document list merge restrictions with YAML 
Closes gh-6911
 2017-04-12 11:15:24 +02:00
Stephane Nicoll 715cf7da75 Do not enable cglib if spring.aop.proxy-target-class is configured 
This commit makes sure to honour the `spring.aop.proxy-target-class`
property if set by the user. Previously, the
`PersistenceExceptionTranslationPostProcessor` was always configured to
use cglib, regardless of the value of that property.

Closes gh-8887
 2017-04-12 10:55:43 +02:00
Stephane Nicoll 0affa3af3a Merge branch '1.4.x' into 1.5.x 2017-04-12 10:28:32 +02:00
Stephane Nicoll be3b5a9dc2 Only apply editorconfig for certain files 
Closes gh-8497
 2017-04-12 10:28:00 +02:00
Phillip Webb c97268981a Polish 2017-04-11 20:59:03 -07:00
Phillip Webb d301d0f4c3 Merge branch '1.4.x' into 1.5.x 2017-04-11 20:42:48 -07:00
Phillip Webb 758ddcd420 Polish 2017-04-11 20:17:23 -07:00
Madhura Bhave 535451f9e5 Merge branch '1.4.x' into 1.5.x 2017-04-11 15:54:01 -07:00
Madhura Bhave b2f0ebfcb8 Prevent empty json for parameters in trace endpoint 
Fixes gh-8883
 2017-04-11 15:30:39 -07:00
Stephane Nicoll eff35795cd Fix checkstyle violation 2017-04-11 15:29:52 +02:00
Stephane Nicoll a00b695748 Do not enable cglib if spring.aop.proxy-target-class is configured 
This commit makes sure to honour the `spring.aop.proxy-target-class`
property if set by the user. Previously, the
`MethodValidationPostProcessor` was always configured to use cglib,
regardless of the value of that property.

Closes gh-8869
 2017-04-11 15:28:21 +02:00
Stephane Nicoll b148b46751 Polish 2017-04-11 14:54:16 +02:00
Stephane Nicoll 7905874f9d Merge pull request #8650 from ColinHarrington:disable-actuator-trace-filter 
* pr/8650:
  Polish "Add the ability to disable the trace filter"
  Add the ability to disable the trace filter
 2017-04-11 14:47:04 +02:00
Stephane Nicoll 2ef318c00d Polish "Add the ability to disable the trace filter" 
Closes gh-8650
 2017-04-11 14:46:57 +02:00
Colin Harrington d3e2e22f8c Add the ability to disable the trace filter 
See gh-8650
 2017-04-11 14:46:57 +02:00
Stephane Nicoll fccab42711 Merge pull request #8813 from eddumelendez:gh-8798 
* pr/8813:
  Polish "Fix http status code with unknown log level"
  Fix http status code with unknown log level
 2017-04-11 14:46:26 +02:00
Stephane Nicoll 82ac8b5ca1 Polish "Fix http status code with unknown log level" 
Closes gh-8813
 2017-04-11 13:29:53 +02:00
Eddú Meléndez cf08162148 Fix http status code with unknown log level 
This commit changes the http status code to 400 when an unknown log level
is specified.

Closes gh-8798
See gh-8813
 2017-04-11 13:23:41 +02:00
Stephane Nicoll 934d33685a Polish 
See gh-8879
 2017-04-11 09:40:54 +02:00
Stephane Nicoll 3f883f1898 Merge branch '1.4.x' into 1.5.x 2017-04-11 09:38:11 +02:00
Stephane Nicoll 404bb2d171 Polish 
See gh-8879
 2017-04-11 09:37:22 +02:00
Stephane Nicoll a132bd141f Merge branch '1.4.x' into 1.5.x 2017-04-10 16:13:53 +02:00
Stephane Nicoll ac98d2ac27 Merge pull request #8185 from phillipuniverse:master 
* pr/8185:
  Polish "Clarify edge case docs on ConditionalOnClass"
  Clarify edge case docs on ConditionalOnClass
 2017-04-10 16:12:53 +02:00
Stephane Nicoll 0a55e3e736 Polish "Clarify edge case docs on ConditionalOnClass" 
Closes gh-8185
 2017-04-10 16:12:11 +02:00
Andy Wilkinson 035cbd91f4 Use main thread in OnClassCondition if thread create/start fails 
Previously, as a result of the changes made in de50cfa21e, an
application would fail to start on Google AppEngine as it prevents
the creation of new threads.

This commit updates OnClassCondition so that it falls back to
performing the work on the main thread when its unable to shift it
to a separate thread.

Closes gh-8584
 2017-04-10 15:09:21 +01:00
Phillip Verheyden 08f8219248 Clarify edge case docs on ConditionalOnClass 
When used as a meta-annotation the value() attribute of
@ConditionalOnClass will fail silently resulting in the @Conditional
nature of the annotation being ignored.

See gh-8185
 2017-04-10 15:58:17 +02:00
Stephane Nicoll 2d930fd653 Merge branch '1.4.x' into 1.5.x 2017-04-10 15:54:34 +02:00
Stephane Nicoll a8860ba7e9 Clarify use of `@TestConfiguration` 
As `@TestComponent` is an implementation detail at this point really, this
commit removes any reference to it from the doc.

Closes gh-8421
 2017-04-10 15:54:08 +02:00
Andy Wilkinson f6a7e17688 Merge branch '1.4.x' into 1.5.x 2017-04-10 13:45:41 +01:00
Andy Wilkinson 6564fb3d96 Consider all loader paths when checking template availability 
Closes gh-8842
 2017-04-10 13:37:32 +01:00
Stephane Nicoll b4a1feae91 Merge pull request #8683 from bwajtr:1.5.x 
* pr/8683:
  Polish "Add support for HotSwapAgent to devtools"
  Add support for HotSwapAgent to devtools
 2017-04-10 14:18:35 +02:00
Stephane Nicoll 16afb8a973 Polish "Add support for HotSwapAgent to devtools" 
Closes gh-8683
 2017-04-10 14:18:23 +02:00
Bretislav Wajtr b368693d80 Add support for HotSwapAgent to devtools 
HotSwapAgent is an open source competition to JRebel. This commit adds
"org.hotswap.agent.HotswapAgent" to the list of known Java agent based
class reloaders. This causes same behavior as when JRebel is used: a full
restart is NOT triggered when any class changes, however LiveReload event
is still triggered.

See gh-8683
 2017-04-10 14:18:23 +02:00
Stephane Nicoll d8d36255af Merge branch '1.4.x' into 1.5.x 2017-04-10 14:02:51 +02:00
Stephane Nicoll caf30e3d9c Merge pull request #8703 from luispollo:patch-1 
* pr/8703:
  Polish "Document HTTP response format of health endpoint"
  Document HTTP response format of health endpoint
 2017-04-10 14:02:33 +02:00