Andy Wilkinson
d54072e0a8
More accurately document buildInfo's effect on up-to-date checking
...
Closes gh-13152
2018-06-04 16:39:59 +01:00
Stephane Nicoll
9e871816d6
Merge pull request #13331 from nosan:gh-13329
...
* pr/13331:
Auto-configure jOOQ with TransactionListenerProvider
2018-06-04 17:35:45 +02:00
Dmytro Nosan
20003489be
Auto-configure jOOQ with TransactionListenerProvider
...
Closes gh-13331
2018-06-04 17:35:40 +02:00
Andy Wilkinson
0df37b917b
Ignore unresolvable placeholders during property binding
...
Closes gh-13122
2018-06-04 16:27:30 +01:00
Andy Wilkinson
9c8d2c8016
Improve analysis of bind failures caused by a conversion failure
...
Closes gh-13357
2018-06-04 16:26:43 +01:00
Andy Wilkinson
ea51cfabca
Avoid uri tag explosion when use of path variable is undetected
...
Previously, WebMvcTags would fall back to using the request’s path
info if Spring MVC’s best matching path pattern attribute was not
available. For non-Spring MVC web frameworks that support path
variables, such as Jersey, this led to an explosion of URI tags that
could exhaust the heap.
Closes gh-12447
2018-06-04 15:43:48 +01:00
Stephane Nicoll
bc59434bcc
Start building against Spring Framework 5.0.7 snapshots
...
See gh-13353
2018-06-04 15:21:46 +02:00
Stephane Nicoll
0da425794e
Merge branch '1.5.x' into 2.0.x
2018-06-04 15:20:49 +02:00
Stephane Nicoll
628cce567f
Start building against Spring Framework 4.3.18 snapshots
...
See gh-13352
2018-06-04 15:04:49 +02:00
Stephane Nicoll
a9b2826c26
Merge branch '1.5.x' into 2.0.x
2018-06-04 14:14:52 +02:00
Stephane Nicoll
a562cb5d6c
Merge pull request #13338 from mtheiss:master
...
* pr/13338:
Polish "Retrieve javax.cache.CacheManager using Bean ClassLoader"
Retrieve javax.cache.CacheManager using Bean ClassLoader
2018-06-04 14:11:08 +02:00
Stephane Nicoll
c67aedd8bc
Polish "Retrieve javax.cache.CacheManager using Bean ClassLoader"
...
Closes gh-13338
2018-06-04 14:08:58 +02:00
Martin Theiss
76b9d0d243
Retrieve javax.cache.CacheManager using Bean ClassLoader
...
This commit uses the bean's classloader to retrieve the CacheManager to
prevent issues with off-heap serialization.
See gh-13338
2018-06-04 14:08:57 +02:00
Stephane Nicoll
6be208ed04
Merge pull request #13345 from dreis2211:remove-deprecated-matcher
...
* pr/13345:
Remove usage of deprecated Matchers class
2018-06-04 10:32:07 +02:00
dreis2211
8bb7b8af51
Remove usage of deprecated Matchers class
...
Closes gh-13345
2018-06-04 10:31:25 +02:00
Stephane Nicoll
d5ccd43feb
Merge pull request #13343 from dreis2211:property-source-stream-polish
...
* pr/13343:
Polish stream creation in some PropertySources
2018-06-03 16:57:24 +02:00
dreis2211
29605bacd2
Polish stream creation in some PropertySources
...
Closes gh-13343
2018-06-03 16:56:51 +02:00
Madhura Bhave
95174a0773
Don't fail if aggregate merge can't get existing value
...
Fixes gh-13303
2018-06-01 14:52:55 -07:00
Madhura Bhave
8ce13c765b
Support binding to immutable maps
...
Closes gh-13323
2018-06-01 14:52:55 -07:00
Andy Wilkinson
68cd27c47b
Do not require DataSourcePoolMetrics to auto-configure Hikari meters
...
Closes gh-13330
2018-06-01 17:55:43 +01:00
Andy Wilkinson
27267a7090
Ensure that condition evaluator uses runner’s class loader
...
Closes gh-13319
2018-06-01 17:26:32 +01:00
Stephane Nicoll
152ce145fd
Merge pull request #13320 from izeye:polish-20180601
...
* pr/13320:
Polish
2018-06-01 09:25:48 +02:00
Johnny Lim
6b0ce46491
Polish
...
Closes gh-13320
2018-06-01 09:22:20 +02:00
Madhura Bhave
0afd947350
BindFailureAnalyzer should show original failure message
...
Fixes gh-13122
2018-05-31 16:51:42 -07:00
Stephane Nicoll
fa21333e4d
Upgrade to Spring Cloud Connectors 2.0.2.RELEASE
...
Closes gh-13318
2018-05-31 21:04:02 +02:00
Stephane Nicoll
20e349c332
Polish
2018-05-31 17:35:56 +02:00
Stephane Nicoll
32aa5b9bae
Merge branch '1.5.x' into 2.0.x
2018-05-31 16:38:23 +02:00
Stephane Nicoll
f745f20c8c
Clarify scope of JNDI-based MailSenderAutoConfiguration
...
This commit separates the auto-configuration of JavaMailSender in two
distinct configuration: one based on existing Session available on JNDI
and the other one based on properties configuration.
This clarifies the auto-configuration report and the fact that the JNDI
variant overrides any Session-related properties that would have been
set in the environment
Closes gh-13026
2018-05-31 16:20:40 +02:00
Andy Wilkinson
0d7d95d8a9
Align RestTemplateBuilder with Framework's removal of OkHttp 2 support
...
Closes gh-13314
2018-05-31 13:41:43 +01:00
Stephane Nicoll
f56cd789ac
Merge pull request #13308 from jmcshane:patch-1
...
* pr/13308:
Remove outdated reference to @EnableReactor
2018-05-31 10:40:46 +02:00
James McShane
d74c768cdd
Remove outdated reference to @EnableReactor
...
Closes gh-13308
2018-05-31 10:39:44 +02:00
Phillip Webb
3751968ecd
Add missing ExpectedException rule
...
Add ExpectedException rule which was missed from the 1.5.x merge.
2018-05-30 22:52:25 -07:00
Phillip Webb
f8ec2e6176
Polish
2018-05-30 21:01:31 -07:00
Phillip Webb
bdd541b2cc
Merge branch '1.5.x' into 2.0.x
2018-05-30 20:29:03 -07:00
Phillip Webb
bb0550ab95
Polish
2018-05-30 20:28:50 -07:00
Phillip Webb
5ae061f491
Merge branch '1.5.x' into 2.0.x
2018-05-30 20:27:19 -07:00
Phillip Webb
55d0611bc3
Guard against JarURLConnection with wrong JAR
...
Update `JarURLConnection.get()` to guard against the wrong nested JAR
being used as context.
Closes gh-11367
2018-05-30 19:59:56 -07:00
Madhura Bhave
1758d8c106
Remove email resource from pipeline
...
Closes gh-13307
2018-05-30 19:05:34 -07:00
Phillip Webb
5243adce22
Restore Java 1.6 compatibility
2018-05-30 18:23:17 -07:00
Phillip Webb
2c6465abdc
Merge branch '1.5.x' into 2.0.x
2018-05-30 14:08:15 -07:00
Phillip Webb
00b76490dc
Remove error logging on ClientAbortException
...
Update `ErrorPageFilter` so that a Tomcat `ClientAbortException` no
longer causes "Cannot forward to error page for request" logging for
committed responses. Since a `ClientAbortException` indicates that the
client is no longer available it's of no consequence that the request
has been committed and the forward will fail.
Closes gh-13221
2018-05-30 14:00:55 -07:00
Phillip Webb
43071b9375
Polish formatting
2018-05-30 13:34:15 -07:00
Phillip Webb
401fcbeaa4
Merge branch '1.5.x' into 2.0.x
2018-05-30 13:29:10 -07:00
Phillip Webb
2bfcefa48e
Reinstate support for disabling build checking
...
Closes gh-13291
2018-05-30 13:24:06 -07:00
Phillip Webb
587df6a07a
Port call setHttpOnly property on Tomcat context
...
Port "setHttpOnly on the TomcatContext" fix from commit 4d84933ee4
to
2.0.x. Since `Session` details are now configured on the
`WebServerFactory` we can directly configure the context.
See gh-12580
2018-05-30 12:23:40 -07:00
Phillip Webb
e38d5f910b
Merge branch '1.5.x' into 2.0.x
2018-05-30 12:18:38 -07:00
Phillip Webb
09fa1e7e11
Polish
2018-05-30 12:12:01 -07:00
Phillip Webb
4d84933ee4
Also call setHttpOnly property on Tomcat context
...
Update `ServerProperties` to also call `setHttpOnly` on the
`TomcatContext`. It appears that this is required in addition to
using the `ServletContextInitializer` to setup `SessionCookieConfig`.
Closes gh-12580
2018-05-30 12:02:46 -07:00
Phillip Webb
b03f890567
Upgrade to spring-javaformat 0.0.2
2018-05-30 11:14:26 -07:00
Stephane Nicoll
10589b90e4
Merge pull request #13302 from izeye:remove-unnecessary-quartz-data-source
...
* pr/13302:
Remove an unnecessary @QuartzDataSource
2018-05-30 17:49:41 +02:00