Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,119 Commits 23 Branches 0 Tags
2cb147af7c9c1ffed93d7586b37b801f0b7d9754
Commit Graph

20119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
2cb147af7c Merge branch '2.1.x' 2019-01-22 09:22:17 +00:00
Andy Wilkinson
acf9e8ac13 Merge pull request #15752 from Johnny Lim 
* gh-15752:
  Polish "Fix typos in JsonContentAssert failure messages"
  Fix typos in JsonContentAssert failure messages
 2019-01-22 09:20:09 +00:00
Andy Wilkinson
e15e140f8c Polish "Fix typos in JsonContentAssert failure messages" 
See gh-15752
 2019-01-22 09:19:41 +00:00
Johnny Lim
3744082996 Fix typos in JsonContentAssert failure messages 
Closes gh-15752
 2019-01-22 09:19:25 +00:00
Andy Wilkinson
f23a0a5969 Inject InfoContributorProperties more precisely 
Closes gh-15750
 2019-01-21 16:56:39 +00:00
Andy Wilkinson
530c7bee71 Do not auto-configure HttpMessageConverters in reactive web apps 
Closes gh-15712
 2019-01-18 14:57:14 -05:00
Andy Wilkinson
6abd18ae96 Do not auto-configure RestTemplateBuilder in reactive web apps 
Closes gh-15718
 2019-01-18 14:50:24 -05:00
Andy Wilkinson
5d60d6bd62 Use ApplicationContextRunner to test RestTemplateAutoConfiguration 2019-01-18 14:36:18 -05:00
Andy Wilkinson
7dd65074e8 Only perform background pre-init with multiple processors 
Closes gh-15722
 2019-01-18 11:50:17 -05:00
Stephane Nicoll
32b14f3098 Merge branch '2.1.x' 2019-01-17 16:15:32 -05:00
Stephane Nicoll
4167d6d475 Merge pull request #15733 from NaitYoussef 
* pr/15733:
  Polish contribution
  Fix typo
 2019-01-17 16:14:58 -05:00
Stephane Nicoll
f0a20b1821 Polish contribution 
Closes gh-15733
 2019-01-17 16:14:15 -05:00
NAIT BELKACEM
6a0053c8bc Fix typo 
See gh-15733
 2019-01-17 16:11:11 -05:00
Michael McFadyen
9eeeebcd53 Update 'HTTP Client Metrics' reference documentation 
Since gh-#5594, the 'outcome' tag has been introduced for
HTTP clients. This commit updates the reference documentation
accordingly.

Closes gh-15725
 2019-01-17 12:14:42 -05:00
Stephane Nicoll
cea6a79e49 Merge branch '2.1.x' 2019-01-17 10:58:55 -05:00
Stephane Nicoll
708ca0636f Clarify that Spring Boot uses the platform MBeanServer by default 
Closes gh-15728
 2019-01-17 10:58:08 -05:00
Stephane Nicoll
33f2bd4d61 Merge branch '2.1.x' 2019-01-14 08:13:37 -05:00
Stephane Nicoll
c6f5719c96 Merge pull request #15694 from igor-suhorukov 
* pr/15694:
  Polish "Remove redundant interface modifiers"
  Remove redundant interface modifiers
 2019-01-14 08:13:25 -05:00
Stephane Nicoll
485bdc9901 Polish "Remove redundant interface modifiers" 
Closes gh-15694
 2019-01-14 08:13:08 -05:00
igor-suhorukov
2d873c78fe Remove redundant interface modifiers 
See gh-15694
 2019-01-14 08:12:41 -05:00
Stephane Nicoll
0fa3844480 Merge pull request #15695 from izeye 
* pr/15695:
  Polish contribution
  Polish
 2019-01-14 08:11:39 -05:00
Stephane Nicoll
6baa6b291e Polish contribution 
Closes gh-15695
 2019-01-14 08:11:20 -05:00
Johnny Lim
af3ed9ff9f Polish 
See gh-15695
 2019-01-14 08:09:32 -05:00
Phillip Webb
b22561877d Merge branch '2.1.x' 2019-01-11 20:13:22 -08:00
Spring Buildmaster
3d02b0296c Next development version (v2.1.3.BUILD-SNAPSHOT) 2019-01-12 03:22:50 +00:00
Phillip Webb
2f77ef7722 Merge branch '2.1.x' 2019-01-11 16:45:05 -08:00
Phillip Webb
72400d3a96 Upgrade to Spring Batch 4.1.1 
Closes gh-15659
 2019-01-11 16:43:35 -08:00
Phillip Webb
9e58942698 Update copyright year for changed files 2019-01-11 16:42:02 -08:00
Phillip Webb
838602f0b1 Restore BDD mockito checkstyle rules 2019-01-11 16:42:02 -08:00
Phillip Webb
6a901199f5 Polish 2019-01-11 16:42:02 -08:00
Phillip Webb
9c3e587917 Merge branch '2.0.x' into 2.1.x 2019-01-11 15:12:36 -08:00
Spring Buildmaster
9316ebcffc Next development version (v2.0.9.BUILD-SNAPSHOT) 2019-01-11 19:33:46 +00:00
Andy Wilkinson
631a0fe207 Merge branch '2.1.x' 2019-01-11 16:37:02 +00:00
Andy Wilkinson
3321fc6169 Merge branch '2.0.x' into 2.1.x 2019-01-11 16:36:56 +00:00
Andy Wilkinson
023c7159ac Upgrade to Spring Batch 4.0.2.RELEASE 
Closes gh-15658
 2019-01-11 16:21:35 +00:00
Andy Wilkinson
991ab6dfa6 Merge branch '1.5.x' into 2.0.x 2019-01-11 16:20:39 +00:00
Andy Wilkinson
2ed7cf84e1 Fix up version numbers following release 2019-01-11 16:20:19 +00:00
Andy Wilkinson
d22e43aefb Merge branch '2.1.x' 2019-01-11 16:07:18 +00:00
Andy Wilkinson
f0141dadab Revert "Upgrade to Glassfish Jaxb 2.3.2" 
This reverts commit 6b952f5b65.

See gh-15689
 2019-01-11 16:07:03 +00:00
Spring Buildmaster
b04710d744 Next development version 2019-01-11 15:59:00 +00:00
Andy Wilkinson
f8de67e6e9 Merge branch '2.1.x' 2019-01-11 14:35:14 +00:00
Andy Wilkinson
6b952f5b65 Upgrade to Glassfish Jaxb 2.3.2 
Closes gh-15689
 2019-01-11 14:32:38 +00:00
Andy Wilkinson
48b485161e Upgrade to Byte Buddy 1.9.7 
Closes gh-15688
 2019-01-11 14:32:37 +00:00
Andy Wilkinson
eb96cdffd2 Upgrade to Reactor Bom Californium-SR4 
Closes gh-15687
 2019-01-11 14:32:36 +00:00
Andy Wilkinson
c5e14afcd1 Upgrade to Micrometer 1.1.2 
Closes gh-15686
 2019-01-11 14:32:35 +00:00
Andy Wilkinson
14849b3ed0 Merge branch '2.1.x' 2019-01-11 14:30:30 +00:00
Andy Wilkinson
641a46f039 Merge branch '2.0.x' into 2.1.x 2019-01-11 14:30:21 +00:00
Andy Wilkinson
1bd030c17a Upgrade to Spring Kafka 2.1.12.RELEASE 
Closes gh-15685
 2019-01-11 14:29:28 +00:00
Andy Wilkinson
6c81eb0591 Merge branch '2.1.x' 2019-01-11 13:26:54 +00:00
Andy Wilkinson
99df485268 Merge branch '2.0.x' into 2.1.x 2019-01-11 13:26:47 +00:00