543498f040
Merge branch '1.5.x'
2016-10-05 15:21:23 +02:00
cf28663cd7
Deprecate commons-dbcp 1
...
Closes gh-6787
2016-10-05 15:21:09 +02:00
0d5985b8dd
Merge branch '1.5.x'
2016-10-04 15:01:04 +02:00
07690bab25
Allow customization of the auto-configured JmsTemplate
...
Closes gh-6825
2016-10-04 15:00:42 +02:00
fc1a700d4c
Merge branch '1.5.x'
...
# Conflicts:
# spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
2016-10-04 13:39:33 +02:00
4b2970606e
Merge branch '1.4.x' into 1.5.x
2016-10-04 13:37:57 +02:00
7019894f0e
Clarify the role of spring-boot-starter-cache
...
The cache abstraction is a core feature of the Spring Framework. Basic
features such as `@EnableCaching` are therefore available by default with
no extra dependencies necessary.
However, the actual cache adapters for JCache, Ehcache 2.x, Caffeine and
Guava are located in a separated module, `spring-context-support`. Spring
Boot provides that artifact via the `spring-boot-starter-cache` starter.
It is quite easy to "only" add the cache library dependencies and forget
about this extra dependencies since `@EnableCaching` is available by
default. This commit clarifies the role of the starer in each section so
that it is more obvious. We're already explaining this at the beginning
of the section but it seems that's not enough.
Closes gh-7071
2016-10-04 13:37:29 +02:00
39534aea6b
Merge branch '1.5.x'
...
# Conflicts:
# spring-boot-dependencies/pom.xml
2016-10-04 13:02:53 +02:00
58050fb72f
Merge branch '1.4.x' into 1.5.x
...
# Conflicts:
# spring-boot-dependencies/pom.xml
2016-10-04 13:01:46 +02:00
0926b66123
Fix a typo
...
Closes gh-7085
2016-10-04 12:58:37 +02:00
e6ab3cef73
Merge branch '1.5.x'
2016-10-03 12:29:14 +02:00
6977dcaf44
Merge branch '1.4.x' into 1.5.x
2016-10-03 12:28:58 +02:00
9f7e97b23f
Improve war to executable app documentation
...
Closes gh-7040
2016-10-03 12:28:25 +02:00
f181421f67
Merge branch '1.5.x'
2016-10-03 11:29:56 +02:00
8ad477537e
Fail fast if both uri and client attributes are set
...
Previously, an URI and individual client attributes can be set to
configure the mongo client. In such a scenario, the URI is ignored.
This commit changes the URI to be "null" and the creation of the client
to fail if both the uri and client attributes are set. If no client
attributes are set, the uri is used as before.
Closes gh-6739
2016-10-03 11:29:20 +02:00
b95b57dbf5
Merge branch '1.5.x'
2016-10-02 11:08:53 +02:00
e643fc5bd1
Merge branch '1.4.x' into 1.5.x
2016-10-02 11:08:33 +02:00
503d735fdd
Polish
...
Closes gh-7081
2016-10-02 11:07:04 +02:00
df9fb51a92
Merge branch '1.5.x'
2016-10-01 13:21:11 +02:00
75f475f2c8
Merge branch '1.4.x' into 1.5.x
2016-10-01 13:20:45 +02:00
914becac0e
Fix thymeleaf-layout-dialect.version in doc
...
Version 2.0.0 had serval bugs which broke compatibility to older
templates, so the guide should refer the fixed version instead.
Closes gh-6991
2016-10-01 13:18:37 +02:00
f82dc8e043
Upgrade to JMS API 2.0
...
Closes gh-7049
2016-09-29 20:33:21 +01:00
241ab10160
Merge branch '1.5.x'
2016-09-29 15:49:04 +01:00
2a035d0748
Remove support for Velocity following its deprecation in 1.4
...
Closes gh-6971
2016-09-29 15:44:36 +01:00
464915d2cc
Remove support for HornetQ following its deprecation in 1.4
...
See gh-6971
2016-09-29 15:44:36 +01:00
ea9faa5f6a
Merge branch '1.5.x'
2016-09-27 10:14:57 +02:00
9210bf0822
Merge branch '1.4.x' into 1.5.x
2016-09-27 10:14:37 +02:00
a2794d75c3
Clarify couchbase cache requirements
...
Closes gh-6998
2016-09-27 10:12:59 +02:00
542e935bb6
Fix typo
...
Closes gh-7026
2016-09-27 10:03:00 +02:00
3ac13a4af0
Merge branch '1.5.x'
2016-09-26 10:36:22 +02:00
7d73abc04f
Merge branch '1.4.x' into 1.5.x
2016-09-26 10:36:02 +02:00
f1fddd243b
Document spring.http.encoding.mapping
...
Closes gh-7017
2016-09-26 10:35:45 +02:00
9bc77254a7
Start building against Spring Framework 5 snapshot
...
This commit enables compatibility build against Spring Framework 5.
The Velocity and Guava support that are deprecated in the 1.x line have
been removed and few other classes contain minor change to comply to non
backward compatible changes in Spring Framework 5.
This commit also switches the required java version to 8.
Closes gh-6977
2016-09-21 17:37:02 +02:00
6643ec3713
Next development version
2016-09-21 17:05:50 +02:00
bd7c20eb1c
Deprecate Guava support
2016-09-21 14:59:02 +02:00
ce1e41dce3
Remove deprecated code
...
This code removes code deprecated in 1.4 with the exception of code that
requires an update to Spring Framework 5.
Closes gh-6971
2016-09-21 14:30:28 +02:00
6bd670edbc
Initiate 1.4.x branch
2016-09-21 11:11:24 +02:00
7e9ed5e1a7
Next Development Version
2016-09-21 07:58:07 +00:00
be33827f49
Simplify property validation sample and document need for static bean method
...
Closes gh-6627
2016-09-20 21:33:31 +01:00
6565ff616a
Clarify documentation on using a Spring Boot app as a dependency
...
Closes gh-6812
2016-09-19 14:00:15 +01:00
a994b11a73
Polish
2016-09-18 23:38:21 -07:00
7ec14774a8
Polish
2016-09-18 23:37:46 -07:00
b69fd9229d
Merge branch '1.3.x'
2016-09-18 17:12:39 +02:00
04b261984e
Polish
2016-09-18 17:12:21 +02:00
3d8b51d2e4
Link to Spring Security OAuth2 reference docs
...
Update documentation to include a link to Spring Security OAuth2's
reference documentation.
Closes gh-6909
2016-09-17 19:46:19 -07:00
6ec1ac0aa0
Fix doc syntax
...
See gh-6593
2016-09-17 08:04:00 +02:00
0eab3e0c5a
Drop printed link to reference documentation
...
Tweak the fix from 50c68a49
2016-09-16 17:52:25 -07:00
825dd0a26c
Merge branch '1.3.x'
2016-09-16 15:07:18 -07:00
b97e0bd471
Allow HttpPutFormContentFilter to be disabled
...
Add `spring.mvc.formcontent.putfilter.enabled` property to allow the
HttpPutFormContentFilter to be disabled.
Fixes gh-6519
2016-09-16 14:14:21 -07:00
b77eddb8bb
Merge branch '1.3.x'
2016-09-16 16:58:53 +02:00
Stephane Nicoll
Dan Stine
Johnny Lim
Michael Stummvoll
Andy Wilkinson
Spring Buildmaster
Phillip Webb
Mike Gehard