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
Phillip Webb
9048c97572
Polish Mockito 2 support
...
gh-7770
2017-01-05 13:45:40 -08:00
Phillip Webb
0cc313f224
Polish
2017-01-05 11:30:33 -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
Phillip Webb
83ed8fb009
Merge branch '1.4.x' into 1.5.x
2017-01-05 10:49:00 -08:00
Phillip Webb
6bc37c0589
Drop annotation processor spring-core dependency
...
Remove the spring-core dependency from the annotation processor.
(cherry-picked from 4cb7d86aec
2017-01-05 10:44:48 -08:00
Stephane Nicoll
c0012a4bfe
Merge branch '1.5.x'
2017-01-05 17:04:48 +01:00
Stephane Nicoll
c06ff7061f
Revert Shade annotation processor dependencies
...
This commit reverts 45d5b60
2017-01-05 17:04:34 +01: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
Stephane Nicoll
fab43f343d
Merge branch '1.5.x'
2017-01-05 14:22:23 +01:00
Stephane Nicoll
6293033e1b
Remove useless dependency
2017-01-05 14:21:59 +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
Stephane Nicoll
ad4a53e366
Merge pull request #7877 from vpavic:fix-docs
...
* pr/7877:
Add `LoggersEndpoint` to application properties appendix
2017-01-05 12:25:08 +01:00
Vedran Pavic
6eea679535
Add LoggersEndpoint to application properties appendix
...
Closes gh-7877
2017-01-05 12:24:48 +01:00
Stephane Nicoll
c28ff4314c
Upgrade to Mockito 2
...
Closes gh-7770
2017-01-05 12:22:15 +01:00
Phillip Webb
ad2ff27208
Merge branch '1.5.x'
2017-01-05 00:01:08 -08:00
Phillip Webb
fac6b8da47
Upgrade to JSONassert 1.4.0
...
Closes gh-7846
2017-01-05 00:00:07 -08:00
Phillip Webb
4bfecc1307
Merge branch '1.5.x'
2017-01-04 23:52:40 -08:00
Phillip Webb
45d5b60f6d
Shade annotation processor dependencies
...
Update the annotation processor to be completely self contained. The
single required dependency is now "shaded" into the jar.
Fixes gh-7883
2017-01-04 23:02:24 -08:00
Phillip Webb
cc7c2ebb87
Migrate to android-json
...
Migrate from `org.json:json` to the clean room Apache 2.0 licensed
version that was developed for Android.
Fixes gh-5929
2017-01-04 23:00:06 -08:00
