Commit Graph

8926 Commits

Author SHA1 Message Date
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
11cad9e0cb Fix sample in ref doc
Closes gh-7142
2016-10-12 10:27:51 +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
Phillip Webb
db3f488d5a Polish 2016-10-11 17:54:00 -07:00
Andy Wilkinson
0333416952 Update WelcomePageHandlerMapping to handle reqs with no Accept header
Closes gh-7138
2016-10-11 13:02:36 +01:00
Stephane Nicoll
b1d2552ede Merge pull request #7137 from michael-simons:polish_application-properties-docs
* pr/7137:
  Add missing parentheses
2016-10-11 08:31:59 +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
Andy Wilkinson
a5b4c8e6db Make cycle clearer in bean currently in creation failure analysis
Note: the fully-qualified references to @Configuration in some of the
test configuration classes are required to work around a bug in javac.
1.8.0_102 (and earlier). Without them, compilation fails as it cannot
resolve the symbol despite the import statement and the unqualified
references working elsewhere in the same source file.

Closes gh-7056
2016-10-07 17:07:44 +01:00
Stephane Nicoll
9861cb7e9c Expand the note regarding LiveReload
See gh-7080
2016-10-07 14:21:12 +02:00
Stephane Nicoll
f2511cfa49 Merge pull request #7127 from herau:fix/spring-boot-docs-thymeleaf
* pr/7127:
  Fix typo
2016-10-07 14:15:04 +02:00
Aurélien Leboulanger
2c64661b58 Fix typo
Closes gh-7127
2016-10-07 14:14:50 +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
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
668993c4bf Fix typo
Closes gh-7117
2016-10-06 13:35:21 +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
0f97ccf2fa Clarify dependency override instructions for Thymeleaf 3
Closes gh-7097
2016-10-06 11:21:24 +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
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
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
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
8d2aedc5a8 Merge branch '1.3.x' into 1.4.x 2016-10-04 13:05:01 +02:00
Stephane Nicoll
7f1118b87a Merge pull request #7073 from garyrussell:si4210
* pr/7073:
  Upgrade to Spring Integration 4.2.11
2016-10-04 13:04:39 +02:00
Gary Russell
0ffc7dc13f Upgrade to Spring Integration 4.2.11
Closes gh-7073
2016-10-04 13:04:15 +02:00
Stephane Nicoll
dcb3f31901 Merge pull request #7074 from garyrussell:si433-14
* pr/7074:
  Upgrade to Spring Integration 4.3.4, AMQP 1.6.3
2016-10-04 13:00:05 +02:00
Gary Russell
ad3179b9ee Upgrade to Spring Integration 4.3.4, AMQP 1.6.3
Closes gh-7074
2016-10-04 12:59:41 +02:00
Stephane Nicoll
dfb3675937 Merge pull request #7085 from dstine:docs-typos
* pr/7085:
  Fix a typo
2016-10-04 12:59:02 +02:00
Dan Stine
0926b66123 Fix a typo
Closes gh-7085
2016-10-04 12:58:37 +02:00
Phillip Webb
bd341cbac8 Polish 2016-10-03 22:51:21 -07:00
Phillip Webb
cdeed8e934 Merge pull request #7089 from mbhave/gh-7065
* pr/7089:
  Fix NoClassDefFoundError when Mockito is missing
2016-10-03 22:27:42 -07:00
Madhura Bhave
16fe332f51 Fix NoClassDefFoundError when Mockito is missing
Update MockReset class to check for the presence of the MockUtil class
before attempting to use it.

Fixes gh-7065
2016-10-03 22:27:20 -07:00
Phillip Webb
3326841a97 Formatting 2016-10-03 22:19:35 -07:00
Phillip Webb
39ed0d4dfb Polish 2016-10-03 21:58:13 -07:00
Phillip Webb
f59cc25e2b Fix eclipse warnings 2016-10-03 21:51:16 -07:00
Stephane Nicoll
9f7e97b23f Improve war to executable app documentation
Closes gh-7040
2016-10-03 12:28:25 +02:00
Stephane Nicoll
a9b610c4fc Deprecate ResourceLoaderAware callback
Closes gh-6986
2016-10-03 11:42:46 +02:00
Stephane Nicoll
dc067b0fc4 Update Ant sample’s spring-boot-antlib dependency during prepare
Closes gh-6978
2016-10-03 11:03:45 +02:00
Stephane Nicoll
8c1b736bb0 Fix list property to be mutable
Closes gh-7068
2016-10-03 10:40:46 +02:00
Stephane Nicoll
4dfdce5a49 Merge pull request #7081 from izeye:polish-20161002
* pr/7081:
  Polish
2016-10-02 11:08:13 +02:00
Johnny Lim
503d735fdd Polish
Closes gh-7081
2016-10-02 11:07:04 +02:00
Stephane Nicoll
8feef4560b Merge pull request #6991 from Stummi:patch-1
* pr/6991:
  Fix thymeleaf-layout-dialect.version in doc
2016-10-01 13:20:18 +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
Stephane Nicoll
e56119165e Close JestClient on shutdown
Closes gh-7051
2016-09-30 10:51:48 +02:00
Stephane Nicoll
8ed20068ca Fix list property to be mutable
Closes gh-7045
2016-09-30 10:34:25 +02:00
Andy Wilkinson
cf4142dbc0 Prevent htmlunit from pulling in commons-logging
Update dependency management to exclude commons-logging and add
an enforcer rule to spring-boot-samples to try and prevent unwanted
commons-logging dependencies from sneaking back in again.

Closes gh-7067
2016-09-29 21:08:15 +01:00