Andy Wilkinson
d10ba39673
Update GitHub pull request template to align with issue template
2018-09-20 09:48:31 +01:00
Stephane Nicoll
9bca95e499
Upgrade to Reactor Californium RELEASE
...
Closes gh-14507
2018-09-20 10:47:19 +02:00
Stephane Nicoll
1e7c236589
Merge branch '2.0.x'
2018-09-20 10:46:01 +02:00
Stephane Nicoll
8aece088a4
Upgrade to Spring Web Services 3.0.4.RELEASE
...
Closes gh-14526
2018-09-20 10:43:52 +02:00
Stephane Nicoll
66bc806206
Merge branch '1.5.x' into 2.0.x
2018-09-20 10:43:19 +02:00
Stephane Nicoll
e2bc24e3d7
Upgrade to Spring Web Services 2.4.3.RELEASE
...
Closes gh-14527
2018-09-20 10:34:58 +02:00
Stephane Nicoll
ac2fefb6c3
Merge branch '2.0.x'
2018-09-20 10:25:20 +02:00
Stephane Nicoll
957321492f
Merge branch '1.5.x' into 2.0.x
2018-09-20 10:24:57 +02:00
Stephane Nicoll
ccbbe0f0f3
Merge pull request #14521 from DevOrc:fixes-14348
...
* pr/14521:
Support escaped characters in BasicJsonParser
2018-09-20 10:24:42 +02:00
DevOrc
7daade21c4
Support escaped characters in BasicJsonParser
...
This commit adds the ability to have escaped characters, like the quote,
when using the BasicJsonParser. It also adds a short test for escaped
quotes.
Closes gh-14521
2018-09-20 10:24:24 +02:00
Stephane Nicoll
f67067715b
Merge pull request #14517 from izeye:polish-20180920
...
* pr/14517:
Polish
2018-09-20 09:51:32 +02:00
Johnny Lim
521f746151
Polish
...
Closes gh-14517
2018-09-20 09:51:10 +02:00
Andy Wilkinson
efae363974
Register functional rather than reflective bean definitions where possible
...
Closes gh-14516
2018-09-19 19:59:09 +01:00
Andy Wilkinson
65295e0e14
Merge branch '2.0.x'
2018-09-19 19:52:19 +01:00
Andy Wilkinson
bff93a67ce
Fix remote DevTools restart when a previously added class is then changed
...
Previously, if a class was added and then changed, a restart would be triggered
and things would behave as if the class had been deleted. This occurred
because, when looking for additional classes that were not on the original
classpath, only files that had been added were considered. The subsequent
change to the class was noticed as a modified rather than an addition,
resulting in the class being skipped.
This commit updates the resource resolver to only ignore deleted files and
consider both added files and modified files when looking for additional
resources.
Closes gh-14205
2018-09-19 18:02:01 +01:00
Stephane Nicoll
32c4671065
Merge pull request #14512 from izeye:patch-50
...
* pr/14512:
Use meaningful name for MockServerConfigurer bean
2018-09-19 15:31:50 +02:00
Johnny Lim
fd97f07209
Use meaningful name for MockServerConfigurer bean
...
Closes gh-14512
2018-09-19 15:31:38 +02:00
Andy Wilkinson
6164c9e8b6
Start building against Spring Data Lovelace snapshots
...
See gh-14510
2018-09-19 14:21:20 +01:00
Stephane Nicoll
ce60f82998
Merge branch '2.0.x'
2018-09-19 12:09:29 +02:00
Stephane Nicoll
6910ee6231
Merge pull request #14505 from marceloverdijk:patch-2
...
* pr/14505:
Fix dependency management for Caffeine
2018-09-19 12:09:16 +02:00
Marcel Overdijk
0870f23902
Fix dependency management for Caffeine
...
Closes gh-14505
2018-09-19 12:04:49 +02:00
Stephane Nicoll
b4146060a0
Merge pull request #14501 from yongsungjeon:develop
...
* pr/14501:
Use constant for produces attribute
2018-09-19 11:39:27 +02:00
yongsungjeon
11864f2bb6
Use constant for produces attribute
...
Closes gh-14501
2018-09-19 11:38:29 +02:00
Stephane Nicoll
36d22c8541
Merge branch '2.0.x'
2018-09-19 11:34:39 +02:00
Stephane Nicoll
c8bd30c408
Merge pull request #14499 from origoni:fix-typo-webclient-exam
...
* pr/14499:
Fix typo in WebClient example
2018-09-19 11:34:30 +02:00
DK Lee
01cf52447c
Fix typo in WebClient example
...
Closes gh-14499
2018-09-19 11:34:04 +02:00
Stephane Nicoll
3758906613
Merge pull request #14496 from fonimus:patch-1
...
* pr/14496:
Polish "Add reference to ssh shell spring boot starter"
Add reference to ssh shell spring boot starter
2018-09-19 11:27:42 +02:00
Stephane Nicoll
390fc03769
Polish "Add reference to ssh shell spring boot starter"
...
Closes gh-14496
2018-09-19 11:27:26 +02:00
François Onimus
b416a46674
Add reference to ssh shell spring boot starter
...
See gh-14496
2018-09-19 11:26:08 +02:00
Stephane Nicoll
f42891489d
Polish key description
...
Closes gh-14450
2018-09-19 10:31:01 +02:00
Stephane Nicoll
aeae139c65
Merge pull request #14449 from izeye:polish-20180913
...
* pr/14449:
Polish
2018-09-19 09:58:51 +02:00
Johnny Lim
d0a252181b
Polish
...
Closes gh-14449
2018-09-19 09:58:31 +02:00
Brian Clozel
1b7325df52
Switch to Reactor Californium SNAPSHOTs
...
See gh-14507
2018-09-18 19:35:04 +02:00
Andy Wilkinson
0f88ea658c
Merge pull request #14486 from Michael McFadyen
...
* gh-14486:
Polish "Add outcome tag to MVC and WebFlux HTTP request metrics"
Add outcome tag to MVC and WebFlux HTTP request metrics
2018-09-18 12:34:09 +01:00
Andy Wilkinson
c974192497
Polish "Add outcome tag to MVC and WebFlux HTTP request metrics"
...
Closes gh-14486
2018-09-18 12:30:28 +01:00
Michael McFadyen
9e9dd40959
Add outcome tag to MVC and WebFlux HTTP request metrics
...
See gh-14486
2018-09-18 12:00:12 +01:00
Andy Wilkinson
6da483f970
Merge branch '2.0.x'
2018-09-18 11:59:52 +01:00
Andy Wilkinson
6fba477d5e
Remove redundant handling of a null exchange from WebFluxTags.uri()
...
Closes gh-14504
2018-09-18 11:59:19 +01:00
Andy Wilkinson
eefa7e9f78
Merge branch '2.0.x'
2018-09-18 11:30:44 +01:00
Andy Wilkinson
6020cb67d3
Polish javadoc of status method on WebFluxTags and WebMvcTags
2018-09-18 11:30:35 +01:00
Andy Wilkinson
c1b864c826
Polish
2018-09-18 11:18:28 +01:00
Madhura Bhave
9201e23f67
Revert "Raised the default version of Mongo to 3.6.5 when using Embedded Mongo."
...
This reverts commit 1a4ad96dd0
. Reverting
to see if this fixes CI timeouts.
2018-09-17 15:25:54 -07:00
Madhura Bhave
b2dd162572
Merge branch '2.0.x'
2018-09-17 14:30:38 -07:00
Madhura Bhave
d7d5cbf959
Simplify printing ConditionEvaluationReport when using context runner
...
Closes gh-13119
2018-09-17 14:23:47 -07:00
Madhura Bhave
7127098f86
Remove call to stop_docker
2018-09-17 13:25:30 -07:00
Madhura Bhave
51f9cdd14a
Update pipeline badge configuration
2018-09-17 11:22:01 -07:00
Andy Wilkinson
e1328f05e7
Merge branch '2.0.x'
2018-09-17 15:55:35 +01:00
Andy Wilkinson
fc60d9f6d4
Merge branch '1.5.x' into 2.0.x
2018-09-17 15:50:12 +01:00
Andy Wilkinson
a91f9b6f17
Document that Cassandra policy classes must have a default constructor
...
Closes gh-14461
2018-09-17 15:46:38 +01:00
Andy Wilkinson
354cc985ee
Merge pull request #14420 from Gary Russell
...
* gh-14420:
Start building against Spring Kafka 2.2.0 snapshots
2018-09-17 12:35:41 +01:00