Commit Graph

10332 Commits (6100b3e85025ee39c644fa52cd9d24d3e07b2ebc)
 

Author SHA1 Message Date
Andy Wilkinson 6100b3e850 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 66915a456a Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Andy Wilkinson 1d4cee9460 Drop support for the old spring-boot Gradle plugin ID
Closes gh-7859
8 years ago
Andy Wilkinson dc01f40f47 Upgrade to Spring Integration 5.0.0.M2
Closes gh-7768
8 years ago
Andy Wilkinson 446e9824c6 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 689721de7a Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 8b0ecab181 Add dependency management for spring-plugin-metadata
Closes gh-7864
8 years ago
Stephane Nicoll b4ceb46a6b Merge branch '1.5.x' 8 years ago
Stephane Nicoll 5ee12a824f Fix assertion
See gh-7962
8 years ago
Andy Wilkinson 99ffeb819f Merge branch '1.5.x' 8 years ago
Andy Wilkinson 5885afdf81 Add dependency management for Spring LDAP
Closes gh-7964
8 years ago
Andy Wilkinson 78a06c3278 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 65025d8dab Enable Neo4J's open in view interceptor by default
Closes gh-7943
8 years ago
Phillip Webb 9159c87bf9 Polish 8 years ago
Stephane Nicoll 5898a17807 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 766816f600 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
drumonii bb5819b879 Fix configure a datasource reference doc link
Closes gh-7911
8 years ago
Andy Wilkinson ce2256d7dc Merge branch '1.5.x' 8 years ago
Andy Wilkinson db56e1cd00 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson bb4777c920 Merge pull request #7937 from Michael Simons
* gh-7937:
  Update springloaded version to 1.2.6.RELEASE in Maven-related docs
8 years ago
Michael J. Simons 3c291150d6 Update springloaded version to 1.2.6.RELEASE in Maven-related docs
Closes gh-7937
8 years ago
Andy Wilkinson 891045880d Merge branch '1.5.x' 8 years ago
Andy Wilkinson 8934dfaecf Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 6a9397283c Merge pull request #7937 from Michael Simons
* gh-7937:
  Update springloaded version to 1.2.6.RELEASE in Gradle-related docs
8 years ago
Michael J. Simons ddca9a1687 Update springloaded version to 1.2.6.RELEASE in Gradle-related docs
Closes gh-7937
8 years ago
Stephane Nicoll a2bd186a78 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 8596af30fc Merge pull request #7915 from kazuki43zoo:improve-kafka-docs
* pr/7915:
  Fix heading level for kafka docs
8 years ago
Kazuki Shimizu 0401ba8429 Fix heading level for kafka docs
Closes gh-7915
8 years ago
Stephane Nicoll a2d55428ef Merge branch '1.5.x' 8 years ago
Stephane Nicoll fefc66625f Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 7c161b9920 Merge pull request #7907 from eddumelendez:fix_assertions
* pr/7907:
  Fix incomplete assertions
8 years ago
Eddú Meléndez f896ff9a10 Fix incomplete assertions
Closes gh-7907
8 years ago
Stephane Nicoll d039e4a94f Merge branch '1.5.x' 8 years ago
Stephane Nicoll 49828d9377 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll b9eda3f26b Document favicon support
Closes gh-7903
8 years ago
Stephane Nicoll 9da1c95325 Merge branch '1.5.x' 8 years ago
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
8 years ago
Stephane Nicoll 9afa52c18f Merge branch '1.5.x' 8 years ago
Stephane Nicoll 4523927e28 Polish 8 years ago
Stephane Nicoll fcbed8ffd9 Upgrade to Spring Data Ingalls RC1
See gh-6785
8 years ago
Stephane Nicoll 1efb0cbcdf Merge branch '1.5.x' 8 years ago
Stephane Nicoll 7d81de1469 Fix doc generation
For some reason the documentation worked locally with 973a18d but does not
on CI.
8 years ago
Stephane Nicoll dbb9a1bd20 Merge branch '1.5.x' 8 years ago
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
8 years ago
Stephane Nicoll 53accf920f Merge branch '1.5.x' 8 years ago
Stephane Nicoll 973a18db2a Fix javadoc generation 8 years ago
Phillip Webb b99c2daf31 Fixup broken version number 8 years ago
Phillip Webb b9702c9d36 Fix broken version number 8 years ago