fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,165 Commits 22 Branches 339 Tags
Commit Graph

5967 Commits

Author SHA1 Message Date
Andy Wilkinson
4c812b065d Merge pull request #17322 from garyrussell 
* gh-17322:
  Auto-configure KLC with user-provided RecordInterceptor

Closes gh-17322
 2019-06-29 22:06:25 +01:00
Gary Russell
eeda12bd58 Auto-configure KLC with user-provided RecordInterceptor 
spring-kafka.2.3.0.M3 introduced a new property `RecordInterceptor` to
the container factory.

Auto-configure the property if a single instance is present.

See gh-17322
 2019-06-29 22:05:33 +01:00
Andy Wilkinson
13bbfb7ede Polish "Polish TomcatReactiveWebServerFactoryTests" 
See gh-17336
 2019-06-29 21:57:55 +01:00
Johnny Lim
0e7824cec1 Polish TomcatReactiveWebServerFactoryTests 
See gh-17336
 2019-06-29 21:56:19 +01:00
Andy Wilkinson
9f521430fa Polish "Use @EmbeddedKafka for Integration Tests" 
See gh-17355
 2019-06-29 21:47:11 +01:00
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 
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
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