Stephane Nicoll
544c73841d
Merge branch '1.4.x' into 1.5.x
8 years ago
Stephane Nicoll
633e75dce2
Fix typo
...
Closes gh-8563
8 years ago
Stephane Nicoll
68ef19b69b
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
207ab3ecb4
Merge branch '1.4.x' into 1.5.x
8 years ago
Stephane Nicoll
07c56c60ba
Make sure Hazelcast bootstraps before any JCache setup
...
This commit makes sure that if a `javax.cache.CacheManager` is required,
an auto-configured `HazelcastInstance` is fully resolved first. This
prevents the case where the JCache bootstrap actually starts an instance
early, followed by a second (potentially unwanted) instance created by the
regular auto-configuration.
Since the JCache implementation works with an `HazelcastInstance` behind
the scenes, if there is one `HazelcastInstance` configured and it has a
name, then we configure the `CacheProvider` to use that. Future Hazelcast
version will allow to pass the instance directly (i.e. not requiring an
actual name).
Closes gh-8484
8 years ago
Phillip Webb
d8f827d224
Cleanup and format code
8 years ago
Phillip Webb
425dbc3e52
Update copyright header for edited files
8 years ago
Spring Buildmaster
d23fa24340
Next Development Version
8 years ago
Spring Buildmaster
2a83e80a9b
Next Development Version
8 years ago
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
Andy Wilkinson
30074431a7
Improve documentation of static resource reloading with devtools
...
Closes gh-5133
Closes gh-7886
8 years ago
Brian Clozel
12d883f6b9
Introduce "server.servlet" configuration prefix
...
This commit refactors the `ServerProperties` property keys and
introduces a separate "server.servlet" namespace to isolate
servlet-specific properties from the rest.
Closes gh-8066
8 years ago
Stephane Nicoll
a31a792192
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
d42a54e880
Add explicit note about Mockito 2 in the documentation
...
Closes gh-8217
8 years ago
Stephane Nicoll
130e0808d0
Merge branch '1.4.x' into 1.5.x
8 years ago
Stephane Nicoll
570b0593a6
Document SMTP timeout settings
...
Closes gh-8213
8 years ago
Stephane Nicoll
008aef6142
Document @LiquibaseDataSource feature
...
Closes gh-8214
8 years ago
Brian Clozel
8619d6a229
Rename EmbeddedServletContainer -> EmbeddedWebServer
...
This contract is not specific to servlet containers and should be
reused by all web server implementations (including reactive variants).
Fixes gh-8208
8 years ago
Stephane Nicoll
fb19b36595
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
3d1f8aa8d7
Merge branch '1.4.x' into 1.5.x
8 years ago
Stephane Nicoll
a30461c5c7
Polish pid metadata
...
This commit moves the `spring.pid.*` metadata to the relevant project. It
also updates the doc to refer to the new `ApplicationPidFileWriter`
rather than the one in its deprecatred form.
Closes gh-8196
8 years ago
zhanhb
22ba7b93b2
Fix pid properties link in documentation
...
See gh-8196
8 years ago
Stephane Nicoll
5c663a9ece
Merge branch '1.5.x'
8 years ago
Johnny Lim
846994e498
Polish
...
Closes gh-8148
8 years ago
Stephane Nicoll
715f8d7436
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
8a0f8cf953
Merge branch '1.4.x' into 1.5.x
8 years ago
Stephane Nicoll
b9ede6b281
Polish contribution
...
Closes gh-8157
8 years ago
Raja Kolli
a1c601ca28
Update copyright header
...
See gh-8157
8 years ago
Spring Buildmaster
5c12500366
Next Development Version
8 years ago
Spring Buildmaster
a2696bf873
Next Development Version
8 years ago
Andy Wilkinson
4ea7dc6f31
Polish "Upgrade to Flyway 4.0"
...
See gh-5344
8 years ago
Phillip Webb
8747e039ee
Merge branch '1.5.x'
8 years ago
Peter Szanto
14bd404b71
Document AWS Elastic Beanstalk deployment
...
Update the reference documentation to include details of Amazon
Elastic Beanstalk.
Closes gh-7948
8 years ago
Spring Buildmaster
ed1ce140c0
Next Development Version
8 years ago
Brian Clozel
de98c4b3ff
Provide Reactor 3 auto-configuration
...
This commit provides auto-configuration for the Reactor Core 3 library.
A new configuration namespace, "spring.reactor" allows to configure
hooks on operators, like "spring.reactor.stacktrace-mode.enabled".
This property is enabled automatically by devtools, since it improves
the developer experience and provides full stacktrace information when
exceptions occur (but at a performance cost).
Fixes gh-7302
8 years ago
Phillip Webb
17451c5e7a
Merge branch '1.5.x'
8 years ago
Phillip Webb
71601c3b96
Merge branch '1.4.x' into 1.5.x
8 years ago
Phillip Webb
2cf93f89f5
Polish
8 years ago
Andy Wilkinson
9bba73a1a9
Upgrade to Thymeleaf 3 and drop support for Thymleaf 2
...
This commit raises the minimum supported version of Thymeleaf to
3.0.x. It also upgrades Spring Social to a version that is compatible
with Thymeleaf 3.
Closes gh-7450
Closes gh-6258
See gh-7885
8 years ago
Stephane Nicoll
661fd848eb
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
79233b019e
Fix keys format for embedded mongodb support
...
Closes gh-8102
8 years ago
Stephane Nicoll
265a712294
Fix keys format for embedded mongodb support
...
Closes gh-8102
8 years ago
Andy Wilkinson
ef4f83e7b1
Update reference guide to reflect Java 8 requirement
...
Closes gh-8090
8 years ago
Andy Wilkinson
dbd10a8daa
Remove support for Jetty 9.3 and earlier
...
Closes gh-7985
8 years ago
Andy Wilkinson
0807c27c26
Complete removing support for Tomcat 7
...
Closes gh-6416
8 years ago
Stephane Nicoll
d67ce78e8b
Merge branch '1.5.x'
8 years ago
Johnny Lim
e0de28a1f7
Polish
...
Closes gh-8076
8 years ago
Stephane Nicoll
1f164906dc
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
4a60de78ff
Merge branch '1.4.x' into 1.5.x
8 years ago
Stephane Nicoll
4efa4590f8
Review doc on advanced datasource customization
...
Closes gh-7652
8 years ago
Phillip Webb
8ffaa54e74
Merge branch '1.5.x'
8 years ago