Commit Graph

12451 Commits (4d6965a147c2ab20ebb89255617d0468aabb0cbf)
 

Author SHA1 Message Date
Stephane Nicoll 9193a9e3dc Upgrade to Spring Data Ingalls SR4
Closes gh-9425
8 years ago
Spring Buildmaster 88e43c8421 Next Development Version 8 years ago
Stephane Nicoll 9f9079c3e4 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 699e826893 Upgrade to Spring Security 4.2.3.RELEASE
Closes gh-9430
8 years ago
Stephane Nicoll 2e6a51a40f Merge branch '1.5.x' 8 years ago
Stephane Nicoll 342509e33a Upgrade to Spring Kafka 1.1.6.RELEASE
Closes gh-9384
8 years ago
Stephane Nicoll 3d9c8c55dc Upgrade to Spring AMQP 1.7.3.RELEASE
Closes gh-9383
8 years ago
Stephane Nicoll b2a41792cc Merge branch '1.5.x' 8 years ago
Stephane Nicoll 78ba4f3382 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 1061a99ccf Upgrade to Spring Integration 4.3.10.RELEASE
Closes gh-9385
8 years ago
Phillip Webb de66621905 Fix unsupported null argument
Update `MockClientHttpRequestFactory` following upstream Spring
Framework changes that mean `null` is not a valid payload.
8 years ago
Stephane Nicoll d22ab63063 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 9a7ff9a28f Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll c8fdb33293 Upgrade to Spring Framework 4.3.9.RELEASE
Closes gh-9280
8 years ago
Stephane Nicoll 2ecb5014ce Merge branch '1.5.x' 8 years ago
Stephane Nicoll f9381f5276 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll ad5e212162 Merge pull request #9429 from artembilan:patch-1
* pr/9429:
  Upgrade to Spring AMQP 1.6.10
8 years ago
Artem Bilan bd1b230599 Upgrade to Spring AMQP 1.6.10
Closes gh-9429
8 years ago
Andy Wilkinson 0061554105 Merge branch '1.5.x' 8 years ago
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
8 years ago
Andy Wilkinson 6b7dfce5c6 Formatting 8 years ago
Andy Wilkinson a74d1314ab Merge branch '1.5.x' 8 years ago
Andy Wilkinson a03ddd331c Polishing 8 years ago
Andy Wilkinson f4c9ab78b2 Fix WebFlux sample's reactor-test dependency
See gh-9427
8 years ago
Stephane Nicoll e9dceb4207 Merge branch '1.5.x' 8 years ago
Stephane Nicoll bddf9232a8 Polish 8 years ago
Stephane Nicoll c2aca4d7f5 Document SpringPhysicalNamingStrategy
Closes gh-9084
8 years ago
Stephane Nicoll 040c12bc85 Merge branch '1.5.x' 8 years ago
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
8 years ago
Andy Wilkinson c32fab13fd Upgrade to Reactor Bismuth M2
Closes gh-9427
8 years ago
Andy Wilkinson a72c1b2cba Merge branch '1.5.x' 8 years ago
Andy Wilkinson 9579e95868 Handle explicit disablement of management SSL correctly
Closes gh-9423
8 years ago
Andy Wilkinson 901f37de93 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 223b694d3a Sort the table of starter modules alphabetically
Closes gh-9422
8 years ago
Andy Wilkinson 3bcdd29c25 Merge branch '1.5.x' 8 years ago
Andy Wilkinson fcd0adc307 Start building against Spring Data Ingalls snapshots
See gh-9425
8 years ago
Andy Wilkinson de02240f41 Merge branch '1.5.x' 8 years ago
Andy Wilkinson e3e86eb9c8 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 8810450e64 Upgrade to Spring Data Hopper SR11
Closes gh-9424
8 years ago
Andy Wilkinson dc7498244d Merge branch '1.5.x' 8 years ago
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
8 years ago
Andy Wilkinson 5b30269ac9 Polish "Copy conversion service when performing environment conversion"
Closes gh-9246
8 years ago
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
8 years ago
Andy Wilkinson 563c9dc58c Merge branch '1.5.x' 8 years ago
Andy Wilkinson 84721666c5 Stop DuplicateJsonObjectContextCustomizer breaking context caching
See gh-9248
8 years ago
Andy Wilkinson 61a1798296 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 21a5ab7875 Log a warning during tests when multiple JSONOjects on the class path
Closes gh-9248
8 years ago
Stephane Nicoll 05fbd5dc46 Merge branch '1.5.x' 8 years ago
Stephane Nicoll cbdab9edb3 Add support for custom ProtocolResolver with Devtools
Prior to this commit, custom `ProtocolResolvers` set on the
`ApplicationContext` were lost when Devtools is used as the customized
`ResourceLoader` did not copy any customization made to the default
resource loader.

This commit makes sure to copy any `ProtocolResolver` set on the context.

Closes gh-9331
8 years ago
Andy Wilkinson d844a0cf66 Merge branch '1.5.x' 8 years ago