Commit Graph

5584 Commits (e9fe34e2faaffff52675161d00eb4afc08c4bb5f)
 

Author SHA1 Message Date
Dave Syer 82fdb87a8c Merge branch '1.2.x' 10 years ago
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
10 years ago
Phillip Webb c25586b760 Merge branch '1.2.x' 10 years ago
Phillip Webb 43dc0c64c2 Fixup version numbers following release 10 years ago
Spring Buildmaster 7ce391db4f Next development version 10 years ago
Phillip Webb ef1838c7f0 Merge branch '1.2.x' 10 years ago
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
10 years ago
Phillip Webb b1f8a692a8 Merge branch '1.2.x' 10 years ago
Phillip Webb 04dfac1c6c Formatting 10 years ago
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
10 years ago
sopov.ivan fa7199ddac Fix Eclipse 4.5 formatter settings
Fixes gh-3384
10 years ago
Phillip Webb a1b87766a7 Fix PropertiesLauncher javadoc
See gh-3392
10 years ago
Phillip Webb d61c38167e Formatting 10 years ago
Stephane Nicoll 533d36a468 Merge branch '1.2.x' 10 years ago
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
10 years ago
Andy Wilkinson 0db7bd37c2 Add dependency management for json-path-assert
Closes gh-3361
10 years ago
Andy Wilkinson 63e8314eb4 Update to Spring Framework 4.2.0.RC2
Closes gh-3277
10 years ago
Andy Wilkinson 1073f09c7b Upgrade to Undertow 1.2.8.Final
Closes gh-3386
10 years ago
Andy Wilkinson 6e1d0b522b Upgrade to Jersey 2.19
Closes gh-3387
10 years ago
Andy Wilkinson 04728a17e6 Upgrade to Infinispan 7.2.3.Final
Closes gh-3388
10 years ago
Andy Wilkinson 52a67e9a98 Upgrade to Liquibase 3.4.0
Closes gh-3389
10 years ago
Andy Wilkinson 453f4745d9 Merge branch '1.2.x' 10 years ago
Andy Wilkinson f4c95eafc2 Upgrade to Undertow 1.1.7.Final
Closes gh-3382
10 years ago
Andy Wilkinson e31a4dc028 Upgrade Java Mail to 1.5.4
Closes gh-3381
Closes gh-3383
10 years ago
Andy Wilkinson 159d3a3346 Upgrade to nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect 1.2.9
Closes gh-3380
10 years ago
Andy Wilkinson bb8df95fbf Upgrade to HSQLDB 2.3.3
Closes gh-3379
10 years ago
Andy Wilkinson 2159190713 Merge branch '1.2.x' 10 years ago
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
10 years ago
Andy Wilkinson 8c3e2b9b3b Merge branch '1.2.x' 10 years ago
Andy Wilkinson 663967f61b Update to Spring Data Evans SR3
Closes gh-3369
10 years ago
Andy Wilkinson b3b648f050 Upgrade dependency management plugin for compatibility with Gradle 2.5
Closes gh-3334
10 years ago
Stephane Nicoll d7e0e754e2 Merge branch '1.2.x' 10 years ago
sopov.ivan 968b1d7425 Add Eclipse 4.5 new workspace folder to .gitignore
Closes gh-3375
10 years ago
Stephane Nicoll d5b1810718 Merge pull request #3375 from isopov/eclipse45-gitignore
* pr/3375:
  Add Eclipse 4.5 new workspace folder to .gitignore
10 years ago
sopov.ivan ab8d40026e Add Eclipse 4.5 new workspace folder to .gitignore
Closes gh-3375
10 years ago
Dave Syer 5541b3be43 Remove @OnManagementMvcCondition and use a private class
Fixes gh-3373
10 years ago
Dave Syer 8c3f80eb64 Use mock servlet container for welcome page tests
Fixes gh-3371
10 years ago
Phillip Webb b5c435f8c4 Polish Actuator MVC customization support
See gh-3345
10 years ago
Phillip Webb c84658af1b Remove unused .gitignore files 10 years ago
Phillip Webb df3ced1a45 Merge branch '1.2.x' 10 years ago
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
10 years ago
Phillip Webb 1ecc9c8a8b Upgrade to Spring Framework 4.1.7.RELEASE
Fixes gh-3276
10 years ago
Phillip Webb a89139c06b Allow case insensitive logging.level properties
Fixes gh-3356
10 years ago
Andy Wilkinson 3d27a34397 Merge branch '1.2.x' 10 years ago
Andy Wilkinson 5a1e66b3d6 Make GzipFilterAutoConfiguration conditional on HttpMethod
GzipFilterProperties uses HttpMethod so GzipFilterAutoConfiguration,
which uses GzipFilterProperties, needs to be conditional on HttpMethod
being on the classpath.

Closes gh-3362
10 years ago
Dave Syer 1e464da248 Refactor the Actuator MVC configuration to allow more customization
There is a new spring.factories entry for
org.springframework.boot.actuate.autoconfigure.EndpointWebMvcConfiguration
which loads extra beans into the MVC config for the Actuator.
If the management context is a child context all the beans go in the
child (except the Spring Security filter still). A big bonus is that
you can add WebConfigurerAdapters to configure static resources etc.
A new component called ManagementContextResolver can be used to
locate the ApplicationContext for the MVC endpoints.

Fixes gh-3345
10 years ago
Phillip Webb 4187b5d8fb Merge branch '1.2.x' 10 years ago
Phillip Webb 76348e50e6 Merge pull request #3324 from mbenson/actuator-sample-ant
* pr/3324:
  Fixup sample Ant build
10 years ago
Matt Benson 183a2095f4 Fixup sample Ant build
Fixes gh-3324
10 years ago
Phillip Webb 8da4d153b7 Merge pull request #3357 from izeye/filewatch-20150630
* pr/3357:
  Fix typo
10 years ago