Commit Graph

12478 Commits (6aec6d68f6c8b17a89a779c7e61d473ff3107ebb)
 

Author SHA1 Message Date
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".
8 years ago
Andy Wilkinson b8bd51fd48 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 5722c149d0 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 0270ccafa5 Enable Docker command debug logging to improve diagnostics on CI server 8 years ago
Phillip Webb 2c7dd9f519 Polish 8 years ago
Phillip Webb 8f7004738b Merge branch '1.5.x' 8 years ago
Phillip Webb b9fd99e268 Polish 8 years ago
Andy Wilkinson 4f747d426e Drop back to Surefire 2.19.1 as 2.19.2 was rebranded as 2.20 8 years ago
Andy Wilkinson 33924f5569 Drop back to Surefire 2.19.2 in case 2.20 has a memory leak
See gh-6299
8 years ago
Andy Wilkinson 99790f67e0 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 3cf8e81a8b Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Stephane Nicoll 9624bf14c4 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 90498a0b2f Fix broken build 8 years ago
Stephane Nicoll f11edd1eb3 Add missing `@Configuration` on `EmbeddedDatabaseConfiguration` 8 years ago
Stephane Nicoll 3921d8732d Merge pull request #8595 from akaGelo:master
* pr/8595:
  Fix OptionalLiveReloadServer create bean
8 years ago
Oleg Vyukov ff3b6b09bd Fix OptionalLiveReloadServer create bean
Closes gh-8595
8 years ago
Andy Wilkinson f8a5e3d0b7 Configure Wildfly sample to exclude Wildfly's version of Jackson
Closes gh-9391
8 years ago
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
8 years ago
Andy Wilkinson 84f0484aef Add dependencies needed for javadoc generation
See gh-9066
See gh-4299
8 years ago
Andy Wilkinson 45a337b515 Improve links to Gradle plugin's documentation
Closes gh-9386
8 years ago
Andy Wilkinson 35fd4ede9c Upgrade to Maven Surefire Plugin 2.20
Closes gh-6299
8 years ago
Andy Wilkinson 8353843006 Merge branch '1.5.x' 8 years ago
Andy Wilkinson a347383111 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson bf656c70ad Improve MultipartProperties' javadoc
Closes gh-9073
8 years ago
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
8 years ago
Stephane Nicoll 5e5b7e20ff Merge branch '1.5.x' 8 years ago
Stephane Nicoll e94f21356d Fix typo 8 years ago
Stephane Nicoll c736a1698b Clarify default value of `ConditionalOnMissingBean` on bean methods
Closes gh-9387
8 years ago
Stephane Nicoll a6c01d3b30 Remove `jackson-datatype-jdk8` dependency for now
This dependency breaks Glassfish integration tests and was not strictly
required by #9297.
8 years ago
Andy Wilkinson 8c1820afe3 Merge branch '1.5.x' 8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
Stephane Nicoll 297127e075 Polish "Add influxDB java client auto-configuration"
Closes gh-9066
8 years ago
Sergey Kuptsov 6a70b90128 Add influxDB java client auto-configuration
See gh-9066
8 years ago
Andy Wilkinson 9053bad289 Add dependency management for Elasticsearch modules used by Spring Data
See gh-9374
8 years ago
Stephane Nicoll dba6bcc7e1 Merge pull request #7946 from tsachev:gh-7945
* pr/7946:
  Polish "Add PoolingOptions to CasandraProperties"
  Add PoolingOptions to CasandraProperties
8 years ago
Stephane Nicoll ba1bc45a53 Polish "Add PoolingOptions to CasandraProperties"
Closes gh-7946
8 years ago
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
8 years ago
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
8 years ago
Stephane Nicoll bdf2b2e810 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 9fc90a809f Add missing @Test annotations 8 years ago
Andy Wilkinson 7301f9b5e8 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 5c708ae712 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
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
8 years ago
Stephane Nicoll 5ea3ab4595 Polish "Allow to customize the JdbcTemplate"
Closes gh-7960
8 years ago
Kazuki Shimizu fa357f0e27 Allow to customize the JdbcTemplate
See gh-7960
8 years ago
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
8 years ago