Commit Graph

10771 Commits

Author SHA1 Message Date
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 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 699e826893 Upgrade to Spring Security 4.2.3.RELEASE
Closes gh-9430
2017-06-08 09:35:40 +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 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
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 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 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 a03ddd331c Polishing 2017-06-07 17:14:26 +01: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 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 9579e95868 Handle explicit disablement of management SSL correctly
Closes gh-9423
2017-06-07 13:57:59 +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 fcd0adc307 Start building against Spring Data Ingalls snapshots
See gh-9425
2017-06-07 13:35:38 +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 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
Andy Wilkinson 84721666c5 Stop DuplicateJsonObjectContextCustomizer breaking context caching
See gh-9248
2017-06-06 22:23:43 +01:00
Andy Wilkinson 21a5ab7875 Log a warning during tests when multiple JSONOjects on the class path
Closes gh-9248
2017-06-06 21:35:33 +01:00
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
2017-06-06 16:04:12 +02:00
Andy Wilkinson aa6dbdbae2 Ensure that listeners are called when application fails to run
Closes gh-9054
2017-06-06 14:53:05 +01:00
Andy Wilkinson ad629055fa Ensure that custom static resource locations end with /
Closes gh-9360
2017-06-06 11:39:04 +01:00
Andy Wilkinson 5be5b13775 Clarify need for Apache HTTP Client to disable redirects in TestRestTemplate
Closes gh-9410
2017-06-06 11:14:15 +01:00
Andy Wilkinson a666919acf Increase prominence of warning about fully-executable jar compatibility
Closes gh-8927
2017-06-06 10:42:30 +01:00
Andy Wilkinson 3aaf5b6463 Upgrade to Dependency Management Plugin 1.0.3.RELEASE
Closes gh-9407
Closes gh-9135
2017-06-05 11:15:25 +01:00
Andy Wilkinson d5184724b0 Downgrade Jersey to version that plays nicely with Docker's Java client 2017-06-03 19:40:21 +01:00
Andy Wilkinson ec8ae2f91e Merge branch '1.4.x' into 1.5.x 2017-06-03 16:53:48 +01:00
Andy Wilkinson e60a261952 Do not allow failure to remove container to mask earlier failure 2017-06-03 16:53:28 +01:00
Andy Wilkinson a215103bb5 Merge branch '1.4.x' into 1.5.x 2017-06-03 13:11:39 +01:00
Andy Wilkinson 31ff7f1846 Tolerate Successfully built being found in response other than last
Different versions of Docker produce different responses when building
and tagging an image. On CI, a response with a stream like
"Successfully built 185991ffe24a" followed by a response with a
stream like "Successfully tagged spring-boot-it/centos:6.9-a23bced6"
is received. By default, for the building of an image to be considered
successful, the Docker Java client requires the stream for the last
response item to contain "Successfully built". This means that, on the
CI server, it incorrectly believes that the building of the tagged
image has failed.

This commit uses a custom BuildImageResultCallback that doesn't
require the last response to be the one that has a stream containing
"Successfully built". Instead, it looks back through the error-free
responses (newest to oldest) looking for one with a stream containing
"Successfully built".
2017-06-03 13:00:15 +01:00
Andy Wilkinson 5722c149d0 Merge branch '1.4.x' into 1.5.x 2017-06-03 09:55:29 +01:00
Andy Wilkinson 0270ccafa5 Enable Docker command debug logging to improve diagnostics on CI server 2017-06-03 09:54:13 +01:00
Phillip Webb b9fd99e268 Polish 2017-06-02 13:47:28 -07:00
Andy Wilkinson 3cf8e81a8b Merge branch '1.4.x' into 1.5.x 2017-06-02 19:49:16 +01:00
Andy Wilkinson a69a851ae9 Drop CentOS 5 from launch script tests and upgrade to 6.9
CentOS 5 was declared EOL in March 2017 and yum on longer works
out of the box. 6.9 is the latest release of CentOS 6. Tests for
CentOS 7 have not been added as it uses systemd rather than SysVinit.

Closes gh-9395
2017-06-02 19:45:45 +01:00
Stephane Nicoll f11edd1eb3 Add missing `@Configuration` on `EmbeddedDatabaseConfiguration` 2017-06-02 17:42:18 +02:00
Stephane Nicoll 3921d8732d Merge pull request #8595 from akaGelo:master
* pr/8595:
  Fix OptionalLiveReloadServer create bean
2017-06-02 17:37:00 +02:00
Oleg Vyukov ff3b6b09bd Fix OptionalLiveReloadServer create bean
Closes gh-8595
2017-06-02 17:35:14 +02:00
Andy Wilkinson a347383111 Merge branch '1.4.x' into 1.5.x 2017-06-02 14:18:44 +01:00