Commit Graph

12491 Commits

Author SHA1 Message Date
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
Andy Wilkinson 2928a31278 Merge branch '1.5.x' 2017-05-31 23:43:55 +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 0296ff6bb0 Fix dependency management for Byte Buddy
- Manage byte-buddy-agent in addition to byte-buddy
 - Remove dependency management from spring-boot-parent now that
   dependency management for Byte Buddy is provided in
   spring-boot-dependencies

Closes gh-9373
2017-05-31 23:06:37 +01:00
Andy Wilkinson 8e2986c86e Fix call to isSpy to be compatible with Mockito 2 2017-05-31 22:10:14 +01:00
Andy Wilkinson b85eed4b58 Polish 2017-05-31 21:59:46 +01:00
Andy Wilkinson bcd34bca6f Merge branch '1.5.x' 2017-05-31 21:50:35 +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
Stephane Nicoll 6f25131a1d Polish 2017-05-31 17:25:38 +02:00
Andy Wilkinson 7524e62537 Merge branch '1.5.x' 2017-05-31 15:13:22 +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
Andy Wilkinson 5ef29653c7 Polish 2017-05-31 15:05:19 +01:00
Andy Wilkinson a9cecc860c Apply TestPropertyValues to the context under test
Closes gh-9367
2017-05-31 15:05:18 +01:00
Stephane Nicoll 2a3d7611ba Merge pull request #9341 from mp911de:async-mongo-builder-customizer
* pr/9341:
  Polish "Allow customization of MongoClientSettings.Builder"
  Allow customization of MongoClientSettings.Builder
2017-05-31 15:48:35 +02:00
Stephane Nicoll eaa34874e8 Polish "Allow customization of MongoClientSettings.Builder"
Closes gh-9341
2017-05-31 15:48:22 +02:00
Mark Paluch eeb961075f Allow customization of MongoClientSettings.Builder
MongoClientSettingsBuilderCustomizer allows customization of the
auto-configured `MongoClientSettings.Builder`.

See gh-9341
2017-05-31 15:48:22 +02:00
Andy Wilkinson 4a605f6270 Drop custom software component in favor of just publishing an artifact
Previously, Spring Boot's Gradle plugin provided custom software
components (bootJava and bootWeb) for publishing the artifacts created
by the standard bootJar and bootWar tasks respectively. Providing a
custom software component requires the usage of some of Gradle's
internal APIs and this has now proven to be more trouble than it is
worth.

This commit removes the custom software component and documents how
to publish the artifact created by a BootJar or BootWar task directly
instead.

Closes gh-9153
2017-05-31 14:25:25 +01:00
Stephane Nicoll 725a42a67e Merge pull request #9343 from michael-simons:jooqTest
* pr/9343:
  Polish "Add @JooqTest"
  Add @JooqTest
2017-05-31 15:11:00 +02:00
Stephane Nicoll d096dcad1d Polish "Add @JooqTest"
Closes gh-9343
2017-05-31 15:10:09 +02:00
Michael J. Simons 00a643f9d8 Add @JooqTest
This commit provides test slicing for jOOQ.

See gh-9343
2017-05-31 14:41:28 +02:00
Andy Wilkinson a685d9ec92 Run Gradle integration tests against multiple versions of Gradle
Closes gh-9365
2017-05-31 12:17:12 +01:00
Andy Wilkinson 5f3462f358 Use ObjectFactory rather than Usages to create Usage on Gradle 4.0
Usages has been removed in Gradle 4.0 and replaced with the use of
a new ObjectFactory API that can be used to create a Usage. This
commit uses reflection to access the ObjectFactory from the Project
and use it to create a Usage when an attempt to use Usages fails.

Closes gh-9364
2017-05-31 12:17:12 +01:00
Stephane Nicoll 80ee2a8c30 Merge pull request #9355 from michael-simons:jooqAutoconfigurationImprovements
* pr/9355:
  Polish jOOQ auto-configuration
  Polish "Auto-detect jOOQ dialect"
  Auto-detect jOOQ dialect
2017-05-31 11:25:59 +02:00
Stephane Nicoll 026682d7e3 Polish jOOQ auto-configuration 2017-05-31 11:25:26 +02:00
Stephane Nicoll efdf451e6e Polish "Auto-detect jOOQ dialect"
Closes gh-9355
2017-05-31 11:16:12 +02:00
Michael J. Simons 1b4c5dffaf Auto-detect jOOQ dialect
See gh-9355
2017-05-31 10:43:40 +02:00
Stephane Nicoll a5d51bbeaf Add entry for sshd-shell-spring-boot 2017-05-31 10:37:19 +02:00
Stephane Nicoll 1403b2195e Merge branch '1.5.x' 2017-05-31 10:29:58 +02: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 c5ff21a4d3 Merge pull request #4299 from vpavic:quartz-scheduler-support
* pr/4299:
  Polish "Add Quartz Scheduler support"
  Add Quartz Scheduler support
2017-05-30 18:48:36 +02:00
Stephane Nicoll 59a15b259c Polish "Add Quartz Scheduler support"
Closes gh-4299
2017-05-30 18:48:12 +02:00
Vedran Pavic 9e23206c31 Add Quartz Scheduler support
See gh-4299
2017-05-30 18:48:12 +02:00
Andy Wilkinson da6647c19e Revert "Start building against Spring AMQP 2.0 snapshots"
This reverts commit d6a3238e7d.

See gh-9289
2017-05-30 15:00:22 +01:00
Stephane Nicoll 431a12adea Merge branch '1.5.x' 2017-05-30 14:28:14 +02:00
Stephane Nicoll 08a8bb0f8b Revert "Add failure analyzer for BeanCreationException"
Closes gh-9220
2017-05-30 14:23:47 +02:00