Stephane Nicoll
|
eab2d4a404
|
Merge branch '2.0.x'
|
2018-05-02 16:13:31 +02:00 |
|
Stephane Nicoll
|
ed594d7706
|
Merge pull request #13022 from izeye:polish-20180502
* pr/13022:
Polish IgnoreTopLevelConverterNotFoundBindHandlerTests
|
2018-05-02 16:13:06 +02:00 |
Johnny Lim
|
e7d2f22911
|
Polish IgnoreTopLevelConverterNotFoundBindHandlerTests
Closes gh-13022
|
2018-05-02 16:12:37 +02:00 |
|
Stephane Nicoll
|
11f178538e
|
Merge pull request #13019 from izeye:patch-49
* pr/13019:
Fix @since for IgnoreTopLevelConverterNotFoundBindHandler
|
2018-05-02 16:11:55 +02:00 |
|
Johnny Lim
|
12cdc8b0e0
|
Fix @since for IgnoreTopLevelConverterNotFoundBindHandler
Closes gh-13019
|
2018-05-02 16:11:37 +02:00 |
|
Stephane Nicoll
|
7879b38615
|
Merge branch '2.0.x'
|
2018-05-02 16:09:56 +02:00 |
|
Stephane Nicoll
|
7cca56e15b
|
Upgrade to HikariCP 2.7.9
Closes gh-12783
|
2018-05-02 16:09:02 +02:00 |
|
Stephane Nicoll
|
4eeddbd889
|
Merge branch '2.0.x'
|
2018-05-02 16:08:03 +02:00 |
|
Stephane Nicoll
|
d6244889f5
|
Add default value for "spring.flyway.locations"
See gh-12193
|
2018-05-02 16:07:38 +02:00 |
|
Stephane Nicoll
|
79c222da78
|
Allow to provide manual metadata for keys that are not unique
Closes gh-12193
|
2018-05-02 16:04:02 +02:00 |
|
Stephane Nicoll
|
44fd7d953e
|
Merge branch '2.0.x'
|
2018-05-02 16:00:25 +02:00 |
|
Stephane Nicoll
|
782d8c63da
|
Merge branch '1.5.x' into 2.0.x
|
2018-05-02 15:59:56 +02:00 |
|
Stephane Nicoll
|
dd3f57d816
|
Avoid potentially mutating item metadata collection
Closes gh-13027
|
2018-05-02 15:55:29 +02:00 |
Andy Wilkinson
|
38f7b2b9da
|
Merge branch '2.0.x'
|
2018-05-02 13:43:55 +01:00 |
|
Andy Wilkinson
|
c16331fa6c
|
Merge branch '1.5.x' into 2.0.x
|
2018-05-02 13:43:49 +01:00 |
|
Andy Wilkinson
|
d0f329caa4
|
Break circular dependency in DevTools without using field injection
|
2018-05-02 13:43:19 +01:00 |
|
Andy Wilkinson
|
0526594a3c
|
Merge branch '2.0.x'
|
2018-05-02 12:26:23 +01:00 |
|
Andy Wilkinson
|
f019d5c85b
|
Merge branch '1.5.x' into 2.0.x
|
2018-05-02 12:22:04 +01:00 |
|
Andy Wilkinson
|
06cf698387
|
Polish
|
2018-05-02 12:12:47 +01:00 |
|
Andy Wilkinson
|
1fda677f2d
|
Merge branch '2.0.x'
|
2018-05-02 11:36:23 +01:00 |
|
Andy Wilkinson
|
0a9d950a44
|
Start building against Spring Kafka 2.1.6 snapshots
See gh-13018
|
2018-05-02 11:32:26 +01:00 |
|
Andy Wilkinson
|
2a8eb2c113
|
Start building against Spring Integration 5.0.5 snapshots
See gh-13016
|
2018-05-02 11:31:29 +01:00 |
|
Andy Wilkinson
|
c50687758e
|
Start building against Spring Data Kay SR7 snapshots
See gh-13017
|
2018-05-02 11:30:53 +01:00 |
|
Andy Wilkinson
|
0d67ca1e81
|
Starting building against Spring Framework 5.0.6 snapshots
See gh-13021
|
2018-05-02 11:29:25 +01:00 |
|
Andy Wilkinson
|
76b40a37cc
|
Merge branch '1.5.x' into 2.0.x
|
2018-05-02 11:28:28 +01:00 |
|
Andy Wilkinson
|
31c6281e96
|
Start building against Spring Integration 4.3.16 snapshots
See gh-13015
|
2018-05-02 11:27:50 +01:00 |
|
Andy Wilkinson
|
b6926c9bca
|
Start building against Spring Data Ingalls SR12 snapshots
See gh-13014
|
2018-05-02 11:26:47 +01:00 |
|
Andy Wilkinson
|
9bd46ca8f8
|
Start building against Spring Framework 4.3.17 snapshots
See gh-13013
|
2018-05-02 11:21:40 +01:00 |
|
Andy Wilkinson
|
c17a451744
|
Merge branch '2.0.x'
|
2018-05-02 10:57:47 +01:00 |
|
Andy Wilkinson
|
49089546f8
|
Merge branch '1.5.x' into 2.0.x
|
2018-05-02 10:57:29 +01:00 |
|
Andy Wilkinson
|
a29a70d2f4
|
Fix handling of static resource jar paths containing a +
Closes gh-12942
|
2018-05-02 10:23:42 +01:00 |
|
Stephane Nicoll
|
0819822eb6
|
Merge branch '2.0.x'
|
2018-05-02 10:42:03 +02:00 |
|
Stephane Nicoll
|
fbf8f57773
|
Merge branch '1.5.x' into 2.0.x
|
2018-05-02 10:41:24 +02:00 |
|
Stephane Nicoll
|
08bc306a61
|
Guard IntegrationJmxConfiguration if no mBeanServer is available
Closes gh-12966
|
2018-05-02 10:35:17 +02:00 |
|
Andy Wilkinson
|
b679f97794
|
Merge branch '2.0.x'
|
2018-05-02 09:11:45 +01:00 |
|
Andy Wilkinson
|
b0dbcd094e
|
Merge branch '1.5.x' into 2.0.x
|
2018-05-02 09:11:29 +01:00 |
|
Andy Wilkinson
|
4585bc846a
|
Restore RestartClassLoader's Java 6 compatibility
Closes gh-12826
|
2018-05-02 08:27:38 +01:00 |
Madhura Bhave
|
a193c89c6d
|
Merge branch '2.0.x'
|
2018-05-01 16:42:24 -07:00 |
|
Madhura Bhave
|
aad279208e
|
Throw exception if RandomAccessData tries to read beyond EOF
Fixes gh-12986
|
2018-05-01 16:35:43 -07:00 |
|
Madhura Bhave
|
ef0cfc43fe
|
Merge branch '2.0.x'
|
2018-05-01 11:34:39 -07:00 |
|
Madhura Bhave
|
d268b2102f
|
Fix typo
|
2018-05-01 11:33:47 -07:00 |
|
Stephane Nicoll
|
9f7be62687
|
Backport polish commit "22b99a90"
|
2018-05-01 11:33:26 -07:00 |
|
Andy Wilkinson
|
c37e6ebac5
|
Merge branch '2.0.x'
|
2018-05-01 09:25:14 +01:00 |
|
Andy Wilkinson
|
d5841982d9
|
Upgrade to Testcontainers 1.7.2
See gh-12821
|
2018-05-01 09:25:04 +01:00 |
|
Stephane Nicoll
|
0fcffae0d9
|
Merge branch '2.0.x'
|
2018-04-30 16:50:51 +02:00 |
|
Stephane Nicoll
|
71c26300fb
|
Merge pull request #12989 from izeye:rename-nested-auto-configuration
* pr/12989:
Rename nested *AutoConfiguration classes to *Configuration
|
2018-04-30 16:50:41 +02:00 |
|
Johnny Lim
|
d8700522d3
|
Rename nested *AutoConfiguration classes to *Configuration
Closes gh-12989
|
2018-04-30 16:50:18 +02:00 |
|
Stephane Nicoll
|
335ca62239
|
Merge branch '2.0.x'
|
2018-04-30 16:45:30 +02:00 |
|
Stephane Nicoll
|
83b9d3ca71
|
Merge pull request #12999 from izeye:polish-20180430
* pr/12999:
Polish
|
2018-04-30 16:45:18 +02:00 |
|
Johnny Lim
|
a723ac95a9
|
Polish
Closes gh-12999
|
2018-04-30 16:44:46 +02:00 |