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
bbea134e1c
Merge branch '1.5.x'
2016-10-26 11:32:53 +02:00
ed7de8eb60
Polish contribution
...
Also add rotate attribute to Undertow
Closes gh-7225
2016-10-26 11:31:17 +02:00
547a3554dd
Merge branch '1.5.x'
2016-10-26 09:22:17 +02:00
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
548190673c
Fix indentation for spring.jms.template.* keys
...
Closes gh-7224
2016-10-26 09:21:24 +02:00
f0798253a3
Merge branch '1.5.x'
2016-10-24 22:16:34 +01:00
5b9eaab6c0
Merge branch '1.4.x' into 1.5.x
2016-10-24 22:16:23 +01:00
ee7141cf63
Allow PropertyLauncher loader.path to be configured using manifest
...
Closes gh-7178
2016-10-24 22:14:56 +01:00
7be16c7b54
Merge branch '1.5.x'
2016-10-24 14:37:25 +01:00
a56bf44b39
Merge branch '1.4.x' into 1.5.x
2016-10-24 14:37:20 +01:00
8150cbd0d1
Remove commentary on Neo4j's licence
...
Closes gh-7214
2016-10-24 14:36:35 +01:00
e509278580
Merge branch '1.5.x'
2016-10-24 11:39:38 +02:00
eddb10e4c9
Merge branch '1.4.x' into 1.5.x
2016-10-24 11:39:26 +02:00
469a4e3444
Improve systemd service documentation
...
Closes gh-6954
2016-10-24 11:37:53 +02:00
363798e9ad
Fix unresolved merge commit
...
Closes gh-7206
2016-10-23 07:51:08 +02:00
7fc2566650
Merge branch '1.5.x'
2016-10-22 13:57:00 +02:00
b0474b7c9d
Merge branch '1.4.x' into 1.5.x
2016-10-22 13:56:42 +02:00
4621f82b0e
Correct typo in docs
...
Closes gh-7203
2016-10-22 13:56:07 +02:00
702d904d53
Merge branch '1.5.x'
2016-10-19 16:51:23 +01:00
d7e2708687
Merge branch '1.4.x' into 1.5.x
2016-10-19 16:51:14 +01:00
999fa123df
Deprecate support for Gradle 2.7 and earlier
2016-10-19 16:50:35 +01:00
8a547facd1
Merge branch '1.5.x'
2016-10-19 10:52:07 +01:00
c9e6aff374
Merge branch '1.4.x' into 1.5.x
2016-10-19 10:51:53 +01:00
639b0f554d
Suggest the use of @AutoConfigureMockMvc when using WebEnvironment.MOCK
...
Closes gh-7112
2016-10-19 10:51:42 +01:00
57450042bb
Merge branch '1.5.x'
2016-10-19 10:44:27 +01:00
7962818294
Merge branch '1.4.x' into 1.5.x
2016-10-19 10:44:20 +01:00
6ac041c43b
Update Thymeleaf 3 related versions in docs and sample
...
See gh-6991
Closes gh-7183
2016-10-19 10:43:38 +01:00
3dd0b9d59a
Merge branch '1.5.x'
2016-10-19 10:37:00 +01:00
7d68c14d03
Merge branch '1.4.x' into 1.5.x
2016-10-19 10:36:48 +01:00
4b1ddddea3
Update docs on using Thmyeleaf 3 to reference latest version
...
Closes gh-7183
2016-10-19 10:34:11 +01:00
d79546da74
Merge branch '1.5.x'
2016-10-17 17:52:29 +03:00
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
d65a843856
Merge branch '1.5.x'
2016-10-12 10:37:38 +02:00
2d995661f4
Merge branch '1.4.x' into 1.5.x
2016-10-12 10:37:26 +02:00
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
d5c3a8ac76
Merge branch '1.5.x'
2016-10-12 10:30:37 +02:00
c6f23000be
Merge branch '1.4.x' into 1.5.x
2016-10-12 10:30:19 +02:00
11cad9e0cb
Fix sample in ref doc
...
Closes gh-7142
2016-10-12 10:27:51 +02:00
b0cbe1fdc7
Merge branch '1.5.x'
2016-10-12 10:04:15 +02:00
f254e1227f
Merge branch '1.4.x' into 1.5.x
2016-10-12 10:03:59 +02:00
0d3318796e
Merge branch '1.3.x' into 1.4.x
2016-10-12 10:03:41 +02:00
bd2956c3f0
Fix `metricsFilter` reference in doc
...
Closes gh-7147
2016-10-12 10:03:23 +02:00
c5cc626d48
Remove remote shell support
...
See gh-7044
2016-10-11 17:59:25 +02:00
66a3df454f
Merge branch '1.5.x'
2016-10-11 17:42:53 +02:00
cfee9bab81
Deprecate remote shell support
...
Closes gh-7044
2016-10-11 17:39:28 +02:00
7f2806bd19
Merge branch '1.5.x'
2016-10-11 17:06:04 +02:00
6fb53f90e5
Polish contribution
...
Closes gh-6666
2016-10-11 17:03:10 +02:00
92db3b4803
Merge branch '1.5.x'
2016-10-11 08:33:46 +02:00
18c3d42f45
Merge branch '1.4.x' into 1.5.x
2016-10-11 08:32:43 +02:00
e87cf937e1
Add missing parentheses
...
Closes gh-7137
2016-10-11 08:31:44 +02:00
98f14f2ee9
Polish documentation
...
Closes gh-2642
2016-10-11 08:30:18 +02:00
097c64a91b
Merge branch '1.5.x'
2016-10-10 11:37:51 +02:00
ab2a2579c8
Polish contribution
...
Closes gh-6571
2016-10-10 11:37:21 +02:00
0480a96166
Merge branch '1.5.x'
2016-10-07 14:21:40 +02:00
98b30416ca
Merge branch '1.4.x' into 1.5.x
2016-10-07 14:21:28 +02:00
9861cb7e9c
Expand the note regarding LiveReload
...
See gh-7080
2016-10-07 14:21:12 +02:00
3a86e26977
Merge branch '1.5.x'
2016-10-07 14:15:31 +02:00
5435f03690
Merge branch '1.4.x' into 1.5.x
2016-10-07 14:15:19 +02:00
2c64661b58
Fix typo
...
Closes gh-7127
2016-10-07 14:14:50 +02:00
5a2eae5628
Merge branch '1.5.x'
2016-10-07 10:35:59 +02:00
ed333a67b4
Expose Spring Data Rest RepositoryDetectionStrategy
...
Closes gh-7113
2016-10-07 10:35:48 +02:00
b54566c0cd
Merge branch '1.5.x'
2016-10-06 13:30:14 +02:00
f82e91df39
Merge branch '1.4.x' into 1.5.x
2016-10-06 13:29:53 +02:00
03961e6692
Polish contribution
...
Closes gh-7004
2016-10-06 13:28:23 +02:00
89b1ff1fac
Merge branch '1.5.x'
2016-10-06 11:37:35 +02:00
f684bcc9e5
Merge branch '1.4.x' into 1.5.x
2016-10-06 11:37:20 +02:00
0f97ccf2fa
Clarify dependency override instructions for Thymeleaf 3
...
Closes gh-7097
2016-10-06 11:21:24 +02:00
fe10ea73b0
Merge branch '1.4.x' into 1.5.x
2016-10-05 14:58:42 +01:00
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
f137ec6a3a
Merge branch '1.5.x'
2016-10-05 14:58:02 +01:00
846f264da8
Merge branch '1.4.x' into 1.5.x
2016-10-05 14:57:51 +01:00
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
8b61d15120
Remove deprecated support for commons-dbcp 1
...
See gh-6787
2016-10-05 15:51:14 +02:00
543498f040
Merge branch '1.5.x'
2016-10-05 15:21:23 +02:00
cf28663cd7
Deprecate commons-dbcp 1
...
Closes gh-6787
2016-10-05 15:21:09 +02:00
0d5985b8dd
Merge branch '1.5.x'
2016-10-04 15:01:04 +02:00
07690bab25
Allow customization of the auto-configured JmsTemplate
...
Closes gh-6825
2016-10-04 15:00:42 +02:00
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
4b2970606e
Merge branch '1.4.x' into 1.5.x
2016-10-04 13:37:57 +02:00
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
39534aea6b
Merge branch '1.5.x'
...
# Conflicts:
# spring-boot-dependencies/pom.xml
2016-10-04 13:02:53 +02:00
58050fb72f
Merge branch '1.4.x' into 1.5.x
...
# Conflicts:
# spring-boot-dependencies/pom.xml
2016-10-04 13:01:46 +02:00
0926b66123
Fix a typo
...
Closes gh-7085
2016-10-04 12:58:37 +02:00
e6ab3cef73
Merge branch '1.5.x'
2016-10-03 12:29:14 +02:00
6977dcaf44
Merge branch '1.4.x' into 1.5.x
2016-10-03 12:28:58 +02:00
9f7e97b23f
Improve war to executable app documentation
...
Closes gh-7040
2016-10-03 12:28:25 +02:00
f181421f67
Merge branch '1.5.x'
2016-10-03 11:29:56 +02:00
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
b95b57dbf5
Merge branch '1.5.x'
2016-10-02 11:08:53 +02:00
e643fc5bd1
Merge branch '1.4.x' into 1.5.x
2016-10-02 11:08:33 +02:00
503d735fdd
Polish
...
Closes gh-7081
2016-10-02 11:07:04 +02:00
df9fb51a92
Merge branch '1.5.x'
2016-10-01 13:21:11 +02:00
75f475f2c8
Merge branch '1.4.x' into 1.5.x
2016-10-01 13:20:45 +02:00
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
f82dc8e043
Upgrade to JMS API 2.0
...
Closes gh-7049
2016-09-29 20:33:21 +01:00
241ab10160
Merge branch '1.5.x'
2016-09-29 15:49:04 +01:00
2a035d0748
Remove support for Velocity following its deprecation in 1.4
...
Closes gh-6971
2016-09-29 15:44:36 +01:00
464915d2cc
Remove support for HornetQ following its deprecation in 1.4
...
See gh-6971
2016-09-29 15:44:36 +01:00
ea9faa5f6a
Merge branch '1.5.x'
2016-09-27 10:14:57 +02:00
Stephane Nicoll
ajk
Andy Wilkinson
Vedran Pavic
Ken Dombeck
Raja Dilip Kolli
Michael J. Simons
Aurélien Leboulanger
Dan Stine
Johnny Lim
Michael Stummvoll