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
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
b99c2daf31
Fixup broken version number
2017-01-06 00:05:25 -08:00
Phillip Webb
b9702c9d36
Fix broken version number
2017-01-05 23:59:59 -08:00
Phillip Webb
c35454e5f4
Merge branch '1.5.x'
2017-01-05 23:40:58 -08: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
Phillip Webb
da4f8514b2
Add byte-buddy managed dependency
...
Add a managed dependency for byte-buddy since Mockito needs 1.6 and
Hibernate pulls in 1.5.
See gh-7770
2017-01-05 20:04:48 -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
0684f97f40
Merge branch '1.5.x'
2017-01-05 18:17:28 -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
962313d0e1
Merge branch '1.5.x'
2017-01-05 16:30:34 -08:00
Phillip Webb
abb8e3663a
Polish Mockito 2.0 support
2017-01-05 16:28:59 -08:00
Phillip Webb
c4779a10ac
Fix Mockito 2 support
...
See gh-7770
2017-01-05 16:27:41 -08:00
Phillip Webb
f92f019418
Don't mock package private class
...
See gh-7770
2017-01-05 14:39:22 -08:00
Phillip Webb
77f9bb09ca
Further Polish Mockito 2 support
...
See gh-7770
2017-01-05 14:29:29 -08:00
Phillip Webb
1169f69390
Polish MockitoApi
2017-01-05 14:02:31 -08:00
Phillip Webb
7f99153daf
Fixup parent POM version number
2017-01-05 13:57:30 -08:00
