Johnny Lim
12cdc8b0e0
Fix @since for IgnoreTopLevelConverterNotFoundBindHandler
...
Closes gh-13019
2018-05-02 16:11:37 +02:00
Stephane Nicoll
7cca56e15b
Upgrade to HikariCP 2.7.9
...
Closes gh-12783
2018-05-02 16:09:02 +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
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
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
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
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
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
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
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
aad279208e
Throw exception if RandomAccessData tries to read beyond EOF
...
Fixes gh-12986
2018-05-01 16:35:43 -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
d5841982d9
Upgrade to Testcontainers 1.7.2
...
See gh-12821
2018-05-01 09:25:04 +01: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
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
Stephane Nicoll
fc8b21100b
Merge pull request #12996 from yaman-jain:docs_spell_check
...
* pr/12996:
Fix typo
2018-04-30 16:42:47 +02:00
Yaman Jain
50ca33ecd2
Fix typo
...
Closes gh-12996
2018-04-30 16:42:22 +02:00
Stephane Nicoll
0ba9b49d8b
Merge branch '1.5.x' into 2.0.x
2018-04-30 16:42:04 +02:00
Stephane Nicoll
6047a2c0b0
Fix typo
...
See gh-12996
2018-04-30 16:41:34 +02:00
Andy Wilkinson
584479b7f4
Merge pull request #13001 from Sébastien Deleuze
...
* gh-13001:
Upgrade to Kotlin 1.2.41
2018-04-30 12:25:42 +01:00
Sebastien Deleuze
933f0bbca8
Upgrade to Kotlin 1.2.41
...
Includes KT-23973 critical regression fix.
2018-04-30 12:25:00 +01:00
Madhura Bhave
de66451d9b
Update README with additional modules
2018-04-27 16:27:08 -07:00
Madhura Bhave
0385bd4131
Use spring.session.timeout for Spring Session timeout
...
Fallback to server.servlet.session.timeout for backwards compatibility.
Fixes gh-12906
2018-04-27 13:16:17 -07:00
Andy Wilkinson
d448c5ac49
Use openjdk:10.0.1-10-jdk Docker image for JDK 10-based CI
...
Closes gh-12988
2018-04-27 14:00:51 +01:00
Stephane Nicoll
36fb078935
Merge branch '1.5.x' into 2.0.x
2018-04-27 10:19:45 +02:00
Stephane Nicoll
587e3f4046
Polish
...
See gh-12796
2018-04-27 10:18:34 +02:00
Stephane Nicoll
a4840ed70a
Merge pull request #12981 from izeye:polish-20180427
...
* pr/12981:
Polish
2018-04-27 09:33:29 +02:00
Johnny Lim
b941c5f1a6
Polish
...
Closes gh-12981
2018-04-27 09:29:16 +02:00
Madhura Bhave
f2d8ca8b3a
Fix failing NettyReactiveWebServerFactoryTests
...
NettyReactiveWebServerFactoryTests.portInUseExceptionIsThrownWhenPortIsAlreadyInUse
started failing on CI following this change in reactor netty:
e6634c27f6
Instead of a `BindException`, a `NativeIoException` is thrown. Since that Exception
is for internal use only, we throw a generic `WebServerException`
instead of the `PortInUseException`.
2018-04-26 15:39:08 -07:00
Madhura Bhave
24ce3ecb43
Fix typo in docs
2018-04-26 13:43:51 -07:00
Madhura Bhave
228c85fe67
Improve List and Map binding documentation
...
Closes gh-12444
2018-04-26 12:18:49 -07:00
Stephane Nicoll
fbe88c483e
Prevent rabbitmq starter to bring webflux on the classpath
...
This commit excludes `com.rabbitmq:http-client` from `spring-rabbit` as
the former brings spring webflux for an optional feature. This also
prevents Spring Boot to consider that a web server should be started as
all the necessary pieces are unexpectedly present.
Closes gh-12853
2018-04-26 16:44:42 +02:00
Stephane Nicoll
ae499c2c44
Merge pull request #12960 from sdeleuze:custom-metadata
...
* pr/12960:
Polish "Document Kotlin custom metadata generation"
Document Kotlin custom metadata generation
2018-04-25 17:20:18 +02:00