Commit Graph

12374 Commits (a1ef38b55509f660312f4561587cf7983ff423b1)
 

Author SHA1 Message Date
Stephane Nicoll a1ef38b555 Merge branch '1.5.x' 8 years ago
Stephane Nicoll bbb4cd2ad8 Merge pull request #9447 from akihyro:logback-access
* pr/9447:
  Add Logback-access starter to the community list
8 years ago
Akihiro Kondo 2649e3787e Add Logback-access starter to the community list
Closes gh-9447
8 years ago
Stephane Nicoll 09a4588d9b Merge pull request #9446 from akihyro:orika
* pr/9446:
  Add Orika starter to the community list
8 years ago
Akihiro Kondo 9711480658 Add Orika starter to the community list
Closes gh-9446
8 years ago
Andy Wilkinson f7e9ec5f42 Minimise our usage of SocketUtils.findAvailableTcpPort
Closes gh-9382
8 years ago
Andy Wilkinson 10868519e1 Adapt to breaking API change in Spring Data Commons 8 years ago
Andy Wilkinson f5da19f2db Align HikariDriverConfigurationFailureAnalyzer with latest Framework change
The Framework now throws a CannotGetJdbcConnectionException rather
than an IllegalStateException.
8 years ago
Stephane Nicoll c3e96d5122 Merge pull request #9434 from vpavic:gh-9433
* pr/9434:
  Fix `QuartzAutoConfigurtion` failure with multiple `Executor` beans
8 years ago
Vedran Pavic a80348753d Fix `QuartzAutoConfigurtion` failure with multiple `Executor` beans
`QuartzAutoConfigurtion` currently blows up if there are multiple
`Executor` beans in the context.

This commit changes the configuration to retrieve `Executor` bean using
`ObjectProvider#getIfUnique` which won't fail in scenarios where there
are multiple `Executor` beans with none marked as `@Primary`.

Closes gh-9434
8 years ago
Stephane Nicoll a7f51c0d14 Merge pull request #9438 from izeye:polish-20170609
* pr/9438:
  Polish
8 years ago
Johnny Lim bbab520926 Polish
Closes gh-9438
8 years ago
Stephane Nicoll fe3e1cf1d3 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 61eda3e6b0 Polish
See gh-9438
8 years ago
Stephane Nicoll 7ae9477bd3 Merge branch '1.5.x' 8 years ago
Stephane Nicoll aa083996f9 Fixup version numbers following release 8 years ago
Andy Wilkinson 06eb24557e Fix HttpTunnelConnectionTests following changes for null handling 8 years ago
Andy Wilkinson 776933a1be Adapt to MockClientHttpResponse no longer accepting a null body 8 years ago
Spring Buildmaster 05d4d0281c Next Development Version 8 years ago
Stephane Nicoll b5f0701356 Merge branch '1.5.x' 8 years ago
Stephane Nicoll cb9cd2720c Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 6b1d06cf09 Fixup version numbers following release 8 years ago
Stephane Nicoll 35da39a930 Merge branch '1.5.x' 8 years ago
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