Commit Graph

21208 Commits

Author SHA1 Message Date
Andy Wilkinson
06eb24557e Fix HttpTunnelConnectionTests following changes for null handling 2017-06-08 14:38:59 +01:00
Andy Wilkinson
776933a1be Adapt to MockClientHttpResponse no longer accepting a null body 2017-06-08 14:11:37 +01:00
Spring Buildmaster
05d4d0281c Next Development Version 2017-06-08 12:47:16 +00:00
Stephane Nicoll
b5f0701356 Merge branch '1.5.x' 2017-06-08 13:47:01 +03:00
Stephane Nicoll
cb9cd2720c Merge branch '1.4.x' into 1.5.x 2017-06-08 13:46:46 +03:00
Stephane Nicoll
6b1d06cf09 Fixup version numbers following release 2017-06-08 13:46:33 +03:00
Stephane Nicoll
35da39a930 Merge branch '1.5.x' 2017-06-08 13:34:41 +03:00
Stephane Nicoll
9193a9e3dc Upgrade to Spring Data Ingalls SR4
Closes gh-9425
2017-06-08 13:33:49 +03:00
Spring Buildmaster
88e43c8421 Next Development Version 2017-06-08 09:52:43 +00:00
Stephane Nicoll
9f9079c3e4 Merge branch '1.5.x' 2017-06-08 09:36:38 +03:00
Stephane Nicoll
699e826893 Upgrade to Spring Security 4.2.3.RELEASE
Closes gh-9430
2017-06-08 09:35:40 +03:00
Stephane Nicoll
2e6a51a40f Merge branch '1.5.x' 2017-06-08 09:22:38 +03:00
Stephane Nicoll
342509e33a Upgrade to Spring Kafka 1.1.6.RELEASE
Closes gh-9384
2017-06-08 09:20:51 +03:00
Stephane Nicoll
3d9c8c55dc Upgrade to Spring AMQP 1.7.3.RELEASE
Closes gh-9383
2017-06-08 09:19:51 +03:00
Stephane Nicoll
b2a41792cc Merge branch '1.5.x' 2017-06-08 09:03:26 +03:00
Stephane Nicoll
78ba4f3382 Merge branch '1.4.x' into 1.5.x 2017-06-08 09:03:03 +03:00
Stephane Nicoll
1061a99ccf Upgrade to Spring Integration 4.3.10.RELEASE
Closes gh-9385
2017-06-08 09:01:51 +03:00
Phillip Webb
de66621905 Fix unsupported null argument
Update `MockClientHttpRequestFactory` following upstream Spring
Framework changes that mean `null` is not a valid payload.
2017-06-07 20:37:37 -07:00
Stephane Nicoll
d22ab63063 Merge branch '1.5.x' 2017-06-07 23:23:46 +03:00
Stephane Nicoll
9a7ff9a28f Merge branch '1.4.x' into 1.5.x 2017-06-07 23:23:11 +03:00
Stephane Nicoll
c8fdb33293 Upgrade to Spring Framework 4.3.9.RELEASE
Closes gh-9280
2017-06-07 23:22:11 +03:00
Stephane Nicoll
2ecb5014ce Merge branch '1.5.x' 2017-06-07 23:18:39 +03:00
Stephane Nicoll
f9381f5276 Merge branch '1.4.x' into 1.5.x 2017-06-07 23:18:15 +03:00
Stephane Nicoll
ad5e212162 Merge pull request #9429 from artembilan:patch-1
* pr/9429:
  Upgrade to Spring AMQP 1.6.10
2017-06-07 23:17:55 +03:00
Artem Bilan
bd1b230599 Upgrade to Spring AMQP 1.6.10
Closes gh-9429
2017-06-07 23:17:27 +03:00
Andy Wilkinson
0061554105 Merge branch '1.5.x' 2017-06-07 17:19:56 +01:00
Andy Wilkinson
e5906a6b64 Allow HttpMsgConverter to depend on ConvService without creating a cycle
In an MVC web application, DelegatingWebMvcConfiguration provides the
ConversionService while also consuming WebMvcConfigurerAdapters that,
among other things, can configure HTTP message converters. Boot's
WebMvcConfigurerAdapter, WebMvcAutoConfigurationAdapter, consumes
the HttpMessageConverters bean and uses it to configure Spring MVC's
HTTP message converters. This can create a bean dependency cycle if
an HTTP message converter bean depends, directly or indirectly on
the ConversionService. An example of the cycle is:

┌─────┐
|  jsonComponentConversionServiceCycle.ThingDeserializer defined in …
↑     ↓
|  org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration$EnableWebMvcConfiguration
↑     ↓
|  org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration$WebMvcAutoConfigurationAdapter
↑     ↓
|  org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration
↑     ↓
|  mappingJackson2HttpMessageConverter defined in class path resource [org/springframework/boot/autoconfigure/web/JacksonHttpMessageConvertersConfiguration$MappingJackson2HttpMessageConverterConfiguration.class]
↑     ↓
|  jacksonObjectMapper defined in class path resource [org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration$JacksonObjectMapperConfiguration.class]
└─────┘

This commit breaks the cycle by making WebMvcAutoConfigurationAdapter
consume HttpMessageConverters lazily. This allows the adapter to be
created without triggered instantiation of every HTTP message
converter bean and all their dependencies. This allows it to be
injected into DelegatingWebMvcConfiguration without triggering an
attempt to retrieve the ConversionService.

Closes gh-9409
2017-06-07 17:18:09 +01:00
Andy Wilkinson
6b7dfce5c6 Formatting 2017-06-07 17:17:57 +01:00
Andy Wilkinson
a74d1314ab Merge branch '1.5.x' 2017-06-07 17:15:42 +01:00
Andy Wilkinson
a03ddd331c Polishing 2017-06-07 17:14:26 +01:00
Andy Wilkinson
f4c9ab78b2 Fix WebFlux sample's reactor-test dependency
See gh-9427
2017-06-07 16:53:16 +01:00
Stephane Nicoll
e9dceb4207 Merge branch '1.5.x' 2017-06-07 18:49:22 +03:00
Stephane Nicoll
bddf9232a8 Polish 2017-06-07 18:48:24 +03:00
Stephane Nicoll
c2aca4d7f5 Document SpringPhysicalNamingStrategy
Closes gh-9084
2017-06-07 18:43:20 +03:00
Stephane Nicoll
040c12bc85 Merge branch '1.5.x' 2017-06-07 18:42:40 +03:00
Stephane Nicoll
fc38c1ba4d Improve cache sample
Clarify the cache sample and in particular that Infinispan does not
bootstrap with a default configuration file. Hence the custom
`infinispan.xml` configuration is enabled by default if Infinispan is
available on the classpath.

See gh-9417
2017-06-07 18:41:38 +03:00
Andy Wilkinson
c32fab13fd Upgrade to Reactor Bismuth M2
Closes gh-9427
2017-06-07 16:38:44 +01:00
Andy Wilkinson
a72c1b2cba Merge branch '1.5.x' 2017-06-07 14:02:46 +01:00
Andy Wilkinson
9579e95868 Handle explicit disablement of management SSL correctly
Closes gh-9423
2017-06-07 13:57:59 +01:00
Andy Wilkinson
901f37de93 Merge branch '1.5.x' 2017-06-07 13:45:48 +01:00
Andy Wilkinson
223b694d3a Sort the table of starter modules alphabetically
Closes gh-9422
2017-06-07 13:45:02 +01:00
Andy Wilkinson
3bcdd29c25 Merge branch '1.5.x' 2017-06-07 13:36:03 +01:00
Andy Wilkinson
fcd0adc307 Start building against Spring Data Ingalls snapshots
See gh-9425
2017-06-07 13:35:38 +01:00
Andy Wilkinson
de02240f41 Merge branch '1.5.x' 2017-06-07 13:24:20 +01:00
Andy Wilkinson
e3e86eb9c8 Merge branch '1.4.x' into 1.5.x 2017-06-07 13:23:59 +01:00
Andy Wilkinson
8810450e64 Upgrade to Spring Data Hopper SR11
Closes gh-9424
2017-06-07 13:23:17 +01:00
Andy Wilkinson
dc7498244d Merge branch '1.5.x' 2017-06-07 10:41:05 +01:00
Andy Wilkinson
197c0cefbb Merge pull request #9259 from Ethan Rubinson
* gh-9259:
  Polish "Copy conversion service when performing environment conversion"
  Copy conversion service when performing environment conversion
2017-06-07 10:27:14 +01:00
Andy Wilkinson
5b30269ac9 Polish "Copy conversion service when performing environment conversion"
Closes gh-9246
2017-06-07 10:24:15 +01:00
Rubinson,Ethan(erubinson)
a424081803 Copy conversion service when performing environment conversion
Previously, when a web environment was converted to a
StandardEnvironment, any customizations of the source environment's
ConversionService were lost.

This commit updates the logic that performs the conversion to copy
the source's ConversionService to the converted environment, thereby
ensuring that any customizations are retained.

Closes gh-9259
See gh-9246
2017-06-07 10:21:56 +01:00