spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-26 20:09:02 +00:00
Code Issues Projects Releases Wiki Activity
10,337 Commits 28 Branches 395 Tags
3570b06ebfa2cd8291d2a4cfdd9228e259bf5f11
Commit Graph
10337 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson 3570b06ebf Merge branch '1.5.x' 2017-01-13 15:18:40 -05:00
Andy Wilkinson 3342504d7a Merge branch '1.4.x' into 1.5.x 2017-01-13 15:18:34 -05:00
Andy Wilkinson 7298b2dc1b Set value of javax.servlet.error.exception_type to a Class not a String 
Previously, ErrorPageFilter set the value of
javax.servlet.error.exception_type to be the name of the exception,
(a java.lang.String). This commit changes it to be a java.lang.Class
as required by the Servlet spec.

Closes gh-7925
 2017-01-13 15:15:58 -05:00
Andy Wilkinson 8ca426281b Merge branch '1.5.x' 2017-01-13 15:11:07 -05:00
Andy Wilkinson 1ce6e3392a Upgrade to Spring Retry 1.2.0.RELEASE 
Closes gh-7984
 2017-01-13 15:09:50 -05:00
Andy Wilkinson 6100b3e850 Merge branch '1.5.x' 2017-01-13 07:29:26 -05:00
Andy Wilkinson 66915a456a Merge branch '1.4.x' into 1.5.x 2017-01-13 07:29:17 -05:00
Andy Wilkinson 6f7d1de167 Remove redundant logic from OAuth2MethodSecurityConfiguration 
Previously, OAuth2MethodSecurityConfiguration set the
PermissionEvaluator on the expression evaluator by looking in the
context for a PermissionEvaluator bean. This is unnecessary as
GlobalMethodSecurityConfiguration already does the same thing and does
so after the post-processor in OAuth2MethodSecurityConfiguration has
run. This commit removes the redundant logic and adds tests to check
that both the PermissionEvaluator and the RoleHierarchy are set use
beans in the context.

Closes gh-7979
 2017-01-13 07:28:57 -05:00
Andy Wilkinson 1d4cee9460 Drop support for the old spring-boot Gradle plugin ID 
Closes gh-7859
 2017-01-13 06:47:02 -05:00
Andy Wilkinson dc01f40f47 Upgrade to Spring Integration 5.0.0.M2 
Closes gh-7768
 2017-01-12 16:53:44 -05:00
Andy Wilkinson 446e9824c6 Merge branch '1.5.x' 2017-01-12 11:09:47 -05:00
Andy Wilkinson 689721de7a Merge branch '1.4.x' into 1.5.x 2017-01-12 11:09:36 -05:00
Andy Wilkinson 8b0ecab181 Add dependency management for spring-plugin-metadata 
Closes gh-7864
 2017-01-12 11:09:25 -05:00
Stephane Nicoll b4ceb46a6b Merge branch '1.5.x' 2017-01-12 09:09:57 -05:00
Stephane Nicoll 5ee12a824f Fix assertion 
See gh-7962
 2017-01-12 09:09:42 -05:00
Andy Wilkinson 99ffeb819f Merge branch '1.5.x' 2017-01-12 07:44:23 -05:00
Andy Wilkinson 5885afdf81 Add dependency management for Spring LDAP 
Closes gh-7964
 2017-01-12 07:43:07 -05:00
Andy Wilkinson 78a06c3278 Merge branch '1.5.x' 2017-01-10 17:05:09 -05:00
Andy Wilkinson 65025d8dab Enable Neo4J's open in view interceptor by default 
Closes gh-7943
 2017-01-10 17:04:51 -05:00
Phillip Webb 9159c87bf9 Polish 2017-01-10 09:51:11 -05:00
Stephane Nicoll 5898a17807 Merge branch '1.5.x' 2017-01-10 09:30:21 -05:00
Stephane Nicoll 766816f600 Merge branch '1.4.x' into 1.5.x 2017-01-10 09:30:09 -05:00
Stephane Nicoll a427982d77 Merge pull request #7911 from drumonii:fix-configure-a-datasource-doc-ref-link 
* pr/7911:
  Fix configure a datasource reference doc link
 2017-01-10 09:29:55 -05:00
drumonii bb5819b879 Fix configure a datasource reference doc link 
Closes gh-7911
 2017-01-10 09:29:35 -05:00
Andy Wilkinson ce2256d7dc Merge branch '1.5.x' 2017-01-10 09:13:37 -05:00
Andy Wilkinson db56e1cd00 Merge branch '1.4.x' into 1.5.x 2017-01-10 09:13:27 -05:00
Andy Wilkinson bb4777c920 Merge pull request #7937 from Michael Simons 
* gh-7937:
  Update springloaded version to 1.2.6.RELEASE in Maven-related docs
 2017-01-10 09:13:20 -05:00
Michael J. Simons 3c291150d6 Update springloaded version to 1.2.6.RELEASE in Maven-related docs 
Closes gh-7937
 2017-01-10 09:13:00 -05:00
Andy Wilkinson 891045880d Merge branch '1.5.x' 2017-01-10 09:10:36 -05:00
Andy Wilkinson 8934dfaecf Merge branch '1.4.x' into 1.5.x 2017-01-10 09:10:26 -05:00
Andy Wilkinson 6a9397283c Merge pull request #7937 from Michael Simons 
* gh-7937:
  Update springloaded version to 1.2.6.RELEASE in Gradle-related docs
 2017-01-10 09:10:11 -05:00
Michael J. Simons ddca9a1687 Update springloaded version to 1.2.6.RELEASE in Gradle-related docs 
Closes gh-7937
 2017-01-10 09:08:35 -05:00
Stephane Nicoll a2bd186a78 Merge branch '1.5.x' 2017-01-09 14:09:55 -05:00
Stephane Nicoll 8596af30fc Merge pull request #7915 from kazuki43zoo:improve-kafka-docs 
* pr/7915:
  Fix heading level for kafka docs
 2017-01-09 14:09:44 -05:00
Kazuki Shimizu 0401ba8429 Fix heading level for kafka docs 
Closes gh-7915
 2017-01-09 14:08:54 -05:00
Stephane Nicoll a2d55428ef Merge branch '1.5.x' 2017-01-08 09:20:28 +01:00
Stephane Nicoll fefc66625f Merge branch '1.4.x' into 1.5.x 2017-01-08 09:20:00 +01:00
Stephane Nicoll 7c161b9920 Merge pull request #7907 from eddumelendez:fix_assertions 
* pr/7907:
  Fix incomplete assertions
 2017-01-08 09:13:24 +01:00
Eddú Meléndez f896ff9a10 Fix incomplete assertions 
Closes gh-7907
 2017-01-08 09:12:54 +01:00
Stephane Nicoll d039e4a94f Merge branch '1.5.x' 2017-01-08 09:05:54 +01:00
Stephane Nicoll 49828d9377 Merge branch '1.4.x' into 1.5.x 2017-01-08 09:05:27 +01:00
Stephane Nicoll b9eda3f26b Document favicon support 
Closes gh-7903
 2017-01-08 09:04:53 +01:00
Stephane Nicoll 9da1c95325 Merge branch '1.5.x' 2017-01-06 15:29:06 +01:00
Stephane Nicoll 88db0eab11 Revert upgrade to HTMLUnit 2.23 
This commit reverts the upgrade from HTMLUnit 2.11 to 2.23. As of HTMLUnit
2.22, `websocket-client` is no longer provided and triggers the following
issue:

https://github.com/SeleniumHQ/htmlunit-driver/issues/22

See gh-7232
See gh-7895
 2017-01-06 15:28:45 +01:00
Stephane Nicoll 9afa52c18f Merge branch '1.5.x' 2017-01-06 12:45:20 +01:00
Stephane Nicoll 4523927e28 Polish 2017-01-06 12:44:32 +01:00
Stephane Nicoll fcbed8ffd9 Upgrade to Spring Data Ingalls RC1 
See gh-6785
 2017-01-06 11:52:12 +01:00
Stephane Nicoll 1efb0cbcdf Merge branch '1.5.x' 2017-01-06 11:50:19 +01:00
Stephane Nicoll 7d81de1469 Fix doc generation 
For some reason the documentation worked locally with 973a18d but does not
on CI.
 2017-01-06 10:36:29 +01:00
Stephane Nicoll dbb9a1bd20 Merge branch '1.5.x' 2017-01-06 10:13:20 +01:00