4113 Commits

Author SHA1 Message Date
Andy Wilkinson
548cc05bb6 Polish 2018-11-23 19:33:33 +00:00
Andy Wilkinson
5a246ce24d Merge branch '2.0.x' 2018-11-23 17:00:24 +00:00
Andy Wilkinson
8772f90e2f Polish 2018-11-23 17:00:16 +00:00
Andy Wilkinson
35cce76ae8 Merge branch '2.0.x' 2018-11-23 16:59:27 +00:00
Andy Wilkinson
3331fa2d02 Merge branch '1.5.x' into 2.0.x 2018-11-23 16:59:18 +00:00
Andy Wilkinson
1797040e1a Merge branch '2.0.x' 2018-11-23 16:42:13 +00:00
Andy Wilkinson
a54de61e61 Polish
Revert change inadvertently committed as part of gh-15017
2018-11-23 16:41:25 +00:00
Andy Wilkinson
4f405ed97d Merge branch '2.0.x' 2018-11-23 15:45:13 +00:00
Andy Wilkinson
058428a14c Clarify how multiple attributes are treated by ConditionalOn(Missing)Bean
Closes gh-15177
2018-11-23 15:44:58 +00:00
Andy Wilkinson
f25c32e8b9 Merge branch '2.0.x' 2018-11-23 15:26:08 +00:00
Andy Wilkinson
d104205880 Update docs to reflect that @AutoConfigureRestDocs supports WebTestClient
Closes gh-15220
2018-11-23 15:26:01 +00:00
Andy Wilkinson
deeb961c6e Merge branch '2.0.x' 2018-11-23 15:23:14 +00:00
Andy Wilkinson
1f39b5dd7a Align MeterRegistryConfigurer's javadoc with its implementation
Closes gh-15017
2018-11-23 15:22:09 +00:00
Andy Wilkinson
56519e5cbb Merge branch '2.0.x' 2018-11-23 15:12:13 +00:00
Andy Wilkinson
8ee57ac574 Remove redundant suggestion to add a dependency on Woodstox
It's now a transitive dependency of jackson-dataformat-xml so there is no
need to depend on it explicitly.

Closes gh-15092
2018-11-23 15:11:03 +00:00
Andy Wilkinson
7790876575 Merge branch '2.0.x' 2018-11-23 14:01:12 +00:00
Andy Wilkinson
c0e286b96b Test the Gradle Plugin against Gradle 5.0-rc-3
Closes gh-15171
2018-11-23 13:47:19 +00:00
Andy Wilkinson
ce0a3d0311 Add missing classpath setters to BootJar and BootWar
Closes gh-15087
2018-11-23 13:46:56 +00:00
Andy Wilkinson
3bda78a3d3 Fix tests after HandlerExceptionResolver logging changes
See gh-14936 and gh-15189
2018-11-22 20:27:19 +00:00
Andy Wilkinson
b5433cd862 Revert "Upgrade to Selenium Htmlunit 2.33.3"
This reverts commit 3048b7a218ac2b4366926f1e13cc0be3651c3084.

See gh-15269
2018-11-22 20:10:13 +00:00
Andy Wilkinson
27ef03a2c1 Merge branch '2.0.x' 2018-11-22 17:31:32 +00:00
Andy Wilkinson
97f7984812 Merge branch '1.5.x' into 2.0.x 2018-11-22 17:31:03 +00:00
Andy Wilkinson
ee8aca77eb Start building against Spring Session Bean-SR1 snapshots
See gh-15275
2018-11-22 15:55:35 +00:00
Andy Wilkinson
fc6df83f56 Start building against Spring Security 5.1.2 snapshots
See gh-15274
2018-11-22 15:55:03 +00:00
Andy Wilkinson
449b40f6fc Start building against Spring Kafka 2.2.1 snapshots
See gh-15273
2018-11-22 15:54:31 +00:00
Andy Wilkinson
848121288c Start building against Spring Integration 5.1.1 snapshots
See gh-15272
2018-11-22 15:53:52 +00:00
Andy Wilkinson
3d4838c055 Start building against Spring AMQP 2.1.2 snapshots
See gh-15271
2018-11-22 15:53:21 +00:00
Andy Wilkinson
df918bae5d Upgrade to Maven Shade Plugin 3.2.1
Closes gh-15270
2018-11-22 15:50:03 +00:00
Andy Wilkinson
3048b7a218 Upgrade to Selenium Htmlunit 2.33.3
Closes gh-15269
2018-11-22 15:50:03 +00:00
Andy Wilkinson
a2ff9b7d35 Upgrade to Lombok 1.18.4
Closes gh-15268
2018-11-22 15:50:02 +00:00
Andy Wilkinson
b73cf9f738 Upgrade to Mockito 2.23.4
Closes gh-15267
2018-11-22 15:50:02 +00:00
Andy Wilkinson
1a8ac57a2f Upgrade to Jooq 3.11.7
Closes gh-15266
2018-11-22 15:50:02 +00:00
Andy Wilkinson
88bec38961 Upgrade to Infinispan 9.4.2.Final
Closes gh-15265
2018-11-22 15:50:02 +00:00
Andy Wilkinson
58750624bc Upgrade to Elasticsearch 6.4.3
Closes gh-15264
2018-11-22 15:48:13 +00:00
Andy Wilkinson
fa4de5eb78 Upgrade to Ehcache3 3.6.2
Closes gh-15263
2018-11-22 15:48:12 +00:00
Andy Wilkinson
e0761b814d Upgrade to Groovy 2.5.4
Closes gh-15262
2018-11-22 15:48:11 +00:00
Andy Wilkinson
19a8fb56c7 Upgrade to Tomcat 9.0.13
Closes gh-15261
2018-11-22 15:48:10 +00:00
Andy Wilkinson
6753b247e1 Upgrade to Kafka 2.0.1
Closes gh-15260
2018-11-22 15:48:10 +00:00
Andy Wilkinson
b028ac75a6 Upgrade to Byte Buddy 1.9.4
Closes gh-15259
2018-11-22 15:48:08 +00:00
Andy Wilkinson
c4a0364a55 Upgrade to Undertow 2.0.15.Final
Closes gh-15258
2018-11-22 15:48:08 +00:00
Andy Wilkinson
2ea4852575 Upgrade to Couchbase Client 2.7.1
Closes gh-15257
2018-11-22 15:48:07 +00:00
Andy Wilkinson
0b5f52ef0b Merge branch '2.0.x' 2018-11-22 15:42:12 +00:00
Andy Wilkinson
9ca96cb751 Start building against Spring Framework 5.1.1 snapshots
See gh-15189
2018-11-22 15:33:10 +00:00
Andy Wilkinson
39bec2c50f Start building against Spring Integration 5.0.10 snapshots
See gh-15251
2018-11-22 15:32:21 +00:00
Andy Wilkinson
00f1e92350 Start building against Spring Session Apple-SR7 snapshots
See gh-15254
2018-11-22 15:30:40 +00:00
Andy Wilkinson
739de913d5 Start building against Spring AMQP 2.0.10 snapshots
See gh-15256
2018-11-22 15:29:55 +00:00
Andy Wilkinson
de84a51f26 Upgrade to Spring Cloud Connectors 2.0.4.RELEASE
Closes gh-15250
2018-11-22 15:21:59 +00:00
Andy Wilkinson
ff22df0475 Upgrade to Jetty El 8.5.33.1
Closes gh-15249
2018-11-22 15:21:58 +00:00
Andy Wilkinson
d08edf7e14 Upgrade to Elasticsearch 5.6.13
Closes gh-15248
2018-11-22 15:21:57 +00:00
Andy Wilkinson
350e397d53 Upgrade to Janino 3.0.11
Closes gh-15247
2018-11-22 15:21:56 +00:00