Commit Graph

22315 Commits (1fffe0ab3e37e3a749e965881153270591d2a25e)
 

Author SHA1 Message Date
Andy Wilkinson 256a0d636d Merge branch '1.5.x' into 2.0.x 5 years ago
Andy Wilkinson 1ee8c53b90 Upgrade to spring-javaformat 0.0.14
Closes gh-17331
5 years ago
Andy Wilkinson 867c35a2f6 Merge branch '2.1.x'
Closes gh-17306
5 years ago
Andy Wilkinson 096951d531 Merge branch '2.0.x' into 2.1.x
Closes gh-17305
5 years ago
Andy Wilkinson 57bc03ac57 Merge branch '1.5.x' into 2.0.x 5 years ago
Madhura Bhave 8730f32a78 Merge pull request #17323 from htztomic
* pr/17323:
  Provide ability to add additional connectors on reactive Tomcat

Closes gh-17323
5 years ago
HaiTao Zhang d9048d2531 Provide ability to add additional connectors on reactive Tomcat
See gh-17323
5 years ago
Madhura Bhave a4fd141622 Merge branch '2.1.x'
Closes gh-17325
5 years ago
Madhura Bhave 74912ee126 Remove setting.xml from .gitignore
Closes gh-17309
5 years ago
Andy Wilkinson 361a9404fd Merge branch '2.1.x'
Closes gh-17321
5 years ago
Andy Wilkinson 3fb06ee29e Merge branch '2.0.x' into 2.1.x
Closes gh-17320
5 years ago
Andy Wilkinson 4973a2b217 Merge branch '1.5.x' into 2.0.x 5 years ago
Andy Wilkinson 72f7985219 Drop back to Eclipse 2019-03 to avoid m2e regression
Closes gh-15200
5 years ago
Andy Wilkinson 0cfcfb104e Link to Apache Licence in Maven Plugin docs rather than inlining it
Closes gh-17317
5 years ago
Andy Wilkinson b67fedd749 Start building against Spring Kafka 2.3.0.M4 snapshots
See gh-17319
5 years ago
Madhura Bhave e0ecd09aee Merge branch '2.1.x'
Closes gh-17311
5 years ago
Madhura Bhave 26b61e6f8d Fix deprecation warnings in pipeline.yml
Closes gh-17310
5 years ago
Madhura Bhave c9d6617713 Fix CI scripts following samples rename
See gh-17197
5 years ago
Madhura Bhave 0545a1396c Reinstante settings.xml for smoke test
This got lost when the samples were renamed to smoke tests

See gh-17197
5 years ago
Madhura Bhave d5c0009c6e Rename samples to smoke tests
Closes gh-17197
5 years ago
Phillip Webb 0b720b99b2 Merge branch '2.1.x'
Closes gh-17308
5 years ago
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
5 years ago
Andy Wilkinson 76e1fb4a1e Merge branch '2.1.x'
Closes gh-17306
5 years ago
Andy Wilkinson 7e4111954f Merge branch '2.0.x' into 2.1.x
Closes gh-17305
5 years ago
Andy Wilkinson 23e119c239 Merge branch '1.5.x' into 2.0.x 5 years ago
Andy Wilkinson 1ee7b80162 Update the Oomph setup for Eclipse 2019-06
Closes gh-15200
5 years ago
Brian Clozel e2d92b3914 Merge pull request #17301 from spencergibb
* pr/17301:
  Polish "Make rSocketServerBootstrap @ConditionalOnMissingBean"
  Make rSocketServerBootstrap @ConditionalOnMissingBean

Closes gh-17301
5 years ago
Brian Clozel 9166b6d329 Polish "Make rSocketServerBootstrap @ConditionalOnMissingBean"
See gh-17301
5 years ago
Spencer Gibb 2cb6af959b
Make rSocketServerBootstrap @ConditionalOnMissingBean
7857dd2d72 broke gateway's ability to override the `SocketAcceptor`.
5 years ago
Andy Wilkinson 7405efa326 Ensure that each Tomcat customizer is only called once
Fixes gh-17264
5 years ago
Stephane Nicoll e560b7f6ba Remove public modifier on JUnit5 lifecycle methods
See gh-17292
5 years ago
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
5 years ago
Stephane Nicoll 403d868611 Polish "Use constants for HTTP headers"
See gh-17199
5 years ago
Johnny Lim a57df0f595 Use constants for HTTP headers
See gh-17199
5 years ago
Stephane Nicoll 7908dfd6cc Merge branch '2.1.x' 5 years ago
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
5 years ago
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
5 years ago
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
5 years ago
Stephane Nicoll 62c70140c6 Upgrade to JUnit Jupiter 5.5.0-RC2
See gh-17266
5 years ago
Andy Wilkinson 0497936940 Start building against Spring Framework 5.2.0.RC1 snapshots
See gh-17280
5 years ago
Stephane Nicoll 9eb2650c0f Merge branch '2.1.x' 5 years ago
Stephane Nicoll 86ace26049 Fix broken link to Spring Integration reference guide
Closes gh-17279
5 years ago
Andy Wilkinson 6d8ba654cc Merge branch '2.1.x'
Closes gh-17276
5 years ago
Andy Wilkinson a5ae1de706 Fix spring-boot-loader's tests on Windows
Closes gh-17275
5 years ago
Stephane Nicoll b64d8df656 Merge pull request #17272 from izeye
* pr/17272:
  Use "JUnit" instead of "Junit"

Closes gh-17272
5 years ago
Johnny Lim f283aa18eb Use "JUnit" instead of "Junit"
See gh-17272
5 years ago
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
5 years ago
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
5 years ago
Stephane Nicoll 900c325070 Polish "Add JUnit 4 and the Vintage Engine sample"
See gh-17100
5 years ago
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
5 years ago