097c64a91b
Merge branch '1.5.x'
2016-10-10 11:37:51 +02:00
ab2a2579c8
Polish contribution
...
Closes gh-6571
2016-10-10 11:37:21 +02:00
0480a96166
Merge branch '1.5.x'
2016-10-07 14:21:40 +02:00
98b30416ca
Merge branch '1.4.x' into 1.5.x
2016-10-07 14:21:28 +02:00
9861cb7e9c
Expand the note regarding LiveReload
...
See gh-7080
2016-10-07 14:21:12 +02:00
3a86e26977
Merge branch '1.5.x'
2016-10-07 14:15:31 +02:00
5435f03690
Merge branch '1.4.x' into 1.5.x
2016-10-07 14:15:19 +02:00
2c64661b58
Fix typo
...
Closes gh-7127
2016-10-07 14:14:50 +02:00
5a2eae5628
Merge branch '1.5.x'
2016-10-07 10:35:59 +02:00
ed333a67b4
Expose Spring Data Rest RepositoryDetectionStrategy
...
Closes gh-7113
2016-10-07 10:35:48 +02:00
b54566c0cd
Merge branch '1.5.x'
2016-10-06 13:30:14 +02:00
f82e91df39
Merge branch '1.4.x' into 1.5.x
2016-10-06 13:29:53 +02:00
03961e6692
Polish contribution
...
Closes gh-7004
2016-10-06 13:28:23 +02:00
89b1ff1fac
Merge branch '1.5.x'
2016-10-06 11:37:35 +02:00
f684bcc9e5
Merge branch '1.4.x' into 1.5.x
2016-10-06 11:37:20 +02:00
0f97ccf2fa
Clarify dependency override instructions for Thymeleaf 3
...
Closes gh-7097
2016-10-06 11:21:24 +02:00
fe10ea73b0
Merge branch '1.4.x' into 1.5.x
2016-10-05 14:58:42 +01:00
ad3e5c04bb
Add a second, portal-compatible ID to the Gradle plugin
...
To be compatible with Gradle's plugin portal, plugins must have an
ID that uses a reverse domain name. This means that spring-boot is
not compatible.
This commit introduces a new ID, org.springframework.boot, and
deprecates the old ID.
Closes gh-6997
2016-10-05 14:58:26 +01:00
f137ec6a3a
Merge branch '1.5.x'
2016-10-05 14:58:02 +01:00
846f264da8
Merge branch '1.4.x' into 1.5.x
2016-10-05 14:57:51 +01:00
77f1da871f
Add a second, portal-compatible ID to the Gradle plugin
...
To be compatible with Gradle's plugin portal, plugins must have an
ID that uses a reverse domain name. This means that spring-boot is
not compatible.
This commit introduces a new ID, org.springframework.boot, and
deprecates the old ID.
Closes gh-6997
2016-10-05 14:54:23 +01:00
8b61d15120
Remove deprecated support for commons-dbcp 1
...
See gh-6787
2016-10-05 15:51:14 +02:00
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
Stephane Nicoll
Aurélien Leboulanger
Andy Wilkinson
Dan Stine
Johnny Lim
Michael Stummvoll