root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
9,307 Commits 23 Branches 348 Tags 293 MiB
Commit Graph

1614 Commits

Author SHA1 Message Date
Andy Wilkinson 7c3d7d882a Merge branch '1.5.x' 2016-11-01 16:25:07 +00:00
Andy Wilkinson ef3395beaa Raise the minimum supported version of Gradle to 2.9 
Closes gh-6884
 2016-11-01 16:25:02 +00:00
Stephane Nicoll f28fa3e1ab Merge branch '1.5.x' 2016-11-01 16:48:38 +01:00
Stephane Nicoll a733c62689 Fix typo 2016-11-01 16:48:24 +01:00
Andy Wilkinson d58c79d9b7 Merge branch '1.5.x' 2016-11-01 14:26:22 +00:00
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 14d58b49dd Merge branch '1.5.x' 2016-11-01 13:36:05 +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 5bc8101725 Merge branch '1.5.x' 2016-11-01 11:07:01 +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 98a3ae9ac4 Merge branch '1.5.x' 2016-10-31 23:13:37 -07:00
Phillip Webb 97fee46682 Revert Layout changes 
This reverts commits:
- 974ec92ad6.
- 537e0c12c2.
- 500a3df6e9.
 2016-10-31 21:08:15 -07:00
Stephane Nicoll 713f4dd723 Merge branch '1.5.x' 2016-10-31 10:18:51 +01: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 5f5e3bf6c3 Merge branch '1.5.x' 2016-10-30 11:24:52 +00: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 99af8ca414 Merge branch '1.5.x' 2016-10-30 10:59:22 +01: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 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