Commit Graph

1525 Commits

Author SHA1 Message Date
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
Stephane Nicoll b95b57dbf5 Merge branch '1.5.x' 2016-10-02 11:08:53 +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
Stephane Nicoll df9fb51a92 Merge branch '1.5.x' 2016-10-01 13:21:11 +02:00
Stephane Nicoll 75f475f2c8 Merge branch '1.4.x' into 1.5.x 2016-10-01 13:20:45 +02:00
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
2016-10-01 13:18:37 +02:00
Andy Wilkinson f82dc8e043 Upgrade to JMS API 2.0
Closes gh-7049
2016-09-29 20:33:21 +01:00
Andy Wilkinson 241ab10160 Merge branch '1.5.x' 2016-09-29 15:49:04 +01:00
Andy Wilkinson 2a035d0748 Remove support for Velocity following its deprecation in 1.4
Closes gh-6971
2016-09-29 15:44:36 +01:00
Andy Wilkinson 464915d2cc Remove support for HornetQ following its deprecation in 1.4
See gh-6971
2016-09-29 15:44:36 +01:00
Stephane Nicoll ea9faa5f6a Merge branch '1.5.x' 2016-09-27 10:14:57 +02:00
Stephane Nicoll 9210bf0822 Merge branch '1.4.x' into 1.5.x 2016-09-27 10:14:37 +02:00
Stephane Nicoll a2794d75c3 Clarify couchbase cache requirements
Closes gh-6998
2016-09-27 10:12:59 +02:00
Stephane Nicoll 542e935bb6 Fix typo
Closes gh-7026
2016-09-27 10:03:00 +02:00
Stephane Nicoll 3ac13a4af0 Merge branch '1.5.x' 2016-09-26 10:36:22 +02:00
Stephane Nicoll 7d73abc04f Merge branch '1.4.x' into 1.5.x 2016-09-26 10:36:02 +02:00
Stephane Nicoll f1fddd243b Document spring.http.encoding.mapping
Closes gh-7017
2016-09-26 10:35:45 +02:00
Stephane Nicoll 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
Stephane Nicoll 6643ec3713 Next development version 2016-09-21 17:05:50 +02:00
Stephane Nicoll bd7c20eb1c Deprecate Guava support 2016-09-21 14:59:02 +02:00
Stephane Nicoll 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
Stephane Nicoll 6bd670edbc Initiate 1.4.x branch 2016-09-21 11:11:24 +02:00
Spring Buildmaster 7e9ed5e1a7 Next Development Version 2016-09-21 07:58:07 +00:00