Commit Graph

12277 Commits

Author SHA1 Message Date
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
Andy Wilkinson
8c1820afe3 Merge branch '1.5.x' 2017-06-02 11:25:32 +01: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
a00ad72881 Add json starter
This commit adds a new json starter that gathers the core bits to read
and write json with dedicated Java 8 extensions.

The web-related starters have been improved to use the new starter
rather than relying on `jackson-databind` directly.

Closes gh-9297
2017-06-02 11:27:18 +02:00
Stephane Nicoll
4651633b0d Merge pull request #9066 from kuptservol:influxdb-autoconfiguration
* pr/9066:
  Polish "Add influxDB java client auto-configuration"
  Add influxDB java client auto-configuration
2017-06-02 10:51:42 +02:00
Stephane Nicoll
297127e075 Polish "Add influxDB java client auto-configuration"
Closes gh-9066
2017-06-02 10:47:50 +02:00
Sergey Kuptsov
6a70b90128 Add influxDB java client auto-configuration
See gh-9066
2017-06-02 09:57:45 +02:00
Andy Wilkinson
9053bad289 Add dependency management for Elasticsearch modules used by Spring Data
See gh-9374
2017-06-01 22:04:29 +01:00
Stephane Nicoll
dba6bcc7e1 Merge pull request #7946 from tsachev:gh-7945
* pr/7946:
  Polish "Add PoolingOptions to CasandraProperties"
  Add PoolingOptions to CasandraProperties
2017-06-01 16:05:54 +02:00
Stephane Nicoll
ba1bc45a53 Polish "Add PoolingOptions to CasandraProperties"
Closes gh-7946
2017-06-01 16:04:49 +02:00
Vladimir Tsanev
2aafc7daa9 Add PoolingOptions to CasandraProperties
This change allows users to configure some basic pooling
options for cassandra driver via configuration properties.

See gh-7946
2017-06-01 14:33:14 +02:00
Stephane Nicoll
605dee4700 Allow to reset a log level
This commit ensures that `setLogLevel` on the `LoggingSystem` accepts
a `null` level. A `null` level means any customization sets on that
level should be removed and the default configuration should be used
instead.

Effectively, the level of the parent logger is going to be used when
`setLevel` is called with `null` for a given logger.

Most JMX clients do not accept to pass `null` for an argument so an
empty String is translated to null in that specific case.

Closes gh-8776
2017-06-01 14:31:07 +02:00
Stephane Nicoll
bdf2b2e810 Merge branch '1.5.x' 2017-06-01 13:38:03 +02:00
Stephane Nicoll
9fc90a809f Add missing @Test annotations 2017-06-01 13:37:05 +02:00
Andy Wilkinson
7301f9b5e8 Merge branch '1.5.x' 2017-06-01 11:04:42 +01: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
Stephane Nicoll
d4665d02b2 Merge pull request #7960 from kazuki43zoo:jdbc-template-properties
* pr/7960:
  Polish "Allow to customize the JdbcTemplate"
  Allow to customize the JdbcTemplate
2017-06-01 10:51:14 +02:00
Stephane Nicoll
5ea3ab4595 Polish "Allow to customize the JdbcTemplate"
Closes gh-7960
2017-06-01 10:50:52 +02:00
Kazuki Shimizu
fa357f0e27 Allow to customize the JdbcTemplate
See gh-7960
2017-06-01 10:50:43 +02:00
Stephane Nicoll
ad85902880 Reuse JdbcTemplate in NamedParameterJdbcTemplate
This commit makes sure to reuse an existing or auto-configured
`JdbcTemplate` when auto-configuring a `NamedParameterJdbcTemplate`.

This ensures that whatever customizations have been applied on the
`JdbcTemplate` are properly shared.

Closes gh-4945
2017-06-01 10:08:13 +02:00
Phillip Webb
42762a66b8 Upgrade to Elasticsearch 5.4.0
Upgrade to Elasticsearch 5.4.0 and fix auto-configuration to account for
API changes.

See gh-9374
2017-05-31 21:48:14 -07:00