1434 Commits

Author SHA1 Message Date
dreis2211
948902f090 Avoid unnecessary usage of ReflectionTestUtils
Closes gh-15482
2018-12-17 17:07:23 +01:00
Andy Wilkinson
61d04db0d7 Minimize and centralize assumptions about build output
Closes gh-15471
2018-12-14 17:50:20 +00:00
Andy Wilkinson
064f6478df Move back to JUnit 4 until SUREFIRE-1614 has been resolved
See gh-14736
See gh-14737
See gh-14738
2018-12-12 16:49:30 +00:00
Andy Wilkinson
2b453bbb16 Minimise dependencies on Log4j2
Closes gh-15441
2018-12-12 08:19:34 +00:00
Madhura Bhave
f863ce32ee Merge branch '2.1.x' 2018-12-10 16:44:42 -08:00
Madhura Bhave
3cc441c83e Do not remove trailing slash from OAuth2 Issuer URI
Fixes gh-15324
2018-12-10 16:35:52 -08:00
Andy Wilkinson
beffc4da9f Remove ordering dependence from tests that create embedded databases
Closes gh-15423
2018-12-10 14:57:39 +00:00
Stephane Nicoll
ba29788482 Polish "Replace explicit generic type with diamond operator"
Closes gh-15424
2018-12-09 11:43:28 +01:00
igor-suhorukov
a2ebba8db1 Replace explicit generic type with diamond operator
See gh-15424
2018-12-09 11:42:27 +01:00
Madhura Bhave
f040459ae5 Merge branch '2.1.x' 2018-12-07 14:32:07 -08:00
Madhura Bhave
a11dea46d7 Use the right class in @ConditionalOnClass
See gh-15372
2018-12-07 14:15:59 -08:00
Madhura Bhave
e0b55d36de Merge branch '2.1.x' 2018-12-07 13:51:11 -08:00
Madhura Bhave
f13697b278 Make Resource Server auto-config conditional on JwtDecoder class
Fixes gh-15372
2018-12-07 13:48:32 -08:00
Andy Wilkinson
d3e5c5688f Polish 2018-12-07 19:58:13 +00:00
Stephane Nicoll
d5f90ffcfb Polish "Replace this lambda with a method reference"
Closes gh-15401
2018-12-07 11:10:10 +01:00
igor-suhorukov
5c1813aef8 Replace this lambda with a method reference
See gh-15401
2018-12-07 11:01:42 +01:00
Madhura Bhave
5a18df2d69 Fix tests 2018-12-05 18:33:50 -08:00
Madhura Bhave
59d2b0a3fb Upgrade tests to Junit5
See gh-14737
2018-12-05 17:49:09 -08:00
Stephane Nicoll
95b94c0158 Merge branch '2.1.x' 2018-12-04 10:53:41 +01:00
Stephane Nicoll
c56c0ff433 Rename OAuth2ResourceServerJwkConfiguration
Closes gh-15375
2018-12-04 10:53:01 +01:00
Stephane Nicoll
bbad720e23 Polish contribution
Closes gh-15086
2018-12-03 14:23:16 +01:00
Razib Shahriar
9e571a2827 Fail fast if nested condition uses a phase inappropriate for its members
See gh-15086
2018-12-03 14:14:29 +01:00
Stephane Nicoll
0df13baa0f Polish "Add configurable property for JWK encryption algorithm"
Closes gh-15145
2018-12-03 11:49:18 +01:00
artsiom
460fdaf52f Add configurable property for JWK encryption algorithm
See gh-15145
2018-12-03 11:35:10 +01:00
Stephane Nicoll
ec678eaa3b Polish "Configure MessageSource if no "messageSource" bean defined"
Closes gh-15212
2018-12-03 11:28:26 +01:00
cac03
82d99da32a Configure MessageSource if no "messageSource" bean defined
Enable MessageSourceAutoConfiguration OnMissingBeanCondition by name
rather than class since AbstractApplicationContext expects MessageSource
to be defined only with "messageSource" name.

See gh-15212
2018-12-03 11:28:07 +01:00
Stephane Nicoll
1b40b0edf1 Polish contribution
Closes gh-15054
2018-12-03 11:16:54 +01:00
artsiom
3059f0e2e2 Add configuration property for configuring Tomcat's processor cache
See gh-15054
2018-12-03 11:13:19 +01:00
Phillip Webb
ba1ef52e39 Merge branch '2.0.x' 2018-11-29 15:32:48 -08:00
Phillip Webb
74376aa023 Polish 2018-11-29 15:30:28 -08:00
Andy Wilkinson
ac322a8e30 Polish 2018-11-29 14:45:20 +00:00
Madhura Bhave
fc6c07ad3c Merge branch '2.0.x' 2018-11-28 17:41:11 -08:00
Madhura Bhave
decaacddce Account for application path for Jersey servlet endpoints
Closes gh-14895
2018-11-28 17:25:32 -08:00
Stephane Nicoll
114347107e Polish key description 2018-11-28 11:31:48 +01:00
Alon Bar-Lev
108f28417e Allow to disable SSL client authentication on the management port
When server and management are at different ports, and when server
requires TLS client authentication, then there is no simple method to
disable TLS client authentication for management port.

This commit adds an additional "none" option to ssl.client-auth.

Example:

    server.port=8080
    server.ssl.enabled=true
    server.ssl.client-auth=need
    management.server.port=8081
    management.server.ssl.enabled=true
    management.server.ssl.client-auth=none

See gh-14985
2018-11-28 11:29:21 +01:00
dreis2211
17f04b8b75 Replace DirectFieldAccessor usages by hasFieldOrPropertyWithValue
Closes gh-15312
2018-11-28 08:47:41 +01:00
Andy Wilkinson
cf7664c01a Cope with version not found in Embedded Mongo's Version enum
Closes gh-15311
2018-11-27 16:33:22 +00:00
Andy Wilkinson
b094e28081 Remove auto-configuration of RequestContextFilter when using Jersey
Closes gh-15048
2018-11-27 15:39:46 +00:00
Andy Wilkinson
fb3deab89d Merge branch '2.0.x' 2018-11-27 13:55:33 +00:00
Andy Wilkinson
e81abc3f11 Order jacksonCodecCustomizer so user-provided customizer can go after it
Closes gh-15167
2018-11-27 13:51:33 +00:00
Andy Wilkinson
f6a22a05b8 Merge branch '2.0.x' 2018-11-27 11:21:22 +00:00
Andy Wilkinson
9553d4f64b Polish "Auto-configure Spring Session's cookie serializer"
Closes gh-15163
2018-11-27 11:08:15 +00:00
Vedran Pavic
0daf83efab Auto-configure Spring Session's cookie serializer
See gh-15163
2018-11-27 11:08:05 +00:00
Stephane Nicoll
8928cd1982 Deprecate spring.rabbitmq.template.queue
Closes gh-15301
2018-11-27 09:55:45 +01:00
Stephane Nicoll
a240e22593 Adapt to Rabbit internal change
See gh-15271
2018-11-27 08:31:46 +01:00
Andy Wilkinson
073ac7bc99 Fix Thymeleaf security dialect tests on Windows 2018-11-26 16:15:15 +00:00
Stephane Nicoll
ae1979f1ff Merge branch '2.0.x' 2018-11-26 10:35:37 +01:00
Stephane Nicoll
5f0ac46d78 Unwrap DataSource target rather than plain instanceof calls
Closes gh-15227
2018-11-26 10:35:10 +01:00
Stephane Nicoll
e424dfbe15 Polish "Perform best effort to retrieve DataSourceProxy"
Closes gh-15206
2018-11-26 10:18:48 +01:00
Tadaya Tsuyukubo
26f9a92837 Perform best effort to retrieve DataSourceProxy
Prior to this commit, `DataSourceJmxConfiguration` with tomcat
`DataSource`, it can only find `DataSourceProxy` if the given
`DataSource` is a direct child of it.  Since it uses `instanceof`, it
could not find `DataSourceProxy` if the `DataSource` is
wrapped(delegated) or proxied.

This is because `DataSourceProxy#unwrap()` always returns null; thus
cannot use this method to directly obtain `DataSourceProxy`.

In this commit, updated the check logic to perform the best effort to
retrieve `DataSourceProxy`. If given `DataSource` is wrapped or proxied
by spring, tries to unwrap or get target datasource recursively to find
`DataSourceProxy`.

See gh-15206
2018-11-26 10:18:48 +01:00