Commit Graph

5742 Commits

Author SHA1 Message Date
Dave Syer
dc8ba2c535 Load configuration from default profiles if no others active
Before this change if no profile is active yaml documents with
spring.profiles=default were loaded, but they are also loaded
if there *is* an active profile which is more of a problem. In
addition if the user chanes the default profile in the
Environmemt Spring Boot ignore that value ("default" is a magic
String).

After this change:

* If no profile is explicitly active, the default profiles from
the Environment are used explicitly
* The default profiles cause properties to be loaded just like
other profiles, so from YAML documents with spring.profiles and
from files in application-default.properties for instance
* The default profiles are not active when any other profile is
* Properties defined in "top-level" YAML documents with no
specific spring.profiles still act as defaults for *all* profiles

Fixes gh-1219, fixes gh-2623
2015-07-03 15:11:55 +01:00
Stephane Nicoll
dfbabefcd2 Merge pull request #3411 from izeye/typo
* pr/3411:
  Fix typo
2015-07-03 02:20:57 -07:00
izeye
b4f636b33f Fix typo
Closes gh-3411
2015-07-03 02:19:47 -07:00
Stephane Nicoll
6aefd20c55 Merge pull request #3401 from sbrannen/3400
* pr/3401:
  Use @AliasFor in @SpringApplicationConfiguration
2015-07-02 18:09:43 -07:00
Sam Brannen
9cea8925a8 Use @AliasFor in @SpringApplicationConfiguration
Spring Framework 4.2 introduces first-class support for explicit
annotation attribute overrides via a new @AliasFor annotation.

In order to avoid potential naming conflicts in the future and to make
the current, implicit attribute overrides explicit (as well as
documented), this commit retrofits @SpringApplicationConfiguration with
@AliasFor.

Closes gh-3400
Closes gh-3401
2015-07-02 18:05:26 -07:00
Stephane Nicoll
1b1ce6b79f Merge pull request #3403 from izeye/docs-20150702
* pr/3403:
  Fix typo
2015-07-02 07:03:32 -07:00
izeye
631a02b8bc Fix typo
Closes gh-3403
2015-07-02 07:02:54 -07:00
Dave Syer
74e9e0749b Add support for Spring HATEOAS hypermedia in Actuator endpoints
If spring-hateoas is on the classpath and an MvcEndpoint returns a
@ResponseBody it will be extended and wrapped into a Resource with links.
All the existing endpoints that return sensible JSON data can be extended
this way (i.e. not /logfile). The HAL browser will also be added as an
endpoint if available on the classpath. Finally, asciidocs for the
Actuator endpoints are available as a separate jar file, which if
included in an app will also generate a new (HTTP) endpoint.

Fixes gh-1390
2015-07-02 13:26:02 +01:00
Dave Syer
82fdb87a8c Merge branch '1.2.x' 2015-07-02 13:19:34 +01:00
Dave Syer
1abd0879ca Add and fix tests for overridden bindings
The order of property values is only preserved if we check carefully
that each property is actually present in the source being inspected.

Fixes gh-3385
2015-07-02 13:16:13 +01:00
Phillip Webb
c25586b760 Merge branch '1.2.x' 2015-07-01 23:28:23 -07:00
Phillip Webb
43dc0c64c2 Fixup version numbers following release 2015-07-01 23:22:34 -07:00
Spring Buildmaster
7ce391db4f Next development version 2015-07-01 22:48:01 -07:00
Phillip Webb
ef1838c7f0 Merge branch '1.2.x' 2015-07-01 21:43:26 -07:00
Phillip Webb
48009bfebe Allow relaxed property name overrides
Update RelaxedDataBinder to so that property ordering is respected even
if relaxed names are used. Prior to this commit a System property named
`FOO_BAR` would never get bound to a `fooBar` field if `foo-bar` was
defined in application.properties.

Fixes gh-3385
2015-07-01 21:38:34 -07:00
Phillip Webb
b1f8a692a8 Merge branch '1.2.x' 2015-07-01 19:30:12 -07:00
Phillip Webb
04dfac1c6c Formatting 2015-07-01 19:29:25 -07:00
Phillip Webb
3ef667f0d8 Fix MetricWriterMessageHandler to deal with reset
Update MetricWriterMessageHandler to deal with 'reset' messages and to
log unsupported payload types.

Fixes gh-3378
2015-07-01 18:11:53 -07:00
sopov.ivan
fa7199ddac Fix Eclipse 4.5 formatter settings
Fixes gh-3384
2015-07-01 18:09:56 -07:00
Phillip Webb
a1b87766a7 Fix PropertiesLauncher javadoc
See gh-3392
2015-07-01 18:09:56 -07:00
Phillip Webb
d61c38167e Formatting 2015-07-01 16:18:26 -07:00
Stephane Nicoll
533d36a468 Merge branch '1.2.x' 2015-07-01 13:00:07 -07:00
Stephane Nicoll
441049cf4e Auto-detect JMS sessionTransacted flag
If a JtaTransactionManager is present, it is associated with the
auto-created JmsListenerContainerFactory. However, if no such transaction
manager is present, local transaction support is not enabled.

This gives a default situation where the message is acknowledged even
before the listener is invoked. We now make sure to turn on local JMS
transactions if no JtaTransactionManager is present.

Fixes gh-3393
2015-07-01 12:59:11 -07:00
Andy Wilkinson
0db7bd37c2 Add dependency management for json-path-assert
Closes gh-3361
2015-07-01 17:35:21 +01:00
Andy Wilkinson
63e8314eb4 Update to Spring Framework 4.2.0.RC2
Closes gh-3277
2015-07-01 17:29:32 +01:00
Andy Wilkinson
1073f09c7b Upgrade to Undertow 1.2.8.Final
Closes gh-3386
2015-07-01 16:37:05 +01:00
Andy Wilkinson
6e1d0b522b Upgrade to Jersey 2.19
Closes gh-3387
2015-07-01 16:36:40 +01:00
Andy Wilkinson
04728a17e6 Upgrade to Infinispan 7.2.3.Final
Closes gh-3388
2015-07-01 16:35:59 +01:00
Andy Wilkinson
52a67e9a98 Upgrade to Liquibase 3.4.0
Closes gh-3389
2015-07-01 16:35:18 +01:00
Andy Wilkinson
453f4745d9 Merge branch '1.2.x' 2015-07-01 15:10:47 +01:00
Andy Wilkinson
f4c95eafc2 Upgrade to Undertow 1.1.7.Final
Closes gh-3382
2015-07-01 14:51:40 +01:00
Andy Wilkinson
e31a4dc028 Upgrade Java Mail to 1.5.4
Closes gh-3381
Closes gh-3383
2015-07-01 14:51:06 +01:00
Andy Wilkinson
159d3a3346 Upgrade to nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect 1.2.9
Closes gh-3380
2015-07-01 14:50:23 +01:00
Andy Wilkinson
bb8df95fbf Upgrade to HSQLDB 2.3.3
Closes gh-3379
2015-07-01 14:49:39 +01:00
Andy Wilkinson
2159190713 Merge branch '1.2.x' 2015-07-01 14:39:11 +01:00
Andy Wilkinson
b1ad2c30eb Ignore type-constrained converter when auto-configuring Jackson converter
Previously, JacksonHttpMessageConvertersConfiguration would configure a
general-purpose MappingJackson2HttpMessageConverter only if there was
no existing MappingJackson2HttpMessageConverter in the application
context. This was problematic when a
TypeConstrainedMappingJackson2HttpMessageConverter bean was present.
Such a bean is only capable of performing conversion for a specific
type, and therefore is no substitute for a general purpose converter,
yet its presence was causing the auto-configuration of a general
purpose converters to be turned off. This would leave Spring MVC’s
default converter being used for application/json requests which would
not honour the user’s Jackson configuration.

This commit enhances @ConditionalOnMissingBean so that the annotation
can be used to specify one or more types that should be ignored when
searching for beans. This allows the
TypeConstrainedMappingJackson2HttpMessageConverter beans that are
published by Spring Data REST to be ignored such that the
general-purpose MappingJackson2HttpMessageConverter is still
auto-configured.

Fixes gh-2914
2015-07-01 14:28:19 +01:00
Andy Wilkinson
8c3e2b9b3b Merge branch '1.2.x' 2015-07-01 14:28:03 +01:00
Andy Wilkinson
663967f61b Update to Spring Data Evans SR3
Closes gh-3369
2015-07-01 14:26:34 +01:00
Andy Wilkinson
b3b648f050 Upgrade dependency management plugin for compatibility with Gradle 2.5
Closes gh-3334
2015-07-01 13:40:55 +01:00
Stephane Nicoll
d7e0e754e2 Merge branch '1.2.x' 2015-07-01 05:35:34 -07:00
sopov.ivan
968b1d7425 Add Eclipse 4.5 new workspace folder to .gitignore
Closes gh-3375
2015-07-01 05:35:16 -07:00
Stephane Nicoll
d5b1810718 Merge pull request #3375 from isopov/eclipse45-gitignore
* pr/3375:
  Add Eclipse 4.5 new workspace folder to .gitignore
2015-07-01 05:34:24 -07:00
sopov.ivan
ab8d40026e Add Eclipse 4.5 new workspace folder to .gitignore
Closes gh-3375
2015-07-01 05:33:57 -07:00
Dave Syer
5541b3be43 Remove @OnManagementMvcCondition and use a private class
Fixes gh-3373
2015-07-01 09:06:54 +01:00
Dave Syer
8c3f80eb64 Use mock servlet container for welcome page tests
Fixes gh-3371
2015-07-01 09:00:40 +01:00
Phillip Webb
b5c435f8c4 Polish Actuator MVC customization support
See gh-3345
2015-06-30 22:09:38 -07:00
Phillip Webb
c84658af1b Remove unused .gitignore files 2015-06-30 22:09:00 -07:00
Phillip Webb
df3ced1a45 Merge branch '1.2.x' 2015-06-30 15:04:06 -07:00
Phillip Webb
8ec10c8425 Use buildView() to create MustacheView
Update MustacheViewResolver so that buildView() is called to create
the MustacheView. This sets fields such as `contentType` and allows us
to remove explicit setApplicationContext() and setServletContext()
calls.

Fixes gh-3265
2015-06-30 14:51:48 -07:00
Phillip Webb
1ecc9c8a8b Upgrade to Spring Framework 4.1.7.RELEASE
Fixes gh-3276
2015-06-30 13:51:19 -07:00