Commit Graph

23481 Commits

Author SHA1 Message Date
dreis2211
d4ab101223 Use Assertions.contentOf() where possible
Closes gh-15793
2019-01-28 10:08:57 +01:00
Stephane Nicoll
342212b8dc Merge branch '2.1.x' 2019-01-28 10:08:02 +01:00
Stephane Nicoll
66f60fbb7a Merge pull request #15748 from cvienot
* pr/15748:
  Polish "Alias auto-configured `TaskExecutor` to make async tasks use it"
  Alias auto-configured `TaskExecutor` to make async tasks use it
2019-01-28 10:07:41 +01:00
Stephane Nicoll
6f86a84301 Polish "Alias auto-configured TaskExecutor to make async tasks use it"
Closes gh-15748
2019-01-28 10:04:30 +01:00
Camille Vienot
d0859f1569 Alias auto-configured TaskExecutor to make async tasks use it
See gh-15748
2019-01-28 09:59:55 +01:00
Stephane Nicoll
a6815bb2c9 Merge branch '2.1.x' 2019-01-25 10:45:26 +01:00
Stephane Nicoll
9e0b1c297d Merge pull request #15784 from vpavic
* pr/15784:
  Remove duplicate code from HealthWebEndpointResponseMapper
2019-01-25 10:40:28 +01:00
Vedran Pavic
d7550d73a3 Remove duplicate code from HealthWebEndpointResponseMapper
Closes gh-15784
2019-01-25 10:38:16 +01:00
Andy Wilkinson
babe98f064 Merge branch '2.1.x' 2019-01-22 11:54:05 +00:00
Andy Wilkinson
c488934c7d Merge pull request #15709 from Raheela Aslam
* gh-15709:
  Polish "Always fail fast when SSL is enabled without a key store"
  Always fail fast when SSL is enabled without a key store
2019-01-22 11:53:28 +00:00
Andy Wilkinson
a172e146de Polish "Always fail fast when SSL is enabled without a key store"
Closes gh-15709
2019-01-22 11:51:29 +00:00
Raheela
62c8ac6ee8 Always fail fast when SSL is enabled without a key store
See gh-15709
2019-01-22 11:50:19 +00:00
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