Commit Graph

12298 Commits

Author SHA1 Message Date
Andy Wilkinson
cdebfcdeef Merge branch '1.5.x' 2017-06-06 11:22:31 +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
9464eea7ae Merge branch '1.5.x' 2017-06-06 10:43:11 +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
Stephane Nicoll
f61ad19299 Merge pull request #9411 from vpavic:improve-quartz-support
* pr/9411:
  Polish contribution
  Ensure `QuartzDatabaseInitializer` is initialized before `Scheduler`
2017-06-06 10:59:52 +02:00
Stephane Nicoll
7f420d1268 Polish contribution
Closes gh-9411
2017-06-06 10:52:31 +02:00
Vedran Pavic
db060c847d Ensure QuartzDatabaseInitializer is initialized before Scheduler
If the auto-configured `Scheduler` instance backed by JDBC job store is
used as a dependency in an application component, the initialization of
`Scheduler` will be triggered before `QuartzDatabaseInitializer`. This
will result in failure due to schema not being prepared in time for
`Scheduler` to populate job details.

This commit ensures `QuartzDatabaseInitializer` is initialized before the
auto-configured `Scheduler` by introducing a dependency between the two.

See gh-9411
2017-06-06 10:14:49 +02:00
Andy Wilkinson
b16fdafa3c Merge branch '1.5.x' 2017-06-05 11:15:43 +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
Stephane Nicoll
c1b08be604 Merge pull request #9404 from htynkn:feature/document-influx-db-in-reference-manual
* pr/9404:
  Polish "Document InfluxDB support"
  Document InfluxDB support
2017-06-05 11:07:10 +02:00
Stephane Nicoll
068f904f24 Polish "Document InfluxDB support"
Closes gh-9404
2017-06-05 11:06:49 +02:00
Huang YunKun
0ee5048412 Document InfluxDB support
See gh-9404
2017-06-05 11:00:27 +02:00
Stephane Nicoll
540dca7bdd Revisit InfluxDB configuration structure
This commit removes the `client` namespace for InfluxDB as the
component that is created is `InfluxDB`, not `InfluxDBClient` or
something.

This aligns with all the other url/user/password properties Spring
Boot provides already

See gh-9066
2017-06-05 11:00:14 +02:00
Andy Wilkinson
4a6b34e725 Merge branch '1.5.x' 2017-06-03 19:41:35 +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
09a8b3c072 Merge branch '1.5.x' 2017-06-03 16:54:02 +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
49fc1b831c Merge branch '1.5.x' 2017-06-03 13:13:04 +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
b8bd51fd48 Merge branch '1.5.x' 2017-06-03 09:55:47 +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
2c7dd9f519 Polish 2017-06-02 16:00:39 -07:00
Phillip Webb
8f7004738b Merge branch '1.5.x' 2017-06-02 13:48:27 -07:00
Phillip Webb
b9fd99e268 Polish 2017-06-02 13:47:28 -07:00
Andy Wilkinson
4f747d426e Drop back to Surefire 2.19.1 as 2.19.2 was rebranded as 2.20 2017-06-02 20:15:11 +01:00
Andy Wilkinson
33924f5569 Drop back to Surefire 2.19.2 in case 2.20 has a memory leak
See gh-6299
2017-06-02 20:08:47 +01:00
Andy Wilkinson
99790f67e0 Merge branch '1.5.x' 2017-06-02 19:49:51 +01: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
9624bf14c4 Merge branch '1.5.x' 2017-06-02 17:58:18 +02:00
Stephane Nicoll
90498a0b2f Fix broken build 2017-06-02 17:58:14 +02: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
f8a5e3d0b7 Configure Wildfly sample to exclude Wildfly's version of Jackson
Closes gh-9391
2017-06-02 15:43:50 +01:00
Stephane Nicoll
d48c414a64 Use HikariCP is jdbc and jpa starters
This commit is a companion of what was done in #6013. As HikariCP is
now the default connection pool, the jdbc and jpa starters no longer
provide `tomcat-jdbc`, but rather `HikariCP`.

Closes gh-9392
2017-06-02 16:35:44 +02:00
Andy Wilkinson
84f0484aef Add dependencies needed for javadoc generation
See gh-9066
See gh-4299
2017-06-02 14:55:45 +01:00
Andy Wilkinson
45a337b515 Improve links to Gradle plugin's documentation
Closes gh-9386
2017-06-02 14:46:11 +01:00
Andy Wilkinson
35fd4ede9c Upgrade to Maven Surefire Plugin 2.20
Closes gh-6299
2017-06-02 14:22:25 +01:00
Andy Wilkinson
8353843006 Merge branch '1.5.x' 2017-06-02 14:19:52 +01: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
Andy Wilkinson
2090bef08e Configure Glassfish sample to use parent-last class loader delegation
Glassfish bundles an old and incomplete version of Glassfish. By
default, this leads to some of Jackson's classes being loaded from
inside the war file and others being loaded from Glassfish itself.
This mixture of versions does not end well and the application fails
to deploy.

This commit adds a Glassfish-specific deployment descriptor to
invert the web app class loader's delegation model. Rather than
preferring classes available from its parent, it will now prefer
those packaged inside the war file.

Closes gh-9391
2017-06-02 13:57:52 +01:00
Stephane Nicoll
5e5b7e20ff Merge branch '1.5.x' 2017-06-02 14:57:08 +02: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
Stephane Nicoll
a6c01d3b30 Remove jackson-datatype-jdk8 dependency for now
This dependency breaks Glassfish integration tests and was not strictly
required by #9297.
2017-06-02 14:21:09 +02:00