5926 Commits

Author SHA1 Message Date
Spencer Gibb
2cb6af959b
Make rSocketServerBootstrap @ConditionalOnMissingBean
7857dd2d7230ab48c53e8648c23647e3b793b895 broke gateway's ability to override the `SocketAcceptor`.
2019-06-24 16:13:36 -04:00
Andy Wilkinson
7405efa326 Ensure that each Tomcat customizer is only called once
Fixes gh-17264
2019-06-21 17:53:24 +01:00
Stephane Nicoll
e560b7f6ba Remove public modifier on JUnit5 lifecycle methods
See gh-17292
2019-06-21 18:09:05 +02:00
Stephane Nicoll
403d868611 Polish "Use constants for HTTP headers"
See gh-17199
2019-06-21 16:20:46 +02:00
Johnny Lim
a57df0f595 Use constants for HTTP headers
See gh-17199
2019-06-21 15:58:34 +02:00
Stephane Nicoll
8a7609f940 Simplify HibernateJpaAutoConfiguration classes check
This commit removes the now outdated `HibernateEntityManagerCondition`
in favour of a simple check of `SessionImplementor`. As of
Hibernate 5.2, a single `hibernate-core` jar is required so a single
class check is enough.

Closes gh-17283
2019-06-21 15:22:28 +02:00
Brian Clozel
7857dd2d72 Update after RSocket changes in Spring Framework
Spring Framework recently removed the `MessageHandlerAcceptor` (which is
a sub-class of `RSocketMessageHandler`).
Instead of implementing directly the `SocketAcceptor` contract, it now
exposes them through `clientAcceptor()` and `serverAcceptor()` methods.

See gh-17280
2019-06-21 11:21:13 +02:00
Stephane Nicoll
62c70140c6 Upgrade to JUnit Jupiter 5.5.0-RC2
See gh-17266
2019-06-21 09:36:08 +02:00
Andy Wilkinson
0497936940 Start building against Spring Framework 5.2.0.RC1 snapshots
See gh-17280
2019-06-21 08:29:01 +01:00
Stephane Nicoll
9eb2650c0f Merge branch '2.1.x' 2019-06-21 09:09:49 +02:00
Stephane Nicoll
86ace26049 Fix broken link to Spring Integration reference guide
Closes gh-17279
2019-06-21 09:09:01 +02:00
Andy Wilkinson
6d8ba654cc Merge branch '2.1.x'
Closes gh-17276
2019-06-20 11:17:37 +01:00
Andy Wilkinson
a5ae1de706 Fix spring-boot-loader's tests on Windows
Closes gh-17275
2019-06-20 11:08:35 +01:00
Johnny Lim
f283aa18eb Use "JUnit" instead of "Junit"
See gh-17272
2019-06-20 08:45:03 +02:00
Stephane Nicoll
ea9a0c7839 Fix @RegisterExtension on CliTester
This reverts commit dfa5480c and rather make the field package private
so that the extension can be registered properly

Closes gh-17266
2019-06-19 20:44:52 +02:00
Stephane Nicoll
dfa5480c59 Remove useless @RegisterExtension on CliTester
Closes gh-17266
2019-06-19 16:05:16 +02:00
Stephane Nicoll
45d2f1d7d1 Merge branch '2.1.x'
Closes gh-17269
2019-06-19 15:31:50 +02:00
Stephane Nicoll
7e5ca6d280 Merge branch '2.0.x' into 2.1.x
Closes gh-17268
2019-06-19 15:30:13 +02:00
Stephane Nicoll
11dee3c0d8 Merge branch '1.5.x' into 2.0.x 2019-06-19 15:27:49 +02:00
Stephane Nicoll
c9b8d98bcf Upgrade to JUnit Jupiter 5.5.0-RC1
This commit also removes the workaround that required to exclude junit 4
explicitly now that a related issue in JUnit Jupiter has been fixed.

Closes gh-17266
2019-06-19 14:23:44 +02:00
Phillip Webb
59ca46ed54 Remove FIXME 2019-06-18 21:41:05 -07:00
Brian Clozel
809a3965c9 Add missing outcome tag for WebClient metrics
On error cases, the "outcome" tag would be missing from recorded metrics
for the `WebClient`.

This commit fixes this issue and improves the reference documentation by
mentioning the tag values used for error cases, when the client response
is not received (I/O errors, client error, etc).

Fixes gh-17219
2019-06-18 15:29:22 +02:00
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 5fc67c545c7b7f6440bb0743feb15d5fc2c5d28a.

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