9d0f97fa00
Merge branch '5.1.x'
2019-02-11 13:09:35 +01:00
2a0a002bd3
Improve Kotlin documentation
...
Closes gh-22400
2019-02-11 13:08:04 +01:00
514f7e3328
Add link to Kotlin sample for Spring Cloud GCP
...
Closes gh-2070
2019-02-11 13:08:04 +01:00
4ca376ef31
Merge branch '5.1.x'
2019-02-11 11:55:59 +01:00
cdd0456aa4
Upgrade to Tomcat 9.0.16 and Log4J 2.11.2
2019-02-11 11:51:41 +01:00
b5e9fa5f1e
TransactionActionSupport evaluates Vavr Try failure as rollback-only
...
Closes gh-20361
2019-02-11 11:45:43 +01:00
afbe7b31bb
Polish
...
See gh-22341
2019-02-11 10:46:27 +01:00
fb4a28f904
Polish
...
See gh-22340
2019-02-11 10:45:50 +01:00
f7e53a071b
Polishing
2019-02-08 19:41:10 +01:00
783a7ca46b
Merge branch '5.1.x'
2019-02-08 18:16:27 +01:00
9f03d158ce
Upgrade to Checkstyle 8.17 and Mockito 2.24
2019-02-08 18:03:07 +01:00
ba0c48b933
Polishing
2019-02-08 18:02:28 +01:00
82dbde13b6
Fix for ScriptUtils failure when '--' occurs inside a multi-line comment on the same line as '*/' ( #22392 )
...
* Test for multi-line comment block where the comment end delimiter occurs on a line starting with the single-line comment prefix
* ScriptUtils successfully parses a SQL script containing a multi-line comment block where the comment-end delimiter occurs on a line starting with the single-line comment prefix.
2019-02-08 16:20:51 +01:00
4f57d717ba
Upgrade to JUnit Jupiter 5.4
...
Closes gh-22308
2019-02-08 13:22:34 +01:00
f5ae288990
Merge branch '5.1.x'
2019-02-08 08:54:18 +01:00
a698adf125
Merge pull request #22382 from artembilan
...
* pr/22382:
Polish contribution
Polish warning message
2019-02-08 08:49:34 +01:00
50e4308779
Polish contribution
...
Closes gh-22382
2019-02-08 08:48:58 +01:00
07bac70c09
Polish warning message
...
See gh-22382
2019-02-08 08:48:18 +01:00
aff9e37b8d
Merge pull request #22373 from izeye
...
* pr/22373:
Fix casing for GitHub in the contributing guide
2019-02-08 08:41:21 +01:00
64c86623ee
Fix casing for GitHub in the contributing guide
...
Closes gh-22373
2019-02-08 08:41:03 +01:00
7cde283066
Merge branch '5.1.x'
2019-02-07 23:07:22 +01:00
cc740dfd93
Upgrade to Groovy 2.5.6 and Hibernate ORM 5.1.17
2019-02-07 23:02:59 +01:00
15af0d9787
Polishing
2019-02-07 23:02:35 +01:00
b4de3845c0
Merge branch '5.1.x'
2019-02-07 14:35:53 -05:00
2b974da395
Use snapshot instead of libs-snapshot repository
...
The latter has stale Reactor snapshots
2019-02-07 14:34:59 -05:00
cb9db70857
Merge branch '5.1.x'
2019-02-07 12:00:44 -05:00
e7c038f2d2
Switch to Reactor Californium snapshots
2019-02-07 11:59:54 -05:00
0b617a8c93
Deprecate PreferencesPlaceholderConfigurer along with its base class
...
Also removing common PropertyPlaceholderConfigurer doc references.
See gh-22181
2019-02-07 16:53:05 +01:00
d25783329a
Merge branch '5.1.x'
2019-02-07 16:01:14 +01:00
b8e663c531
AbstractAutoProxyCreator ignores unused early proxy references
...
Closes gh-22370
2019-02-07 15:57:44 +01:00
0f73a69033
AbstractApplicationContext resets local listeners to pre-refresh state
...
Closes gh-22325
2019-02-07 15:56:46 +01:00
e9626779ee
@Resource provides dependency descriptor for resolving beans by name
...
Closes gh-22359
2019-02-07 15:56:00 +01:00
5f4c461d4f
Documentation revision for @PostConstruct/PreDestroy and @Required
...
Closes gh-22348
2019-02-07 15:53:55 +01:00
bb05ee7bff
Upgrade to Kotlin 1.3.21
...
See #20945
2019-02-07 15:28:43 +01:00
05d7ab4328
Merge branch '5.1.x'
2019-02-06 20:00:02 +01:00
ef8652615c
Log exception at ERROR level in CompositeLog
...
Fixes gh-22364
2019-02-06 19:58:41 +01:00
72ed274c6f
Merge branch '5.1.x'
2019-02-06 19:35:20 +01:00
d1e5a3af9f
Fix truncated Value#value javadoc
...
Closes gh-22331
2019-02-06 19:28:31 +01:00
9bc2c99ce5
Suppress deprecation warning in Gradle build
...
See gh-22181
2019-02-06 16:37:23 +01:00
3787b23a98
Deprecate PropertyPlaceholderConfigurer
...
This commit deprecates PropertyPlaceholderConfigurer in favor of
PropertySourcesPlaceholderConfigurer.
Closes gh-22181
2019-02-06 16:00:24 +01:00
0ad9349d84
Limit ref() and provider() visibility in Kotlin DSL
...
This commit makes ref() and provider() only available from
inside the bean lambda and not from the root level of the beans DSL.
Closes gh-22177
2019-02-05 16:59:56 +01:00
34ddb1e3cd
Merge branch '5.1.x'
2019-02-05 16:32:58 +01:00
9895e44d73
Polishing
2019-02-05 16:03:24 +01:00
643a68f81b
Detect existing jar URLs from URLClassLoader.getURLs()
...
Closes gh-22346
2019-02-05 16:02:50 +01:00
ac4525ddf8
Detect MariaDB as MySQL (for mariadb-java-client 2.4+ compatibility)
...
Closes gh-22344
2019-02-05 16:02:17 +01:00
17caac8f1f
Add tests for SpringBeanContainer (Hibernate ORM integration) and fix the behavior when requesting named beans ( #22260 )
...
* Add integration tests for SpringBeanContainer (Hibernate ORM integration)
* Autowire bean properties of beans retrieved by name in SpringBeanContainer
* Add integration tests for fallback cases in SpringBeanContainer (Hibernate ORM integration)
* Fix SpringBeanContainer incorrectly losing the bean name when calling the fallback producer
(cherry picked from commit 00855c4f5f
2019-02-05 16:01:40 +01:00
0b9522c84e
Migrate Kotlin Mockito tests to Mockk
...
Closes gh-22345
2019-02-05 15:47:08 +01:00
00855c4f5f
Add tests for SpringBeanContainer (Hibernate ORM integration) and fix the behavior when requesting named beans ( #22260 )
...
* Add integration tests for SpringBeanContainer (Hibernate ORM integration)
* Autowire bean properties of beans retrieved by name in SpringBeanContainer
* Add integration tests for fallback cases in SpringBeanContainer (Hibernate ORM integration)
* Fix SpringBeanContainer incorrectly losing the bean name when calling the fallback producer
2019-02-05 15:39:46 +01:00
4c9ae6494f
Concurrency/nullability fine-tuning in MimeType(Utils)
...
See gh-22340
2019-02-05 15:38:41 +01:00
1bf3b36ce8
Polish
...
See gh-22340
2019-02-05 15:06:33 +01:00
Sebastien Deleuze
dzou
Juergen Hoeller
Brian Clozel
Sam Brannen
Mansur Mustaquim
Stephane Nicoll
Artem Bilan
Johnny Lim
Rossen Stoyanchev
Yoann Rodière