Commit Graph

2843 Commits

Author SHA1 Message Date
Phillip Webb a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +01:00
Phillip Webb 63b609827e Fix checkstyle method order issues
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.

See gh-13932
2018-07-28 01:11:53 +01:00
Phillip Webb e6a68b39a3 Fix checkstyle javadoc issues
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.

See gh-13932
2018-07-28 01:11:52 +01:00
Phillip Webb 7fc455654a Fix checkstyle ternary issues
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
2018-07-28 01:11:52 +01:00
Phillip Webb ec1100a896 Upgrade to spring-javaformat 0.0.6
Closes gh-13932
2018-07-28 01:11:48 +01:00
Phillip Webb cddd794a07 Polish 2018-07-28 00:05:25 +01:00
Madhura Bhave f2a9030788 Merge branch '2.0.x' 2018-07-27 12:23:51 -07:00
Madhura Bhave e753b530fa EndpointRequest should match links with trailing slash
Fixes gh-13921
2018-07-27 12:23:27 -07:00
Stephane Nicoll f7b90a73a0 Upgrade to Spring Kafka 2.1.8.RELEASE
Closes gh-13887
2018-07-27 19:53:47 +02:00
Stephane Nicoll e9a42e27d6 Merge branch '2.0.x' 2018-07-27 11:36:25 +02:00
Stephane Nicoll 2a0d1918f1 Merge branch '1.5.x' into 2.0.x 2018-07-27 11:36:10 +02:00
Stephane Nicoll 659535d1ec Upgrade to Spring Data Kay SR9
Closes gh-13890
2018-07-27 10:02:18 +02:00
Stephane Nicoll 3d43bf7797 Upgrade to Spring Security 5.1.0.M2
Closes gh-13899
2018-07-27 09:23:40 +02:00
Stephane Nicoll dea1e29683 Merge branch '2.0.x' 2018-07-27 01:56:52 +02:00
Johnny Lim 8a9224b78c Polish NoSuchBeanDefinitionFailureAnalyzer
Closes gh-13923
2018-07-27 01:55:38 +02:00
Stephane Nicoll 4139e1b9ab Upgrade to Spring Kafka 2.2.0.M1
Closes gh-13023
2018-07-27 01:51:51 +02:00
Stephane Nicoll 73fe8d482e Merge branch '2.0.x' 2018-07-27 01:47:54 +02:00
Stephane Nicoll 54a6ee7a06 Upgrade to Spring HATEOAS 0.25.0.RELEASE
Closes gh-13742
2018-07-27 01:46:08 +02:00
Stephane Nicoll d8192d7e04 Upgrade to Spring Amqp 2.1.0.M1
Closes gh-13885
2018-07-27 01:41:08 +02:00
Stephane Nicoll 8603fdddb1 Upgrade to Spring Amqp 2.0.5.RELEASE
Closes gh-3884
2018-07-27 01:38:20 +02:00
Stephane Nicoll d98b23bdd9 Upgrade to Spring Framework 5.0.8
Closes gh-13704
2018-07-27 01:30:47 +02:00
Stephane Nicoll ec2e3c4c0e Merge branch '2.0.x' 2018-07-27 01:03:37 +02:00
dreis2211 bfbf57b0eb Fix typo
Closes gh-13919
2018-07-27 01:03:01 +02:00
Stephane Nicoll 0f15b72fab Upgrade to Spring Security 5.0.7.RELEASE
Closes gh-13898
2018-07-27 01:01:08 +02:00
Stephane Nicoll 4b3c40ff10 Merge branch '2.0.x' 2018-07-27 00:47:09 +02:00
Stephane Nicoll 85cffd1ab5 Upgrade to Spring Web Services 3.0.3.RELEASE
Closes gh-13912
2018-07-27 00:46:19 +02:00
Stephane Nicoll 37f1146c31 Fix formatting 2018-07-27 00:45:31 +02:00
Madhura Bhave db1d3fa282 Merge branch '2.0.x' 2018-07-26 12:36:40 -07:00
Madhura Bhave c775ff8f60 Fix import 2018-07-26 12:33:52 -07:00
Madhura Bhave 6fe366bd64 Merge branch '2.0.x' 2018-07-26 12:19:57 -07:00
Madhura Bhave 6bd438a737 Document `@ConditionalOnProperty` limitation with collections
Closes gh-7483
2018-07-26 12:19:06 -07:00
Madhura Bhave 78cb802f98 Merge branch '2.0.x' 2018-07-26 11:39:42 -07:00
Madhura Bhave 57515dfa78 Fix typo 2018-07-26 11:38:23 -07:00
Stephane Nicoll f780179777 Polish contribution
Closes gh-13904
2018-07-26 17:22:58 +02:00
artsiom df6feb3e2a Make SpringBootConfigurationFinder public and usable with other annotations
See gh-13904
2018-07-26 17:07:55 +02:00
dreis2211 4bb78d5a48 Fix unchecked assignment in AutoConfigurationImportSelector
Closes gh-13908
2018-07-26 17:06:04 +02:00
Phillip Webb b5b60c2053 Merge branch '2.0.x' 2018-07-26 13:23:07 +01:00
Stephane Nicoll 276f978261 Upgrade to Spring Data Lovelace RC1
Closes gh-13740
2018-07-26 13:19:16 +02:00
Phillip Webb 9a9111af21 Support path discovery for main dispatcher servlet
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
2018-07-26 11:35:12 +01:00
Phillip Webb d37e717500 Polish 2018-07-26 11:35:12 +01:00
Stephane Nicoll 406d848406 Merge branch '2.0.x' 2018-07-26 11:30:00 +02:00
Stephane Nicoll 12f8ef1b6e Upgrade to Spring Web Services 3.0.2.RELEASE
Closes gh-13912
2018-07-26 11:24:47 +02:00
Stephane Nicoll 787927ba81 Upgrade to Spring Framework 5.1.0.RC1
Closes gh-13911
2018-07-26 11:11:58 +02:00
Stephane Nicoll 1e7aa7c4bc Fix Spring Integration imports 2018-07-25 16:25:06 +02:00
Stephane Nicoll 37f5e69173 Start building against Spring Security 5.0.7 snapshots
See gh-13898
2018-07-25 15:48:09 +02:00
Stephane Nicoll bdf028a2e6 Merge branch '2.0.x' 2018-07-25 15:39:01 +02:00
Stephane Nicoll 99f33d5070 Start building against Spring Data Kay snapshots
See gh-13890
2018-07-25 15:34:52 +02:00
Andy Wilkinson 1ab98ca33f Start building against Spring HATEOAS 0.25.0 snapshots
See gh-13742
2018-07-25 15:21:20 +02:00
Stephane Nicoll 56542ef809 Start building against Spring Integration 2.1.0 snapshots
See gh-13891
2018-07-25 14:50:14 +02:00
Stephane Nicoll 9e34938ce0 Start building against Spring Amqp 2.1.0 snapshots
See gh-13885
2018-07-25 14:43:25 +02:00