Andy Wilkinson
20e8c36590
Merge branch '1.4.x' into 1.5.x
2016-11-01 14:26:18 +00:00
Andy Wilkinson
6828997651
Correct minimum recommended version of Gradle to be 2.9 rather than 2.8
...
Closes gh-7189
See gh-6884
2016-11-01 14:25:07 +00:00
Andy Wilkinson
8b631390ba
Merge branch '1.4.x' into 1.5.x
2016-11-01 13:36:00 +00:00
Andy Wilkinson
307fd94b4f
Correct typo in the documentation for RestTemplateBuilder customization
...
See gh-7054
2016-11-01 13:35:27 +00:00
Andy Wilkinson
ffbbd2a5f8
Merge branch '1.4.x' into 1.5.x
2016-11-01 11:06:56 +00:00
Andy Wilkinson
be78dc4b99
Flesh out the documentation on RestTemplateBuilder customization
...
Closes gh-7054
2016-11-01 11:06:38 +00:00
Phillip Webb
97fee46682
Revert Layout changes
...
This reverts commits:
- 974ec92ad6 .
- 537e0c12c2 .
- 500a3df6e9 .
2016-10-31 21:08:15 -07:00
Stephane Nicoll
4f06e52d7e
Allow adding additional tld skip patterns
...
This commit improves `TomcatEmbeddedServletContainerFactory` so that tld
skip patterns can be set or added to an existing set. An additional
`server.tomcat.additional-tld-skip-patterns` is now being exposed to
easily add patterns via configuration.
Closes gh-5010
2016-10-31 10:15:16 +01:00
Dave Syer
537e0c12c2
Support for custom layout types to change loader classes
...
A layout can
also optionally change the loader jar that is unpacked in the root
of the repackaged archive by implementing a new method in Layout.
2016-10-30 11:24:29 +00:00
Stephane Nicoll
c4d8fb1c09
Merge branch '1.4.x' into 1.5.x
2016-10-30 10:59:02 +01:00
Stephane Nicoll
6d50e26b70
Polish contribution
...
Closes gh-7215
2016-10-30 10:57:58 +01:00
Johnny Lim
1546cd4072
Update documentation on Actuator hypermedia support
...
Spring Boot Actuator hypermedia support has been disabled by default via
c7c685f , but its documentation wasn't updated.
This commit updates the documentation related to the change.
See gh-7215
2016-10-30 10:57:27 +01:00
Stephane Nicoll
f6959ccbcd
Merge branch '1.4.x' into 1.5.x
2016-10-28 13:31:38 +02:00
Stephane Nicoll
7f8849c62b
Merge branch '1.3.x' into 1.4.x
2016-10-28 13:31:19 +02:00
Stephane Nicoll
5863e6f78c
Fix class name in generated meta-data
...
Previously, the algorithm that computes the String representation of a
class reference and a property type was shared. This lead to generic
information for group's `type` and `sourceType` property.
This commit separates that logic in two: `getQualifiedName` is now
responsible to generate a fully qualified class name while the existing
`getType` is solely responsible to generate a type representation for the
property. Only the latter has generic information.
Closes gh-7236
2016-10-28 13:23:47 +02:00
Stephane Nicoll
ed7de8eb60
Polish contribution
...
Also add rotate attribute to Undertow
Closes gh-7225
2016-10-26 11:31:17 +02:00
Stephane Nicoll
b37b3f7c59
Merge pull request #7224 from ajayk:adoc-indentation
...
* pr/7224:
Fix indentation for spring.jms.template.* keys
2016-10-26 09:21:58 +02:00
ajk
548190673c
Fix indentation for spring.jms.template.* keys
...
Closes gh-7224
2016-10-26 09:21:24 +02:00
Andy Wilkinson
5b9eaab6c0
Merge branch '1.4.x' into 1.5.x
2016-10-24 22:16:23 +01:00
Andy Wilkinson
ee7141cf63
Allow PropertyLauncher loader.path to be configured using manifest
...
Closes gh-7178
2016-10-24 22:14:56 +01:00
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
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
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
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
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
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
Andy Wilkinson
be33827f49
Simplify property validation sample and document need for static bean method
...
Closes gh-6627
2016-09-20 21:33:31 +01:00
Spring Buildmaster
5f959b074f
Next Development Version
2016-09-20 20:20:06 +00:00
Andy Wilkinson
6565ff616a
Clarify documentation on using a Spring Boot app as a dependency
...
Closes gh-6812
2016-09-19 14:00:15 +01:00
Johnny Lim
a994b11a73
Polish
2016-09-18 23:38:21 -07:00
Phillip Webb
7ec14774a8
Polish
2016-09-18 23:37:46 -07:00
Stephane Nicoll
b69fd9229d
Merge branch '1.3.x'
2016-09-18 17:12:39 +02:00
Stephane Nicoll
04b261984e
Polish
2016-09-18 17:12:21 +02:00
Mike Gehard
3d8b51d2e4
Link to Spring Security OAuth2 reference docs
...
Update documentation to include a link to Spring Security OAuth2's
reference documentation.
Closes gh-6909
2016-09-17 19:46:19 -07:00
Stephane Nicoll
6ec1ac0aa0
Fix doc syntax
...
See gh-6593
2016-09-17 08:04:00 +02:00
Phillip Webb
0eab3e0c5a
Drop printed link to reference documentation
...
Tweak the fix from 50c68a49 to no longer print a link the reference
documentation.
See gh-6593
2016-09-16 17:52:25 -07:00
Phillip Webb
825dd0a26c
Merge branch '1.3.x'
2016-09-16 15:07:18 -07:00
Phillip Webb
b97e0bd471
Allow HttpPutFormContentFilter to be disabled
...
Add `spring.mvc.formcontent.putfilter.enabled` property to allow the
HttpPutFormContentFilter to be disabled.
Fixes gh-6519
2016-09-16 14:14:21 -07:00
Stephane Nicoll
b77eddb8bb
Merge branch '1.3.x'
2016-09-16 16:58:53 +02:00
Stephane Nicoll
c2cdc1424b
Polish documentation
...
Add an explicit note that states that "spring.datasource.url" (or more
specifically "spring.datasource.class-name" that is inferred from the
former) is necessary to connect to a database. If the class-name isn't
specified, Spring Boot will attempt to auto-configure an embedded
database.
Closes gh-6907
2016-09-16 16:58:39 +02:00
Stephane Nicoll
50c68a497b
Improve startup error message
...
This commit improves the startup error message so that it does not
reference `--debug` anymore. Such command-line switch only works when
the application is started using `java -jar`.
The error message now refers directly to a section of the documentation
that provides more details and links to more useful examples.
Closes gh-6593
2016-09-16 16:37:50 +02:00
Phillip Webb
5f7897ba41
Refine inner-class test @Configuration detection
...
Update detection logic to also consider `@Rules` classes. Also make the
documentation a little clearer.
Fixes gh-6768
2016-09-15 16:55:49 -07:00
Kazuki Shimizu
2cedb45c68
Document devtools properties in config load order
...
Add reference to `~/spring-boot-devtools.properties` in
"Externalized Configuration" section.
Closes gh-6891
2016-09-15 10:28:45 -07:00