root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
19,896 Commits 23 Branches 353 Tags 292 MiB
Commit Graph

19896 Commits

Author SHA1 Message Date
Andy Wilkinson 372b6605b3 Merge branch '2.1.x' 2018-12-21 15:32:31 +00:00
Andy Wilkinson 83ce5dcee8 Add missing task output annotations to BootJar and BootWar 
Closes gh-15488
 2018-12-21 15:32:04 +00:00
Andy Wilkinson ddf64802c0 Merge branch '2.1.x' 2018-12-21 15:13:10 +00:00
Andy Wilkinson 3cfcc9e9a7 Merge pull request #15550 from Nishant Raut 
* gh-15550:
  Polish "Stop JtaAutoConfiguration from enabling JtaProperties when not used"
  Stop JtaAutoConfiguration from enabling JtaProperties when not used
 2018-12-21 15:12:41 +00:00
Andy Wilkinson bfd63ab085 Polish "Stop JtaAutoConfiguration from enabling JtaProperties when not used" 
Closes gh-15550
 2018-12-21 15:12:29 +00:00
Nishant Raut 0b29da14b3 Stop JtaAutoConfiguration from enabling JtaProperties when not used 
See gh-15550
 2018-12-21 15:12:29 +00:00
Andy Wilkinson dd96fff544 Update README links following move to pure Asciidoctor 
Closes gh-15545
 2018-12-21 11:15:45 +00:00
Stephane Nicoll 6013146a9a Merge pull request #15543 from igor-suhorukov 
* pr/15543:
  Simplify code by using Map computeIfAbsent
 2018-12-21 11:13:24 +01:00
igor-suhorukov cbf6b330ba Simplify code by using Map computeIfAbsent 
Closes gh-15543
 2018-12-21 11:12:56 +01:00
Stephane Nicoll b8c82ec425 Merge pull request #15429 from dreis2211 
* pr/15429:
  Drop ContentContainingCondition in favor of Assertions.contentOf
 2018-12-20 18:09:42 +01:00
dreis2211 3544ed045b Drop ContentContainingCondition in favor of Assertions.contentOf 
Closes gh-15429
 2018-12-20 18:05:56 +01:00
Stephane Nicoll 0d67f7ae9a Merge branch '2.1.x' 2018-12-20 18:02:46 +01:00
Stephane Nicoll b039982273 Merge branch '2.0.x' into 2.1.x 2018-12-20 18:02:38 +01:00
Stephane Nicoll 6906859a60 Merge pull request #15536 from dreis2211 
* pr/15536:
  Polish javadoc of ConfigurableUndertowWebServerFactory method
 2018-12-20 18:02:22 +01:00
dreis2211 9ffb4f69cd Polish javadoc of ConfigurableUndertowWebServerFactory method 
Closes gh-15536
 2018-12-20 18:01:38 +01:00
Stephane Nicoll c948bdd14d Merge branch '2.1.x' 2018-12-20 17:59:46 +01:00
Stephane Nicoll 51d3626c3b Merge branch '2.0.x' into 2.1.x 2018-12-20 17:59:33 +01:00
Stephane Nicoll 8d0ad03b6d Merge pull request #15473 from dreis2211 
* pr/15473:
  Optimize StringSequence
 2018-12-20 17:59:19 +01:00
dreis2211 27e89bbb8a Optimize StringSequence 
Closes gh-15473
 2018-12-20 17:55:30 +01:00
Stephane Nicoll 9d67400afa Merge branch '2.1.x' 2018-12-20 17:54:08 +01:00
Stephane Nicoll 210d1f6d95 Merge pull request #15438 from igor-suhorukov 
* pr/15438:
  Polish "Fix StringSequence.equals() for different lengths"
  Replace anonymous inner class with lambda
 2018-12-20 17:53:00 +01:00
Stephane Nicoll 06989d884b Polish "Fix StringSequence.equals() for different lengths" 
Closes gh-15438
 2018-12-20 17:52:18 +01:00
igor-suhorukov e578d30722 Replace anonymous inner class with lambda 
See gh-15438
 2018-12-20 17:47:29 +01:00
Andy Wilkinson 372284eb88 Merge branch '2.1.x' 2018-12-20 15:58:11 +00:00
Andy Wilkinson 3a7406fe3a Merge branch '2.0.x' into 2.1.x 2018-12-20 15:58:03 +00:00
Andy Wilkinson 0741c90489 Avoid blocking on a Mono indefinitely 
Closes gh-15535
 2018-12-20 15:31:39 +00:00
Andy Wilkinson 9d2d6d5812 Merge branch '2.1.x' 2018-12-20 15:30:51 +00:00
Andy Wilkinson 9a33d1a2f9 Merge branch '2.0.x' into 2.1.x 2018-12-20 15:30:42 +00:00
Andy Wilkinson 8c68da0882 Avoid blocking on a Mono indefinitely 
Closes gh-15535
 2018-12-20 15:24:53 +00:00
Andy Wilkinson d8b487f127 Merge branch '2.1.x' 2018-12-20 11:52:03 +00:00
Andy Wilkinson 84a064a7dc Merge branch '2.0.x' into 2.1.x 2018-12-20 11:51:53 +00:00
Andy Wilkinson 6403ec6e1b Revert "Upgrade to Netty 4.1.32.Final" 
This reverts commit f9ce6c9dc2.

See gh-15505
 2018-12-20 11:49:33 +00:00
Andy Wilkinson f3794d66e4 Merge branch '2.1.x' 2018-12-20 10:49:39 +00:00
Andy Wilkinson f89682eae7 Add dependency management for xmlunit-assertj and xmlunit-placeholders 
Closes gh-15532
 2018-12-20 10:49:04 +00:00
Andy Wilkinson b36bb78575 Merge branch '2.1.x' 2018-12-20 10:44:09 +00:00
Andy Wilkinson 974c4bfdb3 Polish 2018-12-20 10:44:01 +00:00
Andy Wilkinson 8cd387aea9 Merge branch '2.1.x' 2018-12-20 10:23:20 +00:00
Andy Wilkinson cedcf157ab Start building against Spring Session Bean-SR2 snapshots 
See gh-15531
 2018-12-20 10:22:44 +00:00
Andy Wilkinson 435b721051 Merge branch '2.0.x' into 2.1.x 2018-12-20 10:21:33 +00:00
Andy Wilkinson 0a1add7116 Start building against Spring Session Apple-SR8 snapshots 
See gh-15530
 2018-12-20 10:20:52 +00:00
Andy Wilkinson 902af4272d Merge branch '2.1.x' 2018-12-20 10:15:24 +00:00
Andy Wilkinson e8862e3a4d Merge branch '2.0.x' into 2.1.x 2018-12-20 10:15:19 +00:00
Andy Wilkinson a8cd52f4bb Merge branch '1.5.x' into 2.0.x 2018-12-20 10:15:13 +00:00
Andy Wilkinson f8e8ee84ac Start building against Spring Framework 4.3.22 snapshots 
See gh-15529
 2018-12-20 10:14:39 +00:00
Andy Wilkinson c09a76d4c4 Merge branch '2.1.x' 2018-12-20 10:06:43 +00:00
Andy Wilkinson ad489baaa3 Merge branch '2.0.x' into 2.1.x 2018-12-20 10:06:32 +00:00
Andy Wilkinson 658930acea Start building against Spring Framework 5.0.12 snapshots 
See gh-15528
 2018-12-20 10:03:35 +00:00
Andy Wilkinson d5c8caab59 Merge branch '1.5.x' into 2.0.x 2018-12-20 10:00:35 +00:00
Andy Wilkinson aa9945c86c Upgrade to Jetty 9.4.14.v20181114 
Closes gh-15239
 2018-12-20 09:54:44 +00:00
Andy Wilkinson f9591307d3 Upgrade to Webjars Locator Core 0.36 
Closes gh-15527
 2018-12-20 09:50:22 +00:00