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
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
125d9d6181
Merge branch '1.5.x'
2017-01-04 20:04:09 -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
4dc30938d0
Merge branch '1.5.x'
2017-01-04 21:39:34 +00: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
3967c525c8
Merge branch '1.5.x'
2017-01-04 21:31:26 +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
be71f666d2
Merge branch '1.5.x'
2017-01-04 20:40:57 +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
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
Andy Wilkinson
e9021b3653
Merge branch '1.5.x'
2017-01-04 11:32:25 +00: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
37f9de7dc8
Merge branch '1.5.x'
2017-01-04 11:26:10 +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
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
43f5c3564b
Merge branch '1.5.x'
2017-01-04 10:10:59 +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
