Andy Wilkinson
bfd63ab085
Polish "Stop JtaAutoConfiguration from enabling JtaProperties when not used"
...
Closes gh-15550
2018-12-21 15:12:29 +00:00
Nishant Raut
0b29da14b3
Stop JtaAutoConfiguration from enabling JtaProperties when not used
...
See gh-15550
2018-12-21 15:12:29 +00:00
Stephane Nicoll
9d67400afa
Merge branch '2.1.x'
2018-12-20 17:54:08 +01:00
igor-suhorukov
e578d30722
Replace anonymous inner class with lambda
...
See gh-15438
2018-12-20 17:47:29 +01:00
Andy Wilkinson
3a7406fe3a
Merge branch '2.0.x' into 2.1.x
2018-12-20 15:58:03 +00:00
Andy Wilkinson
0741c90489
Avoid blocking on a Mono indefinitely
...
Closes gh-15535
2018-12-20 15:31:39 +00:00
Andy Wilkinson
9d2d6d5812
Merge branch '2.1.x'
2018-12-20 15:30:51 +00:00
Andy Wilkinson
9a33d1a2f9
Merge branch '2.0.x' into 2.1.x
2018-12-20 15:30:42 +00:00
Andy Wilkinson
8c68da0882
Avoid blocking on a Mono indefinitely
...
Closes gh-15535
2018-12-20 15:24:53 +00:00
Andy Wilkinson
70f4d5e5a8
Polish "Apply context and connector customizer beans to Tomcat factories"
...
Closes gh-15492
2018-12-19 17:09:21 +00:00
Raheela
90c489048f
Apply context and connector customizer beans to Tomcat factories
...
See gh-15492
2018-12-19 17:01:02 +00:00
Andy Wilkinson
c8a0c99a21
Remove D…S…Init…InvokerTests' assumptions about classpath structure
...
See gh-15471
2018-12-17 16:35:22 +00:00
Stephane Nicoll
6207b46bc6
Merge branch '2.1.x'
2018-12-17 17:07:58 +01:00
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
Andy Wilkinson
4f405ed97d
Merge branch '2.0.x'
2018-11-23 15:45:13 +00:00
Andy Wilkinson
058428a14c
Clarify how multiple attributes are treated by ConditionalOn(Missing)Bean
...
Closes gh-15177
2018-11-23 15:44:58 +00:00
Andy Wilkinson
3bda78a3d3
Fix tests after HandlerExceptionResolver logging changes
...
See gh-14936 and gh-15189
2018-11-22 20:27:19 +00:00
Dave Syer
b6aff10244
Temporarily make @Bean methods in Spring Data JDBC public
...
Closes gh-15097
2018-11-16 14:53:33 +01:00
Stephane Nicoll
c1b1f14f5a
Fix default unit for multipart properties
...
This commit fixes a regression that wrongly changed the default unit of
multipart properties from bytes to megabytes.
Closes gh-15162
2018-11-15 09:17:26 +01:00
Stephane Nicoll
2f4325d00f
Polish
2018-11-15 09:06:44 +01:00
Brian Clozel
d84421b7e1
Improve HttpMessageConverters javadoc
...
Closes gh-15027
2018-11-14 15:06:41 +01:00
Johnny Lim
fd5aa3ebf1
Polish
...
See gh-15134
2018-11-11 11:03:13 +01:00
Stephane Nicoll
089ef9085a
Polish "Add HANA to the lookup of well-known databases"
...
Closes gh-15125
2018-11-10 18:02:01 +01:00
Jonathan Bregler
85754eaddd
Add HANA to the lookup of well-known databases
...
See gh-15125
2018-11-10 17:59:29 +01:00
Andy Wilkinson
e7d921c216
Align test expectations with styling of stack trace div
...
Closes gh-15075
2018-11-08 12:31:21 +00:00
Andy Wilkinson
bfb0886495
Tolerate Hibernate 5.2
...
Closes gh-15100
2018-11-08 12:24:22 +00:00
Brian Clozel
159f947870
Polish
...
Closes gh-15075
2018-11-07 09:40:11 +01:00
up-to-you
ae4bc48481
Fix stack-trace line breaks in whitelabel error views
...
Since gh-12838, the WebFlux whitelabel error view also shows the
stacktrace information if it is available in the model.
This commit adds a CSS directive that preserves white spaces and breaks
lines at newline characters.
2018-11-07 09:40:11 +01:00
dreis2211
3e95af2c85
Polish some Map operations
...
Closes gh-15103
2018-11-06 07:41:55 +01:00
dreis2211
5e35ac6ce5
Remove unused static methods in tests
...
Closes gh-15084
2018-11-05 07:38:49 +01:00
Stephane Nicoll
0bd69fded8
Fix detection of ScheduledExecutorService
...
`@EnableScheduling` detects primarily a suitable `TaskScheduler` in the
context and fallbacks to the presence of a `ScheduledExecutorService` if
that is not the case.
This commit improves the auto-configuration to back off when such
scheduled executor service is present, so that the framework
initialization code can pick it up as usual.
Closes gh-15032
2018-11-04 09:58:41 +01:00
Brian Clozel
da53a0b8d5
Fix HTTP status error template rendering in WebFlux
...
Prior to this commit, a change in `HttpStatus.toString` since SPR-16898
prevented the default WebFlux `ErrorWebExceptionHandler` to render
template views for exact HTTP status (e.g. "404.html").
This issue does not affect the resolution of series, like "4xx.html".
This commit fixes `DefaultErrorWebExceptionHandler` to use
`HttpStatus.value()` when attempting to resolve error views.
Closes gh-15083
2018-11-03 21:28:48 +01:00
Stephane Nicoll
980d8ea0ad
Merge branch '2.0.x'
2018-11-01 17:49:56 +09:00
Stephane Nicoll
2927195b02
Fix StaticResourceRequest javadoc examples
...
Closes gh-15050
2018-11-01 17:48:56 +09:00
Phillip Webb
f3fa20b2d1
Polish
2018-10-29 14:25:45 -07:00
Andy Wilkinson
743782de7e
Revert reloadable message source support
...
Closes gh-14882
See gh-14699
See gh-13377
2018-10-29 16:24:59 +00:00
Andy Wilkinson
f492285999
Polish "Make auto-configured applicationTaskExecutor bean lazy"
...
Closes gh-14934
2018-10-29 12:15:04 +00:00
artsiom
4f92e857e9
Make auto-configured applicationTaskExecutor bean lazy
...
See gh-14934
2018-10-29 12:14:03 +00:00
Andy Wilkinson
0e08d379ae
Polish "Add CachingMetadataReaderFactoryPostProcessor earlier in context lifecyle"
...
See gh-14907
2018-10-29 11:36:49 +00:00
Dave Syer
c1022e74cd
Add CachingMetadataReaderFactoryPostProcessor earlier in context lifecyle
...
An initializer that adds a BeanDefinitionRegistryPostProcessor which
in turn adds bean definitions has to be very careful to run early.
Otherwise, other initializers that want to influence the bean
definitions added never get a chance.
Closes gh-14907
2018-10-29 11:36:10 +00:00
Phillip Webb
22c7546607
Polish
2018-10-28 21:05:54 -07:00
Phillip Webb
1451c0c069
Polish "Restore max-http-header-size default value support"
...
Fix Jetty and Undertow customizers to restore Spring Boot 2.0
behavior where a negative or zero `max-http-header-size` indicates
that the server default should be used.
Closes gh-14986
2018-10-28 21:04:17 -07:00
Bryan Turner
8b40ce14cb
Restore max-http-header-size default value support
...
Fix `TomcatWebServerFactoryCustomizer` to restore Spring Boot 2.0
behavior where a negative or zero `max-http-header-size` indicates
that the server default should be used.
See gh-14986
2018-10-28 20:56:51 -07:00
Phillip Webb
1a0a8470e5
Merge branch '2.0.x'
2018-10-26 13:37:39 -07:00
Phillip Webb
62b9268cec
Polish "Fix Spring Batch job restart parameters handling"
...
See gh-14933
2018-10-26 13:30:50 -07:00
Mahmoud Ben Hassine
ad3c3ad361
Fix Spring Batch job restart parameters handling
...
Fix the `JobLauncherCommandLineRunner` to correctly deal with job
parameters when restarting a job.
Prior to this commit, we were was calling the `getNextJobParameters`
method of the `JobParametersBuilder` from batch. This method was getting
the previous parameters of the wrong job instance in a restart scenario.
This commit fixes the issue by first getting the right job instance with
the provided parameters, then restarting it.
Closes gh-14933
2018-10-26 13:24:02 -07:00
Vedran Pavic
6e967fe860
Upgrade to Hazelcast 3.11
...
Closes gh-14949
2018-10-25 15:57:59 -07:00
Hanope
65e3b9ff5b
Fix typos
...
Closes gh-14954
2018-10-26 07:34:58 +09:00
Brian Clozel
755c4b8b98
Update spring.mvc.log-resolved-exception description
...
Closes gh-14936
2018-10-25 11:04:20 +02:00
Phillip Webb
2097b6a4c1
Improve ResourceUrlEncodingFilter conditions
...
Update Thymeleaf and FreeMarker configurations to make use of the new
`@ConditionalOnMissingFilterBean` annotation.
Closes gh-14926
2018-10-24 15:10:49 -07:00
Phillip Webb
44a46f1514
Add @ConditionalOnMissingFilterBean
...
Add a new condition that can be used to check for servlet `Filter`
beans that are either registered directly, or via a
`FilterRegistrationBean`.
Closes gh-14940
2018-10-24 15:10:49 -07:00