Madhura Bhave
799352a7b8
Merge branch '2.1.x'
2019-03-22 14:25:42 -07:00
Madhura Bhave
10f0bcf992
Merge branch '2.0.x' into 2.1.x
2019-03-22 14:25:00 -07:00
Madhura Bhave
3e82e7aa7e
Publish release notes after central sync for releases
...
Closes gh-15713
2019-03-22 14:23:13 -07:00
Stephane Nicoll
3125f424ce
Add metadata support for immutable ConfigurationProperties type
...
Closes gh-16071
2019-03-22 15:33:35 +01:00
Madhura Bhave
35d7fccb33
Update samples to use configuration properties scanning
...
Closes gh-12602
2019-03-21 13:30:45 -07:00
Madhura Bhave
8f693a0277
Add support for configuration properties scanning
...
See gh-12602
2019-03-21 13:30:44 -07:00
Brian Clozel
711169aa8a
Adapt tests after Servlet.fn added to Spring Framework
...
Since Servlet.fn support has been added in Spring Framework, new
infrastructure beans (like `HandlerAdapter` and `HandlerMapping`) have
been added.
This commit adapts the Spring MVC auto-configuration tests to reflect
those changes.
2019-03-21 14:31:38 +01:00
Stephane Nicoll
6e9e5e5a8b
Ignore duplicate "about.html" in Jetty HTTP client
...
Closes gh-16272
2019-03-21 11:36:27 +01:00
Madhura Bhave
0d136f0573
Merge branch '2.1.x'
2019-03-20 18:00:48 -07:00
Madhura Bhave
0a54fb73fa
Remove redundant include from WebFluxTypeExcludeFilter
...
For webflux, security configuration is configured via a bean of type
`SecurityWebFilterChain` and not `ServerHttpSecurity`. We would have changed
the include to be `SecurityWebFilterChain` but the filter only applies to
beans registered via component scanning and not those registered in
`@Configuration` classes, making the includes redundant.
See gh-16088
2019-03-20 17:54:04 -07:00
Madhura Bhave
8f0850a69c
Merge branch '2.1.x'
2019-03-20 17:48:57 -07:00
Madhura Bhave
6bd6279eff
Document slice test behavior with @Configuration classes
...
Closes gh-16274
2019-03-20 17:48:14 -07:00
Andy Wilkinson
41967fc629
Correct the URI used for the properties DTD
...
See gh-16270
2019-03-20 17:48:33 +00:00
Andy Wilkinson
157c285b55
Merge branch '2.1.x'
2019-03-20 17:31:51 +00:00
Andy Wilkinson
10e726ead2
Merge branch '2.0.x' into 2.1.x
2019-03-20 17:31:40 +00:00
Andy Wilkinson
5f4fa9d52a
Merge branch '1.5.x' into 2.0.x
2019-03-20 17:31:31 +00:00
Andy Wilkinson
91726f3162
Update the samples to use Spring Java Format 0.0.7
2019-03-20 17:30:25 +00:00
Andy Wilkinson
41bb2ef426
Merge branch '2.1.x'
2019-03-20 17:17:26 +00:00
Andy Wilkinson
ce145a833c
Merge branch '2.0.x' into 2.1.x
2019-03-20 17:17:13 +00:00
Andy Wilkinson
70d883a8ee
Correct the location to which Java 8 is extracted
...
Closes gh-15813
2019-03-20 17:16:20 +00:00
Andy Wilkinson
36c1c051b8
Merge branch '2.1.x'
2019-03-20 16:55:10 +00:00
Andy Wilkinson
e23f72c8b0
Merge branch '2.0.x' into 2.1.x
2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c
Merge branch '1.5.x' into 2.0.x
2019-03-20 16:45:26 +00:00
Andy Wilkinson
4b6bddd476
Merge branch '1.4.x' into 1.5.x
2019-03-20 16:30:04 +00:00
Stephane Nicoll
1aaab7ecc3
Upgrade to Solr 8.0.0
...
Closes gh-16272
2019-03-20 17:25:22 +01:00
Stephane Nicoll
c2befeaeed
Merge branch '2.1.x'
2019-03-20 17:24:21 +01:00
Stephane Nicoll
82c434d581
Upgrade to Solr 7.7.1
...
Closes gh-16273
2019-03-20 17:23:52 +01:00
Andy Wilkinson
6920c39349
Merge branch '1.3.x' into 1.4.x
2019-03-20 15:06:50 +00:00
Andy Wilkinson
0e009ef047
Use HTTPS to link to the Apache license
2019-03-20 15:00:10 +00:00
Andy Wilkinson
1e62be6ac4
Polish
2019-03-20 14:37:30 +00:00
Andy Wilkinson
b8311bd8f5
Merge pull request #16270 from Spring Operator
...
* gh-16270:
Use HTTPS for external links in XML files
2019-03-20 14:33:37 +00:00
Spring Operator
00ab30362c
Use HTTPS for external links in XML files
...
See gh-16270
2019-03-20 14:33:25 +00:00
Stephane Nicoll
c8460ee851
Merge branch '2.1.x'
2019-03-20 10:16:44 +01:00
Stephane Nicoll
34f1674f83
Merge pull request #16269 from izeye
...
* pr/16269:
Use the latest DTD declaration for Checkstyle
2019-03-20 10:15:30 +01:00
Johnny Lim
62cd4a1344
Use the latest DTD declaration for Checkstyle
...
Closes gh-16269
2019-03-20 10:15:22 +01:00
Stephane Nicoll
a3908d0644
Merge pull request #16265 from dreis2211
...
* pr/16265:
Remove explicit types
2019-03-20 09:55:33 +01:00
dreis2211
dda0b3e2a1
Remove explicit types
...
Closes gh-16265
2019-03-20 09:44:51 +01:00
Madhura Bhave
dd70c96ead
Merge branch '2.1.x'
2019-03-19 17:29:37 -07:00
Madhura Bhave
0c52c3fc55
Clarify ambiguous documentation in default security section
...
Closes gh-16033
2019-03-19 17:25:47 -07:00
Madhura Bhave
448115609c
Merge branch '2.1.x'
2019-03-19 17:12:04 -07:00
Madhura Bhave
4a230fdec9
Document AssertJ's satisfies with extractingJsonPathNumberValue
...
Closes gh-16229
2019-03-19 17:11:28 -07:00
Andy Wilkinson
b828b398b5
Merge branch '2.1.x'
2019-03-19 17:11:45 +00:00
Andy Wilkinson
c8ec621125
Merge pull request #16247 from Spring Operator
...
* gh-16247:
Update build and setup configuration to use HTTPS
Closes gh-16247
2019-03-19 17:07:21 +00:00
Spring Operator
b32c0080c3
Update build and setup configuration to use HTTPS
...
See gh-16247
2019-03-19 17:06:45 +00:00
Andy Wilkinson
a36aa67b52
Merge branch '2.0.x' into 2.1.x
2019-03-19 17:04:41 +00:00
Andy Wilkinson
b1391a795e
Merge pull request #16246 from Spring Operator
...
* gh-16246:
Polish "Update build and setup configuration to use HTTPS"
Update build and setup configuration to use HTTPS
Closes gh-16246
2019-03-19 16:59:08 +00:00
Andy Wilkinson
2c2fa9e821
Polish "Update build and setup configuration to use HTTPS"
...
See gh-16246
2019-03-19 16:58:45 +00:00
Spring Operator
3e2b6ac8ed
Update build and setup configuration to use HTTPS
...
See gh-16246
2019-03-19 16:58:31 +00:00
Andy Wilkinson
63284e0456
Merge branch '1.5.x' into 2.0.x
2019-03-19 16:56:40 +00:00
Andy Wilkinson
d8f8ae86c8
Merge pull request #16245 from Spring Operator
...
* gh-16245:
Polish "Update build and setup configuration to use HTTPS"
Update build and setup configuration to use HTTPS
Closes gh-16245
2019-03-19 16:49:20 +00:00
