Commit Graph

1810 Commits

Author SHA1 Message Date
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
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
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
Kazuki Shimizu 0401ba8429 Fix heading level for kafka docs
Closes gh-7915
2017-01-09 14:08:54 -05: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 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 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
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 53accf920f Merge branch '1.5.x' 2017-01-06 09:44:33 +01:00
Stephane Nicoll 973a18db2a Fix javadoc generation 2017-01-06 09:44:18 +01:00
Phillip Webb c35454e5f4 Merge branch '1.5.x' 2017-01-05 23:40:58 -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 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
Phillip Webb 6776ec2704 Merge branch '1.5.x' 2017-01-05 11:04:37 -08:00
Phillip Webb 565f75438e Polish 2017-01-05 11:04:07 -08:00
Stephane Nicoll 66a9d4e744 Merge branch '1.5.x' 2017-01-05 16:32:10 +01:00
Stephane Nicoll 615804ff34 Polish configuration keys documentation 2017-01-05 16:19:12 +01:00
Dave Syer 21be9ef666 Merge remote-tracking branch 'origin/1.5.x' 2017-01-05 11:59:49 +00:00
Dave Syer fe344df9c5 Change default order of OAuth2 resource server filter chain
The default is now SecurityProperties.ACCESS_OVERRIDE_ORDER-1
(instead of 3), and the user can set it with
security.oauth2.resource.filter-order (as opposed to being hard
coded). The filter is provided by Spring OAuth2 so this change is
a BeanPostProcessor to call a setter on that object.

Fixes gh-5072
2017-01-05 11:58:36 +00:00
Stephane Nicoll 0cfc32e5a1 Merge branch '1.5.x' 2017-01-05 12:25:19 +01:00
Vedran Pavic 6eea679535 Add `LoggersEndpoint` to application properties appendix
Closes gh-7877
2017-01-05 12:24:48 +01:00
Stephane Nicoll de4e3508f1 Merge branch '1.5.x' 2017-01-04 12:42:40 +01:00
Stephane Nicoll 0a26a4146b Make `spring.session.store-type` mandatory
This commit removes the automatic enabling of Redis as the Spring Session
store when it is available. This case is covered by a warning in `1.4.x`
that this commit removes as well.

Closes gh-7858
2017-01-04 12:42:04 +01:00
Stephane Nicoll 9a113e3b64 Merge branch '1.5.x' 2017-01-04 10:48:25 +01:00
Stephane Nicoll bf7271afa5 Upgrade to Couchbase Cache Client 2.1.0
As of 2.1 cache expiration times are to be set in seconds. This commit
migrates to the new method, yet keeping the milliseconds unit.

Closes gh-7824
2017-01-04 10:46:17 +01:00
Stephane Nicoll 2ea7187165 Add a note that CRaSH support will be removed in documentation
Closes gh-7856
2017-01-04 10:10:15 +01:00
Stephane Nicoll 506f6497c0 Merge branch '1.5.x' 2017-01-04 09:56:19 +01:00
Johnny Lim f915ae197a Polish 2017-01-04 09:53:45 +01:00
Phillip Webb 24f5125a8b Merge branch '1.5.x' 2017-01-03 19:01:17 -08:00
Phillip Webb f8a53cf775 Update actuator security documentation
Update documentation to align with the new role based method.

See gh-6889
2017-01-03 18:01:32 -08:00
Phillip Webb 7c51941578 Document Cloud Foundry actuator endpoint support
Add a Cloud Foundry specific section to "Production Ready Features".

See gh-7108
2017-01-03 17:27:14 -08:00
Phillip Webb 2fe4d60b47 Add `management.cloudfoundry.*` meta-data
Update configuration meta-data and appendix to include
`management.cloudfoundry.*` meta-data.

See gh-7108
2017-01-03 17:24:58 -08:00
Phillip Webb 18dcf31aa6 Polish documentation formatting 2017-01-03 17:24:37 -08:00
Stephane Nicoll 85f176da08 Merge branch '1.5.x' 2017-01-03 11:39:33 +01:00
Stephane Nicoll fe89af5e82 Polish contribution
Closes gh-7796
2017-01-03 11:33:57 +01:00
Phillip Webb 4026fa563f Merge branch '1.5.x' 2017-01-02 19:54:26 -08:00
Phillip Webb 5b40eb48e0 Improve MBean without backing Endpoint support
Improve support for MBeans without a backing endpoint by introducing
a `JmxEndpoint` interface. The `JmxEndpoint` is intentionally
similar in design to the `MvcEndpoint` from the `mvc` package and
allows for completely custom JMX beans that are not backed by any
real actuator `Endpoint`.

The `AuditEventsMBean` has been refactored to use the new interface and
has been renamed to `AuditEventsJmxEndpoint`.

See gh-6579
2017-01-02 19:43:14 -08:00
Vedran Pavic 2f1e4f0c02 Add MVC and JMX endpoints to retrieve audit events
Add MVC and JMX specific endpoints that allow audit events to be
retrieved.

See gh-6579
2017-01-02 19:20:35 -08:00
Phillip Webb f9bbe43791 Merge branch '1.5.x' 2016-12-28 21:00:37 -08:00
Phillip Webb f22744c748 Add support for TransactionManagerCustomizers
Add a `TransactionManagerCustomizer` callback interface that can be
used to customize auto-configured `PlatformTransactionManagers`.

Also update `...transaction.*` properties under a single unified
`spring.transaction...` key since the existing auto-configurations
would often share a transaction manager (the technology specific
transaction managers are `@ConditionalOnMissingBean` and may use
a manager created by a previous auto-configuration).

See gh-7561
2016-12-28 20:53:20 -08:00