Commit Graph

1549 Commits

Author SHA1 Message Date
Stephane Nicoll
b0cbe1fdc7 Merge branch '1.5.x' 2016-10-12 10:04:15 +02:00
Stephane Nicoll
f254e1227f Merge branch '1.4.x' into 1.5.x 2016-10-12 10:03:59 +02:00
Stephane Nicoll
0d3318796e Merge branch '1.3.x' into 1.4.x 2016-10-12 10:03:41 +02:00
Stephane Nicoll
bd2956c3f0 Fix metricsFilter reference in doc
Closes gh-7147
2016-10-12 10:03:23 +02:00
Stephane Nicoll
c5cc626d48 Remove remote shell support
See gh-7044
2016-10-11 17:59:25 +02:00
Stephane Nicoll
66a3df454f Merge branch '1.5.x' 2016-10-11 17:42:53 +02:00
Stephane Nicoll
cfee9bab81 Deprecate remote shell support
Closes gh-7044
2016-10-11 17:39:28 +02:00
Stephane Nicoll
7f2806bd19 Merge branch '1.5.x' 2016-10-11 17:06:04 +02:00
Stephane Nicoll
6fb53f90e5 Polish contribution
Closes gh-6666
2016-10-11 17:03:10 +02:00
Stephane Nicoll
92db3b4803 Merge branch '1.5.x' 2016-10-11 08:33:46 +02:00
Stephane Nicoll
18c3d42f45 Merge branch '1.4.x' into 1.5.x 2016-10-11 08:32:43 +02:00
Michael J. Simons
e87cf937e1 Add missing parentheses
Closes gh-7137
2016-10-11 08:31:44 +02:00
Stephane Nicoll
98f14f2ee9 Polish documentation
Closes gh-2642
2016-10-11 08:30:18 +02:00
Stephane Nicoll
097c64a91b Merge branch '1.5.x' 2016-10-10 11:37:51 +02:00
Stephane Nicoll
ab2a2579c8 Polish contribution
Closes gh-6571
2016-10-10 11:37:21 +02:00
Stephane Nicoll
0480a96166 Merge branch '1.5.x' 2016-10-07 14:21:40 +02:00
Stephane Nicoll
98b30416ca Merge branch '1.4.x' into 1.5.x 2016-10-07 14:21:28 +02:00
Stephane Nicoll
9861cb7e9c Expand the note regarding LiveReload
See gh-7080
2016-10-07 14:21:12 +02:00
Stephane Nicoll
3a86e26977 Merge branch '1.5.x' 2016-10-07 14:15:31 +02:00
Stephane Nicoll
5435f03690 Merge branch '1.4.x' into 1.5.x 2016-10-07 14:15:19 +02:00
Aurélien Leboulanger
2c64661b58 Fix typo
Closes gh-7127
2016-10-07 14:14:50 +02:00
Stephane Nicoll
5a2eae5628 Merge branch '1.5.x' 2016-10-07 10:35:59 +02:00
Stephane Nicoll
ed333a67b4 Expose Spring Data Rest RepositoryDetectionStrategy
Closes gh-7113
2016-10-07 10:35:48 +02:00
Stephane Nicoll
b54566c0cd Merge branch '1.5.x' 2016-10-06 13:30:14 +02:00
Stephane Nicoll
f82e91df39 Merge branch '1.4.x' into 1.5.x 2016-10-06 13:29:53 +02:00
Stephane Nicoll
03961e6692 Polish contribution
Closes gh-7004
2016-10-06 13:28:23 +02:00
Stephane Nicoll
89b1ff1fac Merge branch '1.5.x' 2016-10-06 11:37:35 +02:00
Stephane Nicoll
f684bcc9e5 Merge branch '1.4.x' into 1.5.x 2016-10-06 11:37:20 +02:00
Stephane Nicoll
0f97ccf2fa Clarify dependency override instructions for Thymeleaf 3
Closes gh-7097
2016-10-06 11:21:24 +02:00
Andy Wilkinson
fe10ea73b0 Merge branch '1.4.x' into 1.5.x 2016-10-05 14:58:42 +01:00
Andy Wilkinson
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
Andy Wilkinson
f137ec6a3a Merge branch '1.5.x' 2016-10-05 14:58:02 +01:00
Andy Wilkinson
846f264da8 Merge branch '1.4.x' into 1.5.x 2016-10-05 14:57:51 +01:00
Andy Wilkinson
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
Stephane Nicoll
8b61d15120 Remove deprecated support for commons-dbcp 1
See gh-6787
2016-10-05 15:51:14 +02:00
Stephane Nicoll
543498f040 Merge branch '1.5.x' 2016-10-05 15:21:23 +02:00
Stephane Nicoll
cf28663cd7 Deprecate commons-dbcp 1
Closes gh-6787
2016-10-05 15:21:09 +02:00
Stephane Nicoll
0d5985b8dd Merge branch '1.5.x' 2016-10-04 15:01:04 +02:00
Stephane Nicoll
07690bab25 Allow customization of the auto-configured JmsTemplate
Closes gh-6825
2016-10-04 15:00:42 +02:00
Stephane Nicoll
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
Stephane Nicoll
4b2970606e Merge branch '1.4.x' into 1.5.x 2016-10-04 13:37:57 +02:00
Stephane Nicoll
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
Stephane Nicoll
39534aea6b Merge branch '1.5.x'
# Conflicts:
#	spring-boot-dependencies/pom.xml
2016-10-04 13:02:53 +02:00
Stephane Nicoll
58050fb72f Merge branch '1.4.x' into 1.5.x
# Conflicts:
#	spring-boot-dependencies/pom.xml
2016-10-04 13:01:46 +02:00
Dan Stine
0926b66123 Fix a typo
Closes gh-7085
2016-10-04 12:58:37 +02:00
Stephane Nicoll
e6ab3cef73 Merge branch '1.5.x' 2016-10-03 12:29:14 +02:00
Stephane Nicoll
6977dcaf44 Merge branch '1.4.x' into 1.5.x 2016-10-03 12:28:58 +02:00
Stephane Nicoll
9f7e97b23f Improve war to executable app documentation
Closes gh-7040
2016-10-03 12:28:25 +02:00
Stephane Nicoll
f181421f67 Merge branch '1.5.x' 2016-10-03 11:29:56 +02:00
Stephane Nicoll
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