Stephane Nicoll
7163fe1f46
Merge pull request #14621 from izeye
...
* pr/14621:
Polish
2018-10-01 10:50:42 -04:00
Johnny Lim
1eca492c5e
Polish
...
See gh-14621
2018-10-01 10:46:27 -04:00
Andy Wilkinson
121aad8397
Merge branch '2.0.x'
2018-10-01 15:39:15 +01:00
Andy Wilkinson
da1fde6a5f
Merge branch '1.5.x' into 2.0.x
2018-10-01 15:38:53 +01:00
Andy Wilkinson
1471db220f
Merge pull request #13714 from Welton Rodrigo Torres Nascimento
...
* gh-13714:
Polish "Clarify that RestTemplateBuilder overwrites default converters"
Clarify that RestTemplateBuilder overwrites default converters
2018-10-01 15:38:41 +01:00
Andy Wilkinson
5c1d22eed8
Polish "Clarify that RestTemplateBuilder overwrites default converters"
...
Closes gh-13714
2018-10-01 15:37:31 +01:00
Welton Rodrigo Torres Nascimento
3dbeff56e4
Clarify that RestTemplateBuilder overwrites default converters
...
See gh-13714
2018-10-01 15:37:12 +01:00
Andy Wilkinson
d145fab7e5
Merge branch '2.0.x'
2018-10-01 15:14:53 +01:00
Andy Wilkinson
fd10226c54
Merge branch '1.5.x' into 2.0.x
2018-10-01 15:14:45 +01:00
Andy Wilkinson
17e9a2ee62
Polish
2018-10-01 15:14:18 +01:00
Andy Wilkinson
bbe4f47cc7
Merge branch '2.0.x'
2018-10-01 14:48:23 +01:00
Andy Wilkinson
7d0dcf781c
Merge branch '1.5.x' into 2.0.x
2018-10-01 14:48:15 +01:00
Andy Wilkinson
bc7bac8091
Only retrieve values from request if they will be traced
...
Closes gh-14550
2018-10-01 14:46:28 +01:00
Andy Wilkinson
9735774b4a
Merge branch '2.0.x'
2018-10-01 14:28:16 +01:00
Andy Wilkinson
62b481c7db
Merge branch '1.5.x' into 2.0.x
2018-10-01 14:28:09 +01:00
Andy Wilkinson
3dc93641dd
Clarify documentation on using Spock 1.0
...
Closes gh-14612
2018-10-01 14:26:47 +01:00
Andy Wilkinson
726579a910
Merge branch '2.0.x'
2018-10-01 14:01:38 +01:00
Andy Wilkinson
89f5cfc5a4
Merge branch '1.5.x' into 2.0.x
2018-10-01 13:51:55 +01:00
Andy Wilkinson
da1a17e8b2
Stop adding filters with disabled registrations to MockMvc
...
Closes gh-14636
2018-10-01 13:30:33 +01:00
Stephane Nicoll
42a77a09f4
Merge pull request #14637 from izeye
...
* pr/14637:
Use Commons Logging for OnlyOnceLoggingDenyMeterFilter
2018-09-30 17:49:34 -04:00
Johnny Lim
1e756db966
Use Commons Logging for OnlyOnceLoggingDenyMeterFilter
...
Closes gh-14637
2018-09-30 17:47:18 -04:00
Andy Wilkinson
9a4f655d10
Merge pull request #14631 from Gustavo Andrade
...
* gh-14631:
Upgrade Java 11 CI image to 11-ea-28-jdk
2018-09-28 14:02:48 -04:00
Gustavo Andrade
95ae66b3ff
Upgrade Java 11 CI image to 11-ea-28-jdk
...
Closes gh-14631
2018-09-28 14:02:10 -04:00
Andy Wilkinson
9b7122bf91
Merge branch '2.0.x'
2018-09-28 13:58:30 -04:00
Andy Wilkinson
d5b81f9327
Merge pull request #14630 from Gustavo Andrade
...
* gh-14630:
Upgrade Java 10 CI image to 10.0.2-13-jdk
2018-09-28 13:58:20 -04:00
Gustavo Andrade
9cd0c5a05d
Upgrade Java 10 CI image to 10.0.2-13-jdk
...
Closes gh-14630
2018-09-28 13:57:42 -04:00
Andy Wilkinson
285f6bfd5f
Merge branch '2.0.x'
2018-09-27 06:59:37 -04:00
Andy Wilkinson
997a27c57d
Merge pull request #14593 from JB Nizet
...
* gh-14593:
Move away from deprecated Gradle configurations
2018-09-27 06:59:27 -04:00
jnizet
eee07a840f
Move away from deprecated Gradle configurations
...
Closes gh-14593
2018-09-27 06:58:31 -04:00
Andy Wilkinson
d4e7959a93
Merge branch '2.0.x'
2018-09-27 06:22:59 -04:00
Andy Wilkinson
1d49352778
Merge pull request #14618 from Gustavo Andrade
...
* gh-14618:
Upgrade Java 8 CI image to openjdk:8u181-jdk
2018-09-27 06:21:51 -04:00
Andrade, Gustavo (ESI)
31f89e5981
Upgrade Java 8 CI image to openjdk:8u181-jdk
...
Closes gh-14618
2018-09-27 06:21:21 -04:00
Stephane Nicoll
a4263b89a2
Merge pull request #14597 from izeye
...
* pr/14597:
Polish
2018-09-26 11:45:39 -04:00
Johnny Lim
698bbd6a9e
Polish
...
Closes gh-14597
2018-09-26 11:45:21 -04:00
Stephane Nicoll
c403ac9db6
Merge branch '2.0.x'
2018-09-26 11:43:59 -04:00
Stephane Nicoll
379ce62e2e
Merge pull request #14592 from mdeinum
...
* pr/14592:
Polish contribution
Polish
2018-09-26 11:43:47 -04:00
Stephane Nicoll
b6e5103dc4
Polish contribution
...
Closes gh-14592
2018-09-26 11:43:19 -04:00
Marten Deinum
77afe76ed5
Polish
...
The SpringBootContextLoader still checked if tests were annotated with
@IntegrationTest or @WebIntegrationTest. Those classes have been
removed in Spring Boot 1.5 and been deprecated since 1.4.
This commit removes the check on the annotations as well as the static
list of names.
See gh-14592
2018-09-26 11:41:25 -04:00
Andy Wilkinson
f88ebf75cd
Use Mongo 3.5.5 by default with Embedded mongo
...
Closes gh-14476
2018-09-25 16:44:38 -04:00
Andy Wilkinson
1a8f519922
Raise the default version of Mongo to 3.6.5 when using Embedded Mongo
...
While MongoDB 3.6.7 has been released, 3.6.5 is the latest version that's supported
by the version of Embedded Mongo that we're currently using.
Closes gh-14476
2018-09-25 15:19:34 -04:00
Stephane Nicoll
5a2c8b5032
Merge pull request #14600 from Hanope:issue-14599
...
* pr/14600:
Fix "Query Parameters" section name
2018-09-25 14:25:36 -04:00
Hanope
e5ed5ebf8b
Fix "Query Parameters" section name
...
Closes gh-14600
2018-09-25 14:24:34 -04:00
Madhura Bhave
072be48fc3
Merge branch '2.0.x'
2018-09-25 12:31:24 -04:00
Madhura Bhave
579722bfbd
Fix braces in publish release notes script
2018-09-25 12:30:27 -04:00
Phillip Webb
fd2080e7cc
Merge branch '2.0.x'
2018-09-24 19:55:41 -04:00
Phillip Webb
96f5c8280c
Make release notes script executable
2018-09-24 19:54:13 -04:00
Phillip Webb
64627fa9d6
Restore Maven 3.3 compatibility
...
Downgrade the `spring-boot-maven-plugin` maven version to 3.3.
Closes gh-14464
2018-09-24 15:40:25 -04:00
Madhura Bhave
9fa517c47c
Merge branch '2.0.x'
2018-09-24 11:13:37 -04:00
Madhura Bhave
ea3d9b4ead
Update publish release notes script
...
The milestone name and tag name can be different if the release type
is ".RELEASE".
2018-09-24 11:11:58 -04:00
Phillip Webb
a04e913c22
Make ResourceHandlerRegistrationCustomizer public
...
Make `ResourceHandlerRegistrationCustomizer` a public top level class.
Closes gh-14587
2018-09-24 10:20:25 -04:00
