Andy Wilkinson
867c35a2f6
Merge branch '2.1.x'
...
Closes gh-17306
2019-06-27 10:42:11 +01:00
Andy Wilkinson
096951d531
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17305
2019-06-27 10:41:37 +01:00
Andy Wilkinson
57bc03ac57
Merge branch '1.5.x' into 2.0.x
2019-06-27 10:22:02 +01:00
Madhura Bhave
8730f32a78
Merge pull request #17323 from htztomic
...
* pr/17323:
Provide ability to add additional connectors on reactive Tomcat
Closes gh-17323
2019-06-26 15:42:13 -07:00
HaiTao Zhang
d9048d2531
Provide ability to add additional connectors on reactive Tomcat
...
See gh-17323
2019-06-26 15:36:12 -07:00
Madhura Bhave
a4fd141622
Merge branch '2.1.x'
...
Closes gh-17325
2019-06-26 11:51:45 -07:00
Madhura Bhave
74912ee126
Remove setting.xml from .gitignore
...
Closes gh-17309
2019-06-26 11:50:51 -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
72f7985219
Drop back to Eclipse 2019-03 to avoid m2e regression
...
Closes gh-15200
2019-06-26 17:31:00 +01:00
Andy Wilkinson
0cfcfb104e
Link to Apache Licence in Maven Plugin docs rather than inlining it
...
Closes gh-17317
2019-06-26 17:31:00 +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
e0ecd09aee
Merge branch '2.1.x'
...
Closes gh-17311
2019-06-25 18:07:45 -07:00
Madhura Bhave
26b61e6f8d
Fix deprecation warnings in pipeline.yml
...
Closes gh-17310
2019-06-25 17:48:57 -07:00
Madhura Bhave
c9d6617713
Fix CI scripts following samples rename
...
See gh-17197
2019-06-25 16:59:58 -07:00
Madhura Bhave
0545a1396c
Reinstante settings.xml for smoke test
...
This got lost when the samples were renamed to smoke tests
See gh-17197
2019-06-25 16:59:46 -07: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
Andy Wilkinson
76e1fb4a1e
Merge branch '2.1.x'
...
Closes gh-17306
2019-06-25 16:26:26 +01:00
Andy Wilkinson
7e4111954f
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17305
2019-06-25 16:25:46 +01:00
Andy Wilkinson
23e119c239
Merge branch '1.5.x' into 2.0.x
2019-06-25 16:25:24 +01:00
Andy Wilkinson
1ee7b80162
Update the Oomph setup for Eclipse 2019-06
...
Closes gh-15200
2019-06-25 16:22:53 +01:00
Brian Clozel
e2d92b3914
Merge pull request #17301 from spencergibb
...
* pr/17301:
Polish "Make rSocketServerBootstrap @ConditionalOnMissingBean"
Make rSocketServerBootstrap @ConditionalOnMissingBean
Closes gh-17301
2019-06-25 11:27:35 +02: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
c7d3b7a9f1
Merge pull request #17199 from izeye
...
* pr/17199:
Polish "Use constants for HTTP headers"
Use constants for HTTP headers
Closes gh-17199
2019-06-21 16:25:03 +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
7908dfd6cc
Merge branch '2.1.x'
2019-06-21 15:28:59 +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
Stephane Nicoll
b64d8df656
Merge pull request #17272 from izeye
...
* pr/17272:
Use "JUnit" instead of "Junit"
Closes gh-17272
2019-06-20 08:45:16 +02: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
2d70daf5e0
Merge pull request #17100 from ielatif
...
* pr/17100:
Polish "Add JUnit 4 and the Vintage Engine sample"
Add JUnit 4 and the Vintage Engine sample
Closes gh-17100
2019-06-19 16:12:57 +02:00
Stephane Nicoll
900c325070
Polish "Add JUnit 4 and the Vintage Engine sample"
...
See gh-17100
2019-06-19 16:12:43 +02:00
Issam El-atif
9fafcda929
Add JUnit 4 and the Vintage Engine sample
...
This commit adds a sample to verify the use of JUnit 4 and the Vintage
Engine.
See gh-17100
2019-06-19 16:08:42 +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