Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,241 Commits 23 Branches 0 Tags
1448902c141a7ab680af94e9e82f81f05ab7163a
Commit Graph

1591 Commits

Author SHA1 Message Date
Stephane Nicoll
1448902c14 Merge branch '1.5.x' 2016-10-28 13:31:56 +02: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
bbea134e1c Merge branch '1.5.x' 2016-10-26 11:32:53 +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
547a3554dd Merge branch '1.5.x' 2016-10-26 09:22: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
f0798253a3 Merge branch '1.5.x' 2016-10-24 22:16:34 +01: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
7be16c7b54 Merge branch '1.5.x' 2016-10-24 14:37:25 +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
e509278580 Merge branch '1.5.x' 2016-10-24 11:39:38 +02: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
363798e9ad Fix unresolved merge commit 
Closes gh-7206
 2016-10-23 07:51:08 +02:00
Stephane Nicoll
7fc2566650 Merge branch '1.5.x' 2016-10-22 13:57:00 +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
702d904d53 Merge branch '1.5.x' 2016-10-19 16:51:23 +01: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
8a547facd1 Merge branch '1.5.x' 2016-10-19 10:52:07 +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
57450042bb Merge branch '1.5.x' 2016-10-19 10:44:27 +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
3dd0b9d59a Merge branch '1.5.x' 2016-10-19 10:37:00 +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
d79546da74 Merge branch '1.5.x' 2016-10-17 17:52:29 +03: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
d65a843856 Merge branch '1.5.x' 2016-10-12 10:37:38 +02: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
d5c3a8ac76 Merge branch '1.5.x' 2016-10-12 10:30:37 +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
b0cbe1fdc7 Merge branch '1.5.x' 2016-10-12 10:04:15 +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
c5cc626d48 Remove remote shell support 
See gh-7044
 2016-10-11 17:59:25 +02:00
Stephane Nicoll
66a3df454f Merge branch '1.5.x' 2016-10-11 17:42:53 +02:00
Stephane Nicoll
cfee9bab81 Deprecate remote shell support 
Closes gh-7044
 2016-10-11 17:39:28 +02:00
Stephane Nicoll
7f2806bd19 Merge branch '1.5.x' 2016-10-11 17:06:04 +02:00