root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
22,224 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

6012 Commits

Author SHA1 Message Date
Gary Russell 815834ab6e Use @EmbeddedKafka for Integration Tests 
`@EmbeddedKafka` now supports JUnit 5 without the need for a Spring
test application context. Remove the previous workaround that replaced
the JUnit4 `@ClassRule` and use `TopicBuilder` to build the
topic bean.

See gh-17355
 2019-06-29 21:36:36 +01:00
Andy Wilkinson 6212901bc1 Polish "Add 'client-name' property to specify a Redis client name" 
See gh-17330
 2019-06-29 21:24:57 +01:00
Dmytro Nosan f877caf118 Add 'client-name' property to specify a Redis client name 
See gh-17330
 2019-06-29 21:23:25 +01:00
Andy Wilkinson e496203740 Merge branch '2.1.x' 
Closes gh-17368
 2019-06-29 21:19:13 +01:00
Johnny Lim 408035fb3f Remove System.out.println() in a test 
See gh-17358
 2019-06-29 21:18:44 +01:00
Andy Wilkinson ea7443bf01 Merge branch '2.1.x' 
Closes gh-17367
 2019-06-29 21:15:29 +01:00
Johnny Lim 8dea74a2e9 Add a missing quote in DebugLogbackConfigurator 
See gh-17357
 2019-06-29 21:14:42 +01:00
Andy Wilkinson 8f668610f7 Align RSocket auto-configuration latest Framework changes 
Closes gh-17366
 2019-06-29 21:09:54 +01:00
Andy Wilkinson 1fa48882bb Merge branch '2.1.x' 
See gh-17362
 2019-06-29 20:39:19 +01:00
Andy Wilkinson f4e7b80651 Merge branch '2.0.x' into 2.1.x 
See gh-17361
 2019-06-29 20:38:18 +01:00
Andy Wilkinson 761856ac70 Merge branch '1.5.x' into 2.0.x 2019-06-29 20:29:16 +01:00
Phillip Webb 605599138e Merge branch '2.1.x' 2019-06-28 23:56:02 -07:00
Phillip Webb 92bff3c328 Merge branch '2.0.x' into 2.1.x 2019-06-28 23:42:28 -07:00
Phillip Webb cfeb0239b7 Merge branch '1.5.x' into 2.0.x 2019-06-28 23:28:34 -07:00
Phillip Webb a417e136a3 Merge branch '2.1.x' 2019-06-28 14:15:17 -07:00
Phillip Webb 9aa4887376 Merge branch '2.0.x' into 2.1.x 2019-06-28 14:14:52 -07:00
Phillip Webb ed3e1e076d Fix AbstractFilterRegistrationBean merge error 
Merging 1.5.x accidentally broke `AbstractFilterRegistrationBean`
 2019-06-28 14:13:59 -07:00
Phillip Webb c62b6b4ccd Merge branch '2.1.x' 2019-06-28 12:22:45 -07:00
Phillip Webb de35efd1ef Merge branch '2.0.x' into 2.1.x 2019-06-28 12:21:57 -07:00
Phillip Webb bb34846630 Merge branch '1.5.x' into 2.0.x 2019-06-28 12:19:46 -07:00
Madhura Bhave 7e22901bb2 Fail build on unresolved documentation links 
Closes gh-12005
 2019-06-28 12:04:30 -07:00
rossdrew d6977ea89f Remove hyphenation of opaquetoken in OAuth2 property names 
See gh-17290
 2019-06-28 14:48:56 +01:00
Phillip Webb 8edf88a08b Polish M2Eclipse ignore configuration 
Pull all M2Eclipse ignore configuration up to the parent POM and
increase the version ranges covered.
 2019-06-27 09:42:14 -07:00
Andy Wilkinson 66f1344f7c Merge branch '2.1.x' 
Closes gh-17335
Closes gh-17292
 2019-06-27 12:00:34 +01:00
Andy Wilkinson 91786bc712 Merge branch '2.0.x' into 2.1.x 
Closes gh-17334
 2019-06-27 11:39:17 +01:00
Andy Wilkinson 256a0d636d Merge branch '1.5.x' into 2.0.x 2019-06-27 11:39:02 +01:00
HaiTao Zhang d9048d2531 Provide ability to add additional connectors on reactive Tomcat 
See gh-17323
 2019-06-26 15:36:12 -07:00
Andy Wilkinson 361a9404fd Merge branch '2.1.x' 
Closes gh-17321
 2019-06-26 17:40:44 +01:00
Andy Wilkinson 3fb06ee29e Merge branch '2.0.x' into 2.1.x 
Closes gh-17320
 2019-06-26 17:39:13 +01:00
Andy Wilkinson 4973a2b217 Merge branch '1.5.x' into 2.0.x 2019-06-26 17:37:39 +01:00
Andy Wilkinson b67fedd749 Start building against Spring Kafka 2.3.0.M4 snapshots 
See gh-17319
 2019-06-26 16:55:48 +01:00
Madhura Bhave d5c0009c6e Rename samples to smoke tests 
Closes gh-17197
 2019-06-25 11:32:56 -07:00
Phillip Webb 0b720b99b2 Merge branch '2.1.x' 
Closes gh-17308
 2019-06-25 11:19:57 -07:00
Phillip Webb 02e705c8e4 Relax nohttp requirement for service.wsdl 
Unfortunately https references cause eclipse errors so we need to
relax the requirement for this file.

Fixes gh-17307
 2019-06-25 11:17:27 -07:00
Brian Clozel 9166b6d329 Polish "Make rSocketServerBootstrap @ConditionalOnMissingBean" 
See gh-17301
 2019-06-25 11:25:11 +02:00
Spencer Gibb 2cb6af959b
Make rSocketServerBootstrap @ConditionalOnMissingBean 
7857dd2d72 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 374e02cac8 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-17288
 2019-06-21 15:26:07 +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 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