Commit Graph

9047 Commits

Author SHA1 Message Date
Stephane Nicoll
640a77fcfa Merge branch '1.5.x' 2016-10-07 09:46:39 +02:00
Stephane Nicoll
02b0e3955c Merge branch '1.4.x' into 1.5.x 2016-10-07 09:46:21 +02:00
Stephane Nicoll
4a34c35da3 Merge pull request #7120 from izeye:fix-string-format
* pr/7120:
  Fix String.format() usages
2016-10-07 09:46:03 +02:00
Johnny Lim
1c4c0c6119 Fix String.format() usages
Closes gh-7120
2016-10-07 09:45:43 +02:00
Andy Wilkinson
cf038da083 Merge branch '1.5.x' 2016-10-06 17:15:46 +01:00
Andy Wilkinson
9b6fa1e8d7 Separate conditions that did and did not match in auto-config endpoint
Closes gh-7122
2016-10-06 17:15:38 +01:00
Stephane Nicoll
daaa545d69 Merge branch '1.5.x' 2016-10-06 17:09:24 +02:00
Stephane Nicoll
c06dc33bf6 Generate deprecated meta-data for deprecated @Bean methods
This commit makes sure that a meta-data group exposed via a deprecated
`@Bean` method is deprecated as well. This also works if the class
in which the bean method is defined is itself deprecated.

Closes gh-7100
2016-10-06 17:08:49 +02:00
Andy Wilkinson
c465fcefad Merge branch '1.5.x' 2016-10-06 15:53:19 +01:00
Andy Wilkinson
9b8f33df6d Merge branch '1.4.x' into 1.5.x 2016-10-06 15:53:07 +01:00
Andy Wilkinson
20a2db79bd Separate conditions that did and did not match in auto-config report
Closes gh-7098
2016-10-06 15:52:45 +01:00
Stephane Nicoll
7474b53020 Add reference to RestFB Messenger 2016-10-06 15:15:40 +02:00
Stephane Nicoll
f6f07dd426 Merge branch '1.5.x' 2016-10-06 13:35:44 +02:00
Stephane Nicoll
0fe0ad4cfb Merge branch '1.4.x' into 1.5.x 2016-10-06 13:35:32 +02:00
Stephane Nicoll
668993c4bf Fix typo
Closes gh-7117
2016-10-06 13:35:21 +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
cbb3418059 Merge pull request #7004 from master
* pr/7004:
  Polish contribution
  Allow configuration to specify randomly generated database name
2016-10-06 13:29:38 +02:00
Stephane Nicoll
03961e6692 Polish contribution
Closes gh-7004
2016-10-06 13:28:23 +02:00
Rob Fletcher
7fcb197092 Allow configuration to specify randomly generated database name
See gh-7004
2016-10-06 11:40:19 +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
Stephane Nicoll
2ff41ce9cc Merge branch '1.5.x' 2016-10-06 09:35:15 +02:00
Stephane Nicoll
200e246238 Merge branch '1.4.x' into 1.5.x 2016-10-06 09:35:01 +02:00
Stephane Nicoll
e9f43f30df Merge pull request #7111 from izeye:string-format
* pr/7111:
  Remove unused parameters in String.format()
2016-10-06 09:34:45 +02:00
Johnny Lim
91254f2110 Remove unused parameters in String.format()
Closes gh-7111
2016-10-06 09:34:32 +02:00
Andy Wilkinson
59ce40edbc Merge branch '1.5.x' 2016-10-05 17:03:37 +01:00
Andy Wilkinson
31e6819a6c Merge branch '1.4.x' into 1.5.x 2016-10-05 17:03:27 +01:00
Andy Wilkinson
97cf2e9677 Polish new tests for the Gradle plugin's deprecated ID
The output capture for the deprecation warning only appears to work
when the test is run in isolation. I can't figure out why that's the
case, particularly as we have another test class
(BootRunResourceTests) that uses OutputCapture and works reliably.

I'm cutting my loses and removing the use of OutputCapture and the
assertion that the warnings is logged.

See gh-6997
2016-10-05 16:54:37 +01:00
Andy Wilkinson
4b3b293691 Merge branch '1.5.x' 2016-10-05 14:59:20 +01: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
4119da1d9e Merge branch '1.5.x' 2016-10-05 13:48:51 +02:00
Stephane Nicoll
0b9283c3cd Merge pull request #6367 from henrikerola:gh-6351
* pr/6367:
  Polish contribution
  "spring war" should copy resources to WEB-INF/classes
2016-10-05 13:48:37 +02:00
Stephane Nicoll
2d75cc79c0 Polish contribution
Closes gh-6367
2016-10-05 13:47:50 +02:00
Henri Kerola
d07f689446 "spring war" should copy resources to WEB-INF/classes
Closes gh-6351
2016-10-05 13:36:25 +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
fff4376f3d Merge branch '1.5.x' 2016-10-04 13:05:34 +02:00
Stephane Nicoll
d0e49cc413 Merge branch '1.4.x' into 1.5.x 2016-10-04 13:05:18 +02:00