Commit Graph

9842 Commits

Author SHA1 Message Date
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
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)

Fixes gh-7882
2017-01-05 10:44:48 -08:00
Stephane Nicoll
c06ff7061f Revert Shade annotation processor dependencies
This commit reverts 45d5b60

See gh-7883
2017-01-05 17:04:34 +01:00
Stephane Nicoll
615804ff34 Polish configuration keys documentation 2017-01-05 16:19:12 +01:00
Stephane Nicoll
6293033e1b Remove useless dependency 2017-01-05 14:21:59 +01: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
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
Phillip Webb
fac6b8da47 Upgrade to JSONassert 1.4.0
Closes gh-7846
2017-01-05 00:00:07 -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
Phillip Webb
4cb7d86aec Drop annotation processor spring-core dependency
Remove the spring-core dependency from the annotation processor.

Fixes gh-7882
2017-01-04 22:58:28 -08:00
Phillip Webb
1b7c65cd1c Update eclipse setting to use 2017 copyright year 2017-01-04 18:32:14 -08:00
Phillip Webb
eb22220961 Upgrade to hibernate-validator 5.3.4
Upgrade to `hibernate-validator` 5.3.4 and introduce a new
`MessageInterpolatorFactory` that creates a suitable
`MessageInterpolator` (taking into account missing EL dependencies).

Rework `ConfigurationPropertiesBindingPostProcessor` and
`ValidationAutoConfiguration` to make use of the new factory.

Fixes gh-7598
2017-01-04 18:28:32 -08:00
Phillip Webb
d80f22c227 Exclude cdi-api from hibernate-core
Update the `hibernate-core` managed dependency to exclude `cdi-api`.

Fixes gh-7879
2017-01-04 18:27:08 -08:00
Phillip Webb
3bbd638d74 Polish formatting 2017-01-04 18:24:41 -08:00
Phillip Webb
2085afd907 Merge pull request #7873 from artembilan/GH-7871
* pr/7873:
  Upgrade to Spring Kafka 1.1.2
2017-01-04 15:48:17 -08:00
Artem Bilan
a488574afc Upgrade to Spring Kafka 1.1.2
Fixes gh-7871
Closes gh-7873
2017-01-04 15:47:11 -08:00
Phillip Webb
e015e13b4d Include ErrorAttributes in @WebMvcTest
Import the additional auto-configuration classes required for
`ErrorAttributes` and change the filter so that it's no longer
hidden.

Fixes gh-7867
2017-01-04 15:25:33 -08:00
Andy Wilkinson
803eddf6b2 Update test to reflect quoting of STOP_WAIT_TIME in launch.script 2017-01-04 21:39:16 +00:00
Andy Wilkinson
c5e7d83e2d Fix shellcheck warnings for literal { and } characters in launch.script
Closes gh-7870
2017-01-04 21:30:42 +00:00
Andy Wilkinson
75cb545361 Update launch.script to use a consistent location for pid file
Closes gh-6924
2017-01-04 20:39:51 +00: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
Andy Wilkinson
4e8a79bf3a Upgrade to Dependency Management Plugin 1.0.0.RC2
Closes gh-7817
2017-01-04 11:27:08 +00:00
Andy Wilkinson
5f74c4c2c8 Merge pull request #7763 from Quentin Caillard
* gh-7763:
  Configure Animal Sniffer to exclude jar containing Java 9 bytecode
  Upgrade to Jersey 2.25
2017-01-04 11:25:47 +00:00
Andy Wilkinson
0d6a8d9aa3 Configure Animal Sniffer to exclude jar containing Java 9 bytecode
Closes gh-7763
2017-01-04 11:24:45 +00:00
Quentin Caillard
5c210666f5 Upgrade to Jersey 2.25
See gh-7763
2017-01-04 11:24:23 +00: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