Commit Graph

1539 Commits

Author SHA1 Message Date
Andy Wilkinson a56bf44b39 Merge branch '1.4.x' into 1.5.x 2016-10-24 14:37:20 +01:00
Andy Wilkinson 8150cbd0d1 Remove commentary on Neo4j's licence
Closes gh-7214
2016-10-24 14:36:35 +01:00
Stephane Nicoll eddb10e4c9 Merge branch '1.4.x' into 1.5.x 2016-10-24 11:39:26 +02:00
Vedran Pavic 469a4e3444 Improve systemd service documentation
Closes gh-6954
2016-10-24 11:37:53 +02:00
Stephane Nicoll b0474b7c9d Merge branch '1.4.x' into 1.5.x 2016-10-22 13:56:42 +02:00
Ken Dombeck 4621f82b0e Correct typo in docs
Closes gh-7203
2016-10-22 13:56:07 +02:00
Andy Wilkinson d7e2708687 Merge branch '1.4.x' into 1.5.x 2016-10-19 16:51:14 +01:00
Andy Wilkinson 999fa123df Deprecate support for Gradle 2.7 and earlier 2016-10-19 16:50:35 +01:00
Andy Wilkinson c9e6aff374 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:51:53 +01:00
Andy Wilkinson 639b0f554d Suggest the use of @AutoConfigureMockMvc when using WebEnvironment.MOCK
Closes gh-7112
2016-10-19 10:51:42 +01:00
Andy Wilkinson 7962818294 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:44:20 +01:00
Andy Wilkinson 6ac041c43b Update Thymeleaf 3 related versions in docs and sample
See gh-6991
Closes gh-7183
2016-10-19 10:43:38 +01:00
Andy Wilkinson 7d68c14d03 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:36:48 +01:00
Raja Dilip Kolli 4b1ddddea3 Update docs on using Thmyeleaf 3 to reference latest version
Closes gh-7183
2016-10-19 10:34:11 +01:00
Stephane Nicoll 6186262ecc Switch `excludeDevtools` to true by default
Switch the default value of `excludeDevtools` from `false` to `true` as
it is more sensible to exclude such dependency by default.

Closes gh-7170
2016-10-17 17:52:12 +03:00
Stephane Nicoll 2d995661f4 Merge branch '1.4.x' into 1.5.x 2016-10-12 10:37:26 +02:00
Stephane Nicoll 00a10bcf61 Restore checkstyle
Rather than disabling checkstyle altogether, this commit enables it
again, relaxing the javadoc requirement only.

See gh-7142
2016-10-12 10:37:15 +02:00
Stephane Nicoll c6f23000be Merge branch '1.4.x' into 1.5.x 2016-10-12 10:30:19 +02:00
Stephane Nicoll 11cad9e0cb Fix sample in ref doc
Closes gh-7142
2016-10-12 10:27:51 +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 cfee9bab81 Deprecate remote shell support
Closes gh-7044
2016-10-11 17:39:28 +02:00
Stephane Nicoll 6fb53f90e5 Polish contribution
Closes gh-6666
2016-10-11 17:03:10 +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 ab2a2579c8 Polish contribution
Closes gh-6571
2016-10-10 11:37:21 +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 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 ed333a67b4 Expose Spring Data Rest RepositoryDetectionStrategy
Closes gh-7113
2016-10-07 10:35:48 +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 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
Stephane Nicoll cf28663cd7 Deprecate commons-dbcp 1
Closes gh-6787
2016-10-05 15:21:09 +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 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 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 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 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
Stephane Nicoll e643fc5bd1 Merge branch '1.4.x' into 1.5.x 2016-10-02 11:08:33 +02:00
Johnny Lim 503d735fdd Polish
Closes gh-7081
2016-10-02 11:07:04 +02:00