Commit Graph

1955 Commits (c37bba29efc9632232b2e0813885a92f3c7290f1)

Author SHA1 Message Date
Stephane Nicoll d811b5fb1d Merge branch '1.5.x' 8 years ago
Stephane Nicoll bb8800a625 Deprecate spring.cache.hazelcast.config
The additional configuration for an `HazelcastInstance` will be removed
in 2.0. This commit makes sure that the property is deprecated in 1.5

See gh-8470
8 years ago
Vedran Pavic 1c789f1a8d Remove dependency management for `hibernate-entitymanager`
Closes gh-8433
8 years ago
Andy Wilkinson 9c88ba3b90 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 6673d8eebc Polish "Allow loader.path to refer to nested jars"
Closes gh-8334
Closes gh-8465
8 years ago
Andy Wilkinson b6e8a280fd Merge branch '1.5.x' 8 years ago
Andy Wilkinson b36c8a7c24 Polish "Tighten up PropertiesLauncher's contract"
See gh-8346
Closes gh-7221
8 years ago
Dave Syer e4c807b884 Tighten up PropertiesLauncher's contract
The main changes are:

- Switch to `loader.properties` instead of `application.properties`
- Search for `loader.properties` in `loader.home` as well as in
  the classpath
- Placeholder replacements in MANIFEST.MF (using `loader.properties`
  or system/env vars)

See gh-7221
Closes gh-8346
8 years ago
Stephane Nicoll ed7c6e2063 Merge branch '1.5.x' 8 years ago
Stephane Nicoll b5b69cca03 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 09205a8fc8 Fix indentation
Closes gh-8143
8 years ago
Michael J. Simons f50a0f9707 Clarify usage of @ImportResource in doc
See gh-8143
8 years ago
Stephane Nicoll 20bd0f94d6 Merge branch '1.5.x' 8 years ago
Kazuki Shimizu fa4ecff9e0 Update doc about constructor injection
Closes gh-8392
8 years ago
Phillip Webb a4bcd20b64 Merge branch '1.5.x' 8 years ago
Phillip Webb ca1540cefe Update header copyright for changed files 8 years ago
Phillip Webb 47fd5f4fac Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb 47b00c086c Polish 8 years ago
Stephane Nicoll 30564eb619 Merge branch '1.5.x' 8 years ago
Stephane Nicoll f032d2fe03 Polish
Closes gh-8412
8 years ago
Brian Clozel f12a634843 Fix typo in spring-webflux dependency 8 years ago
Brian Clozel d1eafa29da Add missing dependency in docs generation
Reactor Netty and Spring WebFlux were missing.
8 years ago
Stephane Nicoll 91009cfc01 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 43a534f4ca Polish contribution
Closes gh-8195
8 years ago
Stephane Nicoll ef8846770b Merge branch '1.5.x' 8 years ago
Raja Kolli a5a2c04d23 Fix version of `gradle-git-properties` in doc
Closes gh-8273
8 years ago
Stephane Nicoll 3c956441b5 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 121ab0a71e Merge branch '1.4.x' into 1.5.x 8 years ago
Vedran Pavic 1c8f1c709c Fix audit events related documentation
Closes gh-8319
8 years ago
Stephane Nicoll 4301265dba Merge branch '1.5.x' 8 years ago
Stephane Nicoll d4d45a1009 Merge branch '1.4.x' into 1.5.x 8 years ago
Johnny Lim 0f5fefd561 Fix a broken AsciiDoc attribute declaration
Closes gh-8300
8 years ago
Stephane Nicoll 7cb451b934 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 7920543480 Add note regarding the detection of `spring.jpa.database`
Closes gh-8253
8 years ago
Stephane Nicoll 6993854c55 Explain how to downgrade to Jackson 2.6
Closes gh-8192
8 years ago
Stephane Nicoll fe552fc920 Merge branch '1.5.x' 8 years ago
Stephane Nicoll bd6d1b74c0 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll bcbcb9c00b Clarify use of `DataSource` for batch apps
Closes gh-8271
8 years ago
Stephane Nicoll ca2f8778f4 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 6c4013249b Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 58a4f04962 Fix typo in documentation
Closes gh-8259
8 years ago
Stephane Nicoll 25a025cf36 Fix doc generation 8 years ago
Stephane Nicoll b30d4303d5 Polish contribution
Closes gh-8230
8 years ago
Stephane Nicoll 064faf9560 Merge branch '1.5.x' 8 years ago
Stephane Nicoll aa49468171 Allow to define a custom MessageRecoverer
This commit improves `SimpleRabbitListenerContainerFactoryConfigurer` to
use a custom `MessageConverter`. If such a bean is present, it is used
for the default factory that is auto-configured.

Closes gh-8194
8 years ago
Stephane Nicoll ba05f4012c Merge branch '1.5.x' 8 years ago
Stephane Nicoll aff50f6787 Merge branch '1.4.x' into 1.5.x 8 years ago
Kamil Wozniak f46e3dc9f3 Fix link in doc to Spring Test
Closes gh-8226
8 years ago
Andy Wilkinson beecbe30b9 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 64b65e1fe5 Merge branch '1.4.x' into 1.5.x 8 years ago