Commit Graph

1533 Commits (5dfe801fd737559ec6f294afa86e86515e4fd0a8)

Author SHA1 Message Date
Stephane Nicoll 0480a96166 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 98b30416ca Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 9861cb7e9c Expand the note regarding LiveReload
See gh-7080
8 years ago
Stephane Nicoll 3a86e26977 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 5435f03690 Merge branch '1.4.x' into 1.5.x 8 years ago
Aurélien Leboulanger 2c64661b58 Fix typo
Closes gh-7127
8 years ago
Stephane Nicoll 5a2eae5628 Merge branch '1.5.x' 8 years ago
Stephane Nicoll ed333a67b4 Expose Spring Data Rest RepositoryDetectionStrategy
Closes gh-7113
8 years ago
Stephane Nicoll b54566c0cd Merge branch '1.5.x' 8 years ago
Stephane Nicoll f82e91df39 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 03961e6692 Polish contribution
Closes gh-7004
8 years ago
Stephane Nicoll 89b1ff1fac Merge branch '1.5.x' 8 years ago
Stephane Nicoll f684bcc9e5 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 0f97ccf2fa Clarify dependency override instructions for Thymeleaf 3
Closes gh-7097
8 years ago
Andy Wilkinson fe10ea73b0 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Andy Wilkinson f137ec6a3a Merge branch '1.5.x' 8 years ago
Andy Wilkinson 846f264da8 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Stephane Nicoll 8b61d15120 Remove deprecated support for commons-dbcp 1
See gh-6787
8 years ago
Stephane Nicoll 543498f040 Merge branch '1.5.x' 8 years ago
Stephane Nicoll cf28663cd7 Deprecate commons-dbcp 1
Closes gh-6787
8 years ago
Stephane Nicoll 0d5985b8dd Merge branch '1.5.x' 8 years ago
Stephane Nicoll 07690bab25 Allow customization of the auto-configured JmsTemplate
Closes gh-6825
8 years ago
Stephane Nicoll fc1a700d4c Merge branch '1.5.x'
# Conflicts:
#	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
8 years ago
Stephane Nicoll 4b2970606e Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Stephane Nicoll 39534aea6b Merge branch '1.5.x'
# Conflicts:
#	spring-boot-dependencies/pom.xml
8 years ago
Stephane Nicoll 58050fb72f Merge branch '1.4.x' into 1.5.x
# Conflicts:
#	spring-boot-dependencies/pom.xml
8 years ago
Dan Stine 0926b66123 Fix a typo
Closes gh-7085
8 years ago
Stephane Nicoll e6ab3cef73 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 6977dcaf44 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 9f7e97b23f Improve war to executable app documentation
Closes gh-7040
8 years ago
Stephane Nicoll f181421f67 Merge branch '1.5.x' 8 years ago
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
8 years ago
Stephane Nicoll b95b57dbf5 Merge branch '1.5.x' 8 years ago
Stephane Nicoll e643fc5bd1 Merge branch '1.4.x' into 1.5.x 8 years ago
Johnny Lim 503d735fdd Polish
Closes gh-7081
8 years ago
Stephane Nicoll df9fb51a92 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 75f475f2c8 Merge branch '1.4.x' into 1.5.x 8 years ago
Michael Stummvoll 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
8 years ago
Andy Wilkinson f82dc8e043 Upgrade to JMS API 2.0
Closes gh-7049
8 years ago
Andy Wilkinson 241ab10160 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 2a035d0748 Remove support for Velocity following its deprecation in 1.4
Closes gh-6971
8 years ago
Andy Wilkinson 464915d2cc Remove support for HornetQ following its deprecation in 1.4
See gh-6971
8 years ago
Stephane Nicoll ea9faa5f6a Merge branch '1.5.x' 8 years ago
Stephane Nicoll 9210bf0822 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll a2794d75c3 Clarify couchbase cache requirements
Closes gh-6998
8 years ago
Stephane Nicoll 542e935bb6 Fix typo
Closes gh-7026
8 years ago
Stephane Nicoll 3ac13a4af0 Merge branch '1.5.x' 8 years ago