Commit Graph

10971 Commits

Author SHA1 Message Date
Andy Wilkinson
7423ce5e5c Merge branch '1.4.x' into 1.5.x 2017-01-13 18:58:40 -05:00
Andy Wilkinson
f92719c4be Remove unwanted override of git-commit-id-plugin's version 2017-01-13 18:58:19 -05:00
Andy Wilkinson
9b184e3955 Polishing 2017-01-13 18:47:43 -05:00
Andy Wilkinson
ae3434ba4c Merge branch '1.4.x' into 1.5.x 2017-01-13 18:45:50 -05:00
Andy Wilkinson
d2201d5284 Correct copyright dates and enforce that starting year is 2012
Closes gh-7923
2017-01-13 18:43:30 -05:00
Andy Wilkinson
c04f79fd74 Merge branch '1.4.x' into 1.5.x 2017-01-13 15:32:05 -05:00
Andy Wilkinson
bf642ff9db Continue failure analysis when an analyzer throws an exception
Previously, if a failure analyzer threw an exception from its
analyze method, failure analysis would stop.

This commit updates FailureAnalyzers to catch and log any Throwable
thrown by an analyzer and continue to the next available analyzer.

Closes gh-7956
2017-01-13 15:30:09 -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
1ce6e3392a Upgrade to Spring Retry 1.2.0.RELEASE
Closes gh-7984
2017-01-13 15:09:50 -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
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
5ee12a824f Fix assertion
See gh-7962
2017-01-12 09:09:42 -05:00
Andy Wilkinson
5885afdf81 Add dependency management for Spring LDAP
Closes gh-7964
2017-01-12 07:43:07 -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
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
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
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
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
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
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
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
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
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
7a75fb0f38 Fix test-specific configuration metadata
Most of the config keys defined by the `spring-boot-test-autoconfigure`
module can't be overridden because they are mapped with `@PropertyMapping`
on an annotation. It is confusing that such keys are exposed in content
assistance as using them will have no effect.

This commit removes the annotation processor from the build so that the
`@ConfigurationProperties` beans aren't processed anymore. Instead, manual
metadata is written for the two only keys that are effectively used in
regular configuration.

As a result, the `additional-spring-configuration-metadata` file has been
renamed to `spring-configuration-metadata` since nothing is processing it
anymore.

Closes gh-7887
2017-01-06 10:12:57 +01:00
Stephane Nicoll
973a18db2a Fix javadoc generation 2017-01-06 09:44:18 +01:00
Phillip Webb
e9acc7f15a Merge pull request #7733 from eddumelendez/gh-2645
* pr/7733:
  Document LDAP support
  Add LDAP sample
  Polish LDAP contribution
  Add LDAP auto-configuration support
2017-01-05 23:39:06 -08:00
Phillip Webb
554f6c8714 Document LDAP support
Add documentation for the LDAP support.

Closes gh-7733
2017-01-05 23:37:12 -08:00
Phillip Webb
f96294b63b Add LDAP sample
Add an LDAP sample application.

See gh-7733
2017-01-05 23:36:29 -08:00
Phillip Webb
10de30ff11 Polish LDAP contribution
See gh-7733
2017-01-05 23:35:43 -08:00
Eddú Meléndez
6a84c369fd Add LDAP auto-configuration support
Add auto-configuration support for spring-ldap and spring-data-ldap.

See gh-2645
See gh-7733
2017-01-05 23:34:50 -08:00
Madhura Bhave
4ea47220e9 Match nested paths for insensitive actuators
Update `ManagementWebSecurityAutoConfiguration` to match nested path
for insensitive actuators.

Prior to this commit, when Spring Security was on the classpath
nested paths were considered sensitive (even if the actuator
endpoint was not sensitive). i.e. when setting
`endpoints.env.sensitive=false` `/env` could be accessed without
authentication but `/env/user` could not.

Fixes gh-7868
Closes gh-7881
2017-01-05 18:45:30 -08:00
Phillip Webb
18aa9be4fb Merge branch '1.4.x' into 1.5.x 2017-01-05 18:16:42 -08:00
Phillip Webb
21bfe52694 Add test to check class resources aren't exposed
Closes gh-7880
2017-01-05 18:15:50 -08:00
Phillip Webb
0fca9aaccb Polish Mockito 2.0 support 2017-01-05 16:42:12 -08:00
Phillip Webb
abb8e3663a Polish Mockito 2.0 support 2017-01-05 16:28:59 -08:00