dreis2211
ac8eebfbad
Fix typos
...
Closes gh-13762
2018-07-13 07:54:03 +02:00
Madhura Bhave
d7822ba135
Update copyright header for modified files
2018-07-11 15:25:39 -07:00
Madhura Bhave
c8c32cfa33
Migrate tests to ApplicationContextRunner
2018-07-11 15:06:36 -07:00
Andy Wilkinson
cced3514a7
Polish
2018-07-11 17:49:10 +01:00
Andy Wilkinson
c489c6c5f6
Polish test following forward merge
2018-07-11 17:13:45 +01:00
Andy Wilkinson
67dfa0a720
Merge branch '1.5.x' into 2.0.x
2018-07-11 16:51:43 +01:00
Stephane Nicoll
48819253eb
Fix dependency order between JdbcTemplate and database migration tools
...
This commit makes sure that Flyway/Liquibase migrates the schema if
necessary before a `JdbcTemplate` is made available as an injection
point.
This commit also adds a test that validates simple datasource
initialization (spring.datasource.*) happens before a `JdbcTemplate`
bean can be used.
Closes gh-13155
2018-07-11 11:23:44 +02:00
Stephane Nicoll
177c54d441
Migrate JdbcTemplateAutoConfiguration tests to context runner
2018-07-10 19:45:20 +02:00
Andy Wilkinson
57e2bb9c6a
Merge branch '1.5.x' into 2.0.x
2018-07-10 10:27:28 +01:00
Johnny Lim
ab6adc8265
Polish
...
Closes gh-13616
2018-07-09 10:45:01 +02:00
Andy Wilkinson
58be01a790
Try to make Jest auto-configuration tests more robust
2018-07-04 15:25:10 +01:00
Madhura Bhave
fddc9e9c7e
Support multiple paths in DispatcherServletPathProvider
...
Closes gh-13603
2018-06-28 12:36:58 -07:00
Madhura Bhave
a1491be636
Refine DispatcherServletPathProvider creation
...
Closes gh-13527
2018-06-27 11:06:56 -07:00
Andy Wilkinson
30f0fd1fe4
Merge branch '1.5.x' into 2.0.x
2018-06-21 17:31:16 +01:00
Johnny Lim
b9ea0fd5a7
Polish
...
See gh-13534
2018-06-21 09:20:50 +02:00
Andy Wilkinson
e2d6280d83
Merge branch '1.5.x' into 2.0.x
2018-06-20 13:56:55 +01:00
Stephane Nicoll
864a6b3e91
Merge branch '1.5.x' into 2.0.x
2018-06-19 20:59:27 +02:00
Stephane Nicoll
7ae82b070b
Stop calling Charset.availableCharsets() early
...
This is no longer required as Spring Framework has been updated to
invoke this method lazily as well.
Closes gh-13423
2018-06-19 14:12:00 +02:00
Stephane Nicoll
62c93a4b9a
Add missing @ConditionalOnClass check on RedisCacheConfiguration
...
Closes gh-13508
2018-06-18 17:54:10 +02:00
Madhura Bhave
4194baad91
Don't log p/w when AuthenticationManagerBuilder configured
...
Fixes gh-12872
2018-06-07 12:52:15 -07:00
Madhura Bhave
f7ff8dd165
Make generated password output consistent
2018-06-07 12:39:46 -07:00
Brian Clozel
7cbbd95fc9
Ignore invalid Accept headers in WebFlux error handling
...
Prior to this commit, the `DefaultErrorWebExceptionHandler` would parse
the HTTP "Accept" headers when routing the request to the error handler;
if an error occured during parsing, an `InvalidMediaTypeException` would
be thrown and break the error handling for this request.
This commit ignores those exceptions and makes sure that the error
handling function does not override the response status or the error
itself with those exceptions.
Closes: gh-13372
2018-06-06 14:02:04 +02:00
Phillip Webb
571c50e43f
Switch to functional web code to use static imports
...
Update the samples and tests to use the more idiomatic static import
style.
2018-06-04 17:27:34 -07:00
Dmytro Nosan
20003489be
Auto-configure jOOQ with TransactionListenerProvider
...
Closes gh-13331
2018-06-04 17:35:40 +02:00
Stephane Nicoll
a9b2826c26
Merge branch '1.5.x' into 2.0.x
2018-06-04 14:14:52 +02:00
Johnny Lim
6b0ce46491
Polish
...
Closes gh-13320
2018-06-01 09:22:20 +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
Phillip Webb
f8ec2e6176
Polish
2018-05-30 21:01:31 -07:00
Phillip Webb
09fa1e7e11
Polish
2018-05-30 12:12:01 -07:00
Johnny Lim
4eb070767c
Remove an unnecessary @QuartzDataSource
...
Closes gh-13302
2018-05-30 17:49:21 +02:00
dreis2211
3ed31d60dc
Add assertion in IntegrationAutoConfigurationTests
...
Closes gh-13280
2018-05-29 09:04:00 +02:00
Stephane Nicoll
8a9d0bd22a
Merge branch '1.5.x' into 2.0.x
2018-05-28 14:28:45 +02:00
Johnny Lim
f385a1cb11
Polish
...
Closes gh-13243
2018-05-28 09:36:15 +02:00
Phillip Webb
6f0ccc64a5
Fix checkstyle violations
2018-05-25 23:03:17 -07:00
Phillip Webb
9fd3b9103a
Format code
2018-05-25 23:02:45 -07:00
Phillip Webb
9c5f207e22
Fix merge error
2018-05-25 20:57:46 -07:00
Phillip Webb
21d80d87a3
Merge branch '1.5.x' into 2.0.x
2018-05-25 18:45:37 -07:00
Phillip Webb
2dc4f1df00
Polish
2018-05-21 21:32:42 -07:00
Phillip Webb
6d8b4710d7
Merge branch '1.5.x' into 2.0.x
2018-05-21 17:18:49 -07:00
Stephane Nicoll
125b5974c0
Merge branch '1.5.x' into 2.0.x
2018-05-17 16:17:55 +02:00
Johnny Lim
652bbf4ab2
Polish DefaultErrorWebExceptionHandler.renderErrorView()
...
Closes gh-13174
2018-05-16 09:28:26 +02:00
Johnny Lim
b9aa934d78
Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
...
Closes gh-13171
2018-05-15 15:09:35 +02:00
Stephane Nicoll
8f53c2e2bb
Support for custom comment prefix
...
Some Quartz initialization scripts have comments in a different format.
This commit introduces a `comment-prefix` property that should be set by
the user if their target database has a script that contains those
unusual comments.
Closes gh-13041
2018-05-14 09:32:42 +02:00
Johnny Lim
3dd2f5bb05
Polish
...
See gh-13148
2018-05-14 08:19:10 +02:00
Johnny Lim
aa60d60b8a
Polish JpaProperties.determineDdlAuto()
...
Closes gh-13036
2018-05-14 08:13:06 +02:00
dreis2211
e6a23fa3ff
Remove unnecessary semicolons
...
Closes gh-13144
2018-05-11 14:23:47 +02:00
Johnny Lim
75e591e76e
Polish
...
Closes gh-13130
2018-05-11 10:00:15 +02:00
Stephane Nicoll
4683940423
Merge branch '1.5.x' into 2.0.x
2018-05-11 09:56:54 +02:00
Andy Wilkinson
c826310fd1
Polish
2018-05-09 08:44:15 +01:00
