Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,089 Commits 23 Branches 0 Tags
e2d92b3914d91c19f27e6da2eba014364cd1fe9c
Commit Graph

22089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
29de792148 Merge pull request #17068 from ielatif 
* pr/17068:
  Fix javadoc of management server port

Closes gh-17068
 2019-06-19 15:19:34 +02:00
Issam El-atif
fca97ff86c Fix javadoc of management server port 
See gh-17068
 2019-06-19 15:15:04 +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
Phillip Webb
0233cc3c94 Merge branch '2.1.x' 2019-06-18 21:05:32 -07:00
Phillip Webb
6e5ba8077a Fix sync-to-maven-central script 2019-06-18 21:04:54 -07:00
Phillip Webb
527a3b5395 Merge branch '2.1.x' 2019-06-18 20:41:53 -07:00
Phillip Webb
11b8e7c2de Don't exit script on error 
Update CI scripts so that command failures do not cause an immediate
exit. Prior to this commit, some of our looping logic would never run
because the entire script would exit.
 2019-06-18 20:41:26 -07:00
Phillip Webb
83112237f7 Merge branch '2.1.x' 2019-06-18 20:40:35 -07:00
Spring Buildmaster
fb90803dbf Next development version (v2.1.7.BUILD-SNAPSHOT) 2019-06-19 00:55:05 +00:00
Phillip Webb
eddbfb34f7 Merge branch '2.1.x' 
Closes gh-17258
 2019-06-18 15:08:54 -07:00
Phillip Webb
ffbb23bc6d Always use credentials in forward merge script 
Closes gh-17257
 2019-06-18 15:08:09 -07:00
Phillip Webb
d85a69aa8e Merge branch 'spring-projects/2.1.x' 
Closes gh-17256
 2019-06-18 15:06:17 -07:00
Phillip Webb
b0415c4044 Don't ignore images on CI build 
Closes gh-17255
 2019-06-18 14:49:16 -07:00
Phillip Webb
cc1807608e Merge branch '2.1.x' 
Closes gh-17249
 2019-06-18 10:33:20 -07:00
Phillip Webb
718c1d7204 Upgrade Java 12 version in CI image 
Closes gh-17246
 2019-06-18 10:32:57 -07:00
Phillip Webb
f4756e500d Merge '2.1.x' 
Closes gh-17248
 2019-06-18 10:31:37 -07:00
Phillip Webb
064240266f Upgrade Java 11 version in CI image 
Closes gh-17244
 2019-06-18 10:31:14 -07:00
Phillip Webb
43ef81cbb6 Merge branch '2.1.x' 
Closes gh-17247
 2019-06-18 10:29:58 -07:00
Phillip Webb
3869da88d4 Upgrade Java 8 version in CI image 
Closes gh-17245
 2019-06-18 10:29:19 -07:00
Phillip Webb
1513ed1b09 Merge branch '2.1.x' 2019-06-18 09:50:34 -07:00
Phillip Webb
de037f55dc Fix detect JDK CI script 2019-06-18 09:50:05 -07:00