Commit Graph

5904 Commits

Author SHA1 Message Date
Phillip Webb 82949b9cc4 Upgrade to Mariadb 2.4.2
Closes gh-17237
2019-06-17 20:56:14 -07:00
Phillip Webb 1e0cf960f0 Reinstate single page HTML and PDF docs
Closes gh-16854
2019-06-17 20:44:01 -07:00
Phillip Webb e44caec60b Merge branch '2.1.x'
Closes gh-17236
2019-06-17 19:51:51 -07:00
Phillip Webb 3eb7af1506 Upgrade to Infinispan 9.4.15.Final
Closes gh-17235
2019-06-17 19:42:33 -07:00
Phillip Webb 2c2b962204 Merge branch '2.1.x'
Closes gh-17232
2019-06-17 15:54:51 -07:00
Phillip Webb d82ccf1405 Ensure META-INF/MANIFEST.MF remains as first entry
Update Gradle archive tasks to ensure that `META-INF/` and
`META-INF/MANIFEST.MF` remain as the first entries of the archive.

Prior to this commit, rewritten archives would violate the implicit
specification of `JarInputStream` that these entries should be first.

Fixes gh-16698
2019-06-17 15:48:14 -07:00
Phillip Webb f4d9e1c650 Fix checkstyle violation 2019-06-17 14:45:17 -07:00
Phillip Webb 69fbd8f20c Merge branch '2.1.x'
Closes gh-17227
Closes gh-17228
2019-06-17 11:53:16 -07:00
Phillip Webb 692bda1595 Polish "Fix connection timeout configuration for Netty"
See gh-16535
2019-06-17 11:26:36 -07:00
ayudovin b0e4c716d3 Fix connection timeout configuration for Netty
Update `NettyWebServerFactoryCustomizer` to deal with the fact that
Netty treats `0` and negative connection timeout values differently to
Tomcat, Undertow and Jetty.

See gh-16535
2019-06-17 11:24:35 -07:00
ayudovin c2d1cb2c70 Chain predicates in PropertyMapper when methods
Update `PropertyMapper` to correctly combine predicates when repeated
calls are made to `when` and `whenNot`. Prior to this commit, subsequent
invocations would replace the previous predicate.

Fixes gh-17225
2019-06-17 11:21:56 -07:00
Andy Wilkinson bd14050859 Merge branch '2.1.x'
Closes gh-17224
2019-06-17 16:16:41 +01:00
Andy Wilkinson 88fbc529e6 Upgrade to Micrometer 1.1.5
Closes gh-17222
2019-06-17 16:15:44 +01:00
Andy Wilkinson f07f030ba9 Merge branch '2.1.x'
Closes gh-17223
2019-06-17 16:08:42 +01:00
Andy Wilkinson fe9db792ee Complete dependency management for JavaBeans Activation Framework
Fixes gh-17062
2019-06-17 16:00:39 +01:00
Andy Wilkinson a189e4cf96 Merge branch '2.1.x'
Closes gh-17220
2019-06-17 14:05:16 +01:00
Andy Wilkinson 645514f848 Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
See gh-16485
2019-06-17 13:54:41 +01:00
Lorenzo Dee 7340d546b8 Honour base path from @WebAppConfiguration in @WebMvcTest
See gh-16485
2019-06-17 13:37:55 +01:00
Andy Wilkinson 9d355f00e1 Merge branch '2.1.x'
Closes gh-17218
2019-06-17 13:19:45 +01:00
Andy Wilkinson 5dc2339ec2 Polish "Consider properties from @AutoConfigureTestDatabase"
See gh-16814
2019-06-17 11:38:13 +01:00
András Deák 92256c80d0 Consider properties from @AutoConfigureTestDatabase
Both Flyway and Liquibase makes use of DataSourceProperties to get
default properties. Previously, both used strictly the configuration
properties and failed to consider embedded datasource properties
autoconfigured by @AutoConfigureTestDatabase. In case a database layer
test e.g. @JdbcTest relies on the autoconfigured embedded datasource,
Flyway and Liquibase autoconfiguration fails as they are not aware of
the embedded datasource properties.

See gh-16814
2019-06-17 11:09:29 +01:00
Andy Wilkinson f36af7b16d Polish 2019-06-17 11:02:54 +01:00
Andy Wilkinson 78f51a490c Merge branch '2.1.x'
Closes gh-17213
2019-06-17 10:59:16 +01:00
Andy Wilkinson c2a4a3f630 Polish "Auto-configure caching in jOOQ sliced tests"
See gh-17066
2019-06-17 10:55:35 +01:00
Dmytro Nosan 4701d8f82a Auto-configure caching in jOOQ sliced tests
See gh-17066
2019-06-17 10:55:35 +01:00
Andy Wilkinson c62543b514 Merge branch '2.1.x'
Closes gh-17212
2019-06-17 10:47:22 +01:00
Andy Wilkinson 13a7a52c71 Revert "Work around Framework regression in handling of null model values"
This reverts commit 5fc67c545c.

Closes gh-16991
2019-06-17 10:44:23 +01:00
Andy Wilkinson ece8703278 Merge branch '2.1.x'
Closes gh-17211
2019-06-17 10:36:46 +01:00
Andy Wilkinson 7d59b78829 Fix handling of jar files with + chars in their path
Closes gh-17208
2019-06-17 10:31:51 +01:00
Johnny Lim 368c0eebe4 Fix typo
See gh-17132
2019-06-16 11:42:00 +02:00
Andy Wilkinson 801ce6d0a1 Upgrade to Spring Session Corn-M2
Closes gh-16587
2019-06-16 08:48:57 +01:00
Andy Wilkinson 84c6313332 Upgrade to Spring Session Bom Bean-SR6
Closes gh-17209
2019-06-16 08:47:40 +01:00
Andy Wilkinson fa99bd1d89 Upgrade to Spring Integration 5.2.0.M3
Closes gh-17201
2019-06-15 10:44:09 +01:00
Andy Wilkinson fa8dc04751 Upgrade to Spring Kafka 2.2.7.RELEASE
Closes gh-17206
2019-06-15 10:42:14 +01:00
Andy Wilkinson e842dc7f0c Upgrade to Spring Integration 5.1.6.RELEASE
Closes gh-17205
2019-06-15 10:42:14 +01:00
Andy Wilkinson 88df70c4d0 Upgrade to Spring Amqp 2.1.7.RELEASE
Closes gh-17204
2019-06-15 10:42:14 +01:00
Andy Wilkinson d1dc457a87 Upgrade to Spring AMQP 2.2.0.M3
Closes gh-17203
2019-06-15 10:36:13 +01:00
Andy Wilkinson c059c02dca Upgrade to Spring Kafka 2.3.0.M3
Closes gh-17202
2019-06-15 10:35:41 +01:00
Andy Wilkinson 9fda7add5c Upgrade to Spring Security 5.2.0.M3
Closes gh-16965
2019-06-15 10:35:01 +01:00
Phillip Webb 25839185c1 Fix checkstyle violation 2019-06-14 18:57:41 -07:00
Phillip Webb 0b3015e4ff Polish Binder classes
Polish and rename some of the internal Binder classes to better reflect
their purpose. The `BeanBinder` is now called `DataObjectBinder` and
as a `JavaBeanBinder` implementation for setter based properties, and
a `ValueObjectBinder` implementation for constructor based properties.
2019-06-14 18:14:40 -07:00
Madhura Bhave c6dae5764e Add bindOrCreate for constructor based binding
Deprecate the existing `BindResult.orElseCreate` method in favor of
`bindOrCreate` methods on the `Binder`. These new methods allow us to
implement custom creation logic depending on the type of object being
bound. Specifically, it allows constructor based binding to create new
instances that respect the `@DefaultValue` annotations.

Closes gh-17098

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
2019-06-14 18:14:40 -07:00
Andy Wilkinson 38fb639147 Merge branch '2.1.x'
Closes gh-17196
2019-06-14 15:49:00 +01:00
Andy Wilkinson 1b495f5a42 Merge branch '2.0.x' into 2.1.x
Closes gh-17195
2019-06-14 15:47:39 +01:00
Andy Wilkinson 4bae91d933 Merge branch '1.5.x' into 2.0.x 2019-06-14 15:47:22 +01:00
Andy Wilkinson 887e39f2fe Update to Spring HATEOAS 1.0.0.M3
Closes gh-17075
2019-06-14 15:28:48 +01:00
Andy Wilkinson 96ac42e405 Upgrade to Spring Data Lovelace-SR9
Closes gh-17193
2019-06-14 15:24:32 +01:00
Andy Wilkinson 8bfe2fa9c9 Update to Spring Data Moore-RC1
Closes gh-16966
2019-06-14 15:21:12 +01:00
Andy Wilkinson 75da4468e5 Merge branch '2.1.x'
Closes gh-17192
2019-06-14 15:15:19 +01:00
Andy Wilkinson d5d96dff96 Honor logback.debug property and write Logback statuses to console
Closes gh-16876
2019-06-14 15:12:05 +01:00