Commit Graph

10746 Commits

Author SHA1 Message Date
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
Andy Wilkinson
bf656c70ad Improve MultipartProperties' javadoc
Closes gh-9073
2017-06-02 14:13:26 +01:00
Stephane Nicoll
e94f21356d Fix typo 2017-06-02 14:56:10 +02:00
Stephane Nicoll
c736a1698b Clarify default value of ConditionalOnMissingBean on bean methods
Closes gh-9387
2017-06-02 14:55:58 +02:00
Andy Wilkinson
b9a09fcd64 Abandon failure analysis if start of cycle cannot be determined
Previously, BeanCurrentlyInCreationFailureAnalyzer would return
a FailureAnalysis for any BeanCurrentlyInCreationException even if
it could not determine where the cycle begins. This could lead to an
inaccurate diagram of the cycle being output.

This commit updates BeanCurrentlyInCreationFailureAnalyzer so that
it abandons its analysis and returns null if it is unable to determine
where the cycle begins.

Closes gh-8164
2017-06-02 11:08:29 +01:00
Stephane Nicoll
9fc90a809f Add missing @Test annotations 2017-06-01 13:37:05 +02:00
Andy Wilkinson
5c708ae712 Merge branch '1.4.x' into 1.5.x 2017-06-01 11:04:23 +01:00
Andy Wilkinson
5b4f9edc86 Restore original TCCL in PropertiesLauncherTests
Calling launch of PropertiesLauncherTests sets the thread context
class loader to an instance of LaunchedURLClassLoader. To avoid this
class loader being used beyond the scope of the test and launcher
that created it, this commit updates PropertiesLauncherTests to
capture the TCCL before each test and restore it after each test.

Closes gh-9378
2017-06-01 10:58:00 +01:00
Andy Wilkinson
c22230a418 Try making FilePool static to fix the Mockito problem on Bamboo 2017-05-31 23:24:03 +01:00
Andy Wilkinson
e11b7aff08 Ensure that file is released back to pool when seek fails
Closes gh-9370
2017-05-31 21:50:05 +01:00
Andy Wilkinson
a9fc18bfbf Upgrade to Spring Security JWT 1.0.8.RELEASE
Closes gh-9368
2017-05-31 15:12:43 +01:00
Stephane Nicoll
b311eeb428 Polish 2017-05-31 10:27:43 +02:00
Stephane Nicoll
5b3b8b0c40 Reference Teeid starter 2017-05-31 10:26:54 +02:00
Stephane Nicoll
31868cdb2a Order this party starters
Closes gh-9362
2017-05-31 10:26:25 +02:00
Stephane Nicoll
08a8bb0f8b Revert "Add failure analyzer for BeanCreationException"
Closes gh-9220
2017-05-30 14:23:47 +02:00
Stephane Nicoll
07ec13d454 Merge branch '1.4.x' into 1.5.x 2017-05-30 09:19:54 +02:00
Stephane Nicoll
6415828693 Upgrade to Spring Security OAuth2 2.0.14.RELEASE
Closes gh-9346
2017-05-30 09:18:38 +02:00
Stephane Nicoll
9b2ad6100e Fix reference of custom layout example
Closes gh-9342
2017-05-29 14:56:14 +02:00
Stephane Nicoll
b8591206d5 Polish 2017-05-29 11:49:46 +02:00
Stephane Nicoll
062dc3cb9a Upgrade to Neo4J OGM 2.1.3
Closes gh-9335
2017-05-29 11:48:55 +02:00
Stephane Nicoll
544d516563 Merge branch '1.4.x' into 1.5.x 2017-05-29 10:26:52 +02:00
Stephane Nicoll
250d5f9a52 Deprecate Atomikos console logs properties
Those properties are no longer honoured with Atomikos 3.8 and we're
using 3.9 by default.

Closes gh-9292
2017-05-29 10:18:35 +02:00
Stephane Nicoll
b5709fd618 Polish
See gh-9330
2017-05-28 17:44:58 +02:00
Andy Wilkinson
7254ae84ab Upgrade to Artemis 1.5.5
Closes gh-9303
2017-05-24 12:48:28 +01:00
Andy Wilkinson
d8bc4751c8 Upgrade to Undertow 1.4.15.Final
Closes gh-9302
2017-05-24 12:48:28 +01:00
Andy Wilkinson
7f6081318f Avoid limitation of javac's type inferencing 2017-05-23 22:10:57 +01:00