Andy Wilkinson
974f90cefe
Merge branch '1.5.x' into 2.0.x
2018-10-29 11:00:20 +00:00
Andy Wilkinson
60784e631f
Use HTTPS URL to download Glassfish binary
...
Closes gh-14994
2018-10-29 10:58:29 +00:00
Andy Wilkinson
0cd2b9262b
Upgrade to Thymeleaf Extras Springsecurity4 3.0.4.RELEASE
...
Closes gh-14997
2018-10-29 10:43:29 +00:00
Andy Wilkinson
a1b51f7647
Upgrade to Activemq 5.15.7
...
Closes gh-14996
2018-10-29 10:43:28 +00:00
Andy Wilkinson
30a9c0ee07
Upgrade to Reactor Bom Bismuth-SR13
...
Closes gh-14995
2018-10-29 10:43:27 +00:00
Andy Wilkinson
4a0552e945
Upgrade to Thymeleaf 3.0.11.RELEASE
...
Closes gh-14920
2018-10-29 10:37:15 +00:00
Andy Wilkinson
ec3a0806e6
Merge branch '1.5.x' into 2.0.x
2018-10-29 10:29:43 +00:00
Andy Wilkinson
7f8f1f5bc2
Revert "Backport "Upgrade to Ehcache 2.10.6""
...
This reverts commit 264b7ca728 .
See gh-14962
2018-10-29 10:28:13 +00:00
Phillip Webb
a8ac091187
Merge pull request #14977 from nishantraut
...
* pr/14977:
Polish "Improve Path Matching and Content Negotiation docs"
Improve Path Matching and Content Negotiation docs
2018-10-28 09:00:00 -07:00
Phillip Webb
43dd3cfa76
Polish "Improve Path Matching and Content Negotiation docs"
...
See gh-14977
2018-10-28 08:59:30 -07:00
Nishant Raut
113abbe6e6
Improve Path Matching and Content Negotiation docs
...
Add a note to the "Path Matching and Content Negotiation" section about
the `spring.mvc.pathmatch.use-suffix-pattern` property.
Closes gh-14977
2018-10-28 08:52:36 -07:00
Phillip Webb
33c7a74bee
Update copyright year for changed files
2018-10-26 16:35:28 -07:00
Phillip Webb
997de53f20
Remove uncessary call in PropertiesMigrationReport
...
Closes gh-14974
2018-10-26 16:35:00 -07:00
Phillip Webb
236bd856f6
Merge pull request #14967 from chang-chao
...
* pr/14967:
Polish "Consider aliases when checking descendants"
Consider aliases when checking descendants
2018-10-26 16:33:26 -07:00
Phillip Webb
5603d61909
Polish "Consider aliases when checking descendants"
...
See gh-14967
2018-10-26 16:24:23 -07:00
chang-chao
256ca681fd
Consider aliases when checking descendants
...
Update `AliasedConfigurationPropertySource` to consider aliases in
`containsDescendantOf`.
Prior to this commit, given a source containing `example.name` with
a defined alias of `other.name -> example.name` calling
`containsDescendantOf("other")` would incorrectly return
`ConfigurationPropertyState.ABSENT`.
Closes gh-14967
2018-10-26 16:08:56 -07:00
Phillip Webb
7bb6df4206
Merge pull request #14933 from benas
...
* pr/14933:
Polish "Fix Spring Batch job restart parameters handling"
Fix Spring Batch job restart parameters handling
2018-10-26 13:37:07 -07:00
Phillip Webb
62b9268cec
Polish "Fix Spring Batch job restart parameters handling"
...
See gh-14933
2018-10-26 13:30:50 -07:00
Mahmoud Ben Hassine
ad3c3ad361
Fix Spring Batch job restart parameters handling
...
Fix the `JobLauncherCommandLineRunner` to correctly deal with job
parameters when restarting a job.
Prior to this commit, we were was calling the `getNextJobParameters`
method of the `JobParametersBuilder` from batch. This method was getting
the previous parameters of the wrong job instance in a restart scenario.
This commit fixes the issue by first getting the right job instance with
the provided parameters, then restarting it.
Closes gh-14933
2018-10-26 13:24:02 -07:00
Stephane Nicoll
d1ce315602
Merge branch '1.5.x' into 2.0.x
2018-10-26 07:48:40 +09:00
Stephane Nicoll
264b7ca728
Backport "Upgrade to Ehcache 2.10.6"
...
Closes gh-14962
2018-10-26 07:45:27 +09:00
Stephane Nicoll
b84b957242
Backport "Upgrade to Appengine Sdk 1.9.67"
...
Closes gh-14955
2018-10-26 07:38:48 +09:00
Phillip Webb
7bcc793faf
Fix WebMvcMetricsFilter logger imports
...
Don't use SLF4J loggers in `WebMvcMetricsFilter`.
Fixes gh-14953
2018-10-24 22:46:31 -07:00
Madhura Bhave
4322b9781b
Polish
2018-10-23 14:21:06 -07:00
Madhura Bhave
bc58d4456f
Rationalize DefaultRestartInitializerTests
...
Closes gh-14927
2018-10-23 13:43:11 -07:00
Madhura Bhave
44e96013ff
Merge pull request #14912 from dreis2211
...
* gh-14912:
Use Errors.hasErrors() in DefaultErrorAttributes
2018-10-22 21:51:56 -07:00
dreis2211
3fea487c7b
Use Errors.hasErrors() in DefaultErrorAttributes
...
Closes gh-14912
2018-10-22 21:51:21 -07:00
Madhura Bhave
d6991e6d91
Fix formatting violation
2018-10-22 15:02:31 -07:00
Madhura Bhave
5742c2383c
Merge pull request #14916 from dreis2211
...
* gh-14916:
Avoid creation of unnecessary collections
2018-10-22 14:56:00 -07:00
dreis2211
5c0d7f4ac0
Avoid creation of unnecessary collections
...
Closes gh-14916
2018-10-22 14:54:39 -07:00
Phillip Webb
35221c1142
Polish
2018-10-22 14:26:01 -07:00
Phillip Webb
de7eeb5014
Fix ResourceUrlEncodingFilter conditions
...
Fix `ResourceUrlEncodingFilter` conditions which were inadvertently
changed in commits 64f04fce and 6cc272ec and would back off if any
`FilterRegistrationBean` was found.
The updated conditions restores the behavior of Spring Boot 2.0.5 and
allows users to directly register their own `ResourceUrlEncodingFilter`
beans (as long as they don't use a `FilterRegistrationBean`).
Fixes gh-14897
2018-10-22 14:17:49 -07:00
Madhura Bhave
f145e81354
Use github release resource for publishing release notes
...
This commit also marks a release as pre-release for milestones and RCs
Closes gh-14908
Closes gh-14875
2018-10-19 16:17:11 -07:00
Andy Wilkinson
2110215559
Provide more detailed uri tag for calls to Data REST repositories
...
Closes gh-14872
2018-10-19 18:19:58 +01:00
Andy Wilkinson
d838787e70
Start building against Spring Data snapshots for Kay-SR12
...
See gh-14893
2018-10-19 17:52:52 +01:00
Andy Wilkinson
76ad197584
Deallocate servlet after forcing initialization in mappings endpoint
...
Previously, when using Tomcat, a call to mappings endpoint would force
the initialization of any DispatcherServlets in the context. This was
done by calling allocate on Tomcat's StandardWrapper. This left the
wrapper in a state that would cause it to block for two seconds during
shutdown as the wrapper has an outstanding allocation.
This commit immediately deallocates the servlet after it has been
allocated. This ensures that the DispatcherServlet has been initialized
while also leaving the wrapper in a state that it can shut down
immediately when asked to do so.
Closes gh-14898
2018-10-19 10:43:23 +01:00
Andy Wilkinson
9b8ead825c
Polish
2018-10-18 15:38:06 +01:00
Andy Wilkinson
d5201070e6
Cross-link to Gradle Plugin docs rather than duplicating example
...
Closes gh-14878
2018-10-18 11:09:16 +01:00
Andy Wilkinson
993c75ea38
Merge branch '1.5.x' into 2.0.x
2018-10-18 10:47:35 +01:00
Andy Wilkinson
fdca475be4
Use canonical link to project page for homepage in Homebrew formula
...
Closes gh-14851
2018-10-18 10:45:59 +01:00
Stephane Nicoll
696c621f35
Merge pull request #14836 from goughy000
...
* pr/14836:
Force JMX hostname to 127.0.0.1
2018-10-17 18:06:05 +02:00
Jack Gough
94770cc0fd
Force JMX hostname to 127.0.0.1
...
Closes gh-14836
2018-10-17 18:05:28 +02:00
Madhura Bhave
b832a2f604
Add reference to docker-lib source
2018-10-16 16:36:44 -07:00
Madhura Bhave
3a7101233f
Fix publish release notes script
...
See gh-14857
2018-10-16 14:22:48 -07:00
Madhura Bhave
54966bea6f
Use the entire version for the tag name
...
This commit also restores the `sed` call to sanitize the request body.
Fixes gh-14857
2018-10-16 11:51:54 -07:00
Spring Buildmaster
f67348d7ba
Next development version (v2.0.7.BUILD-SNAPSHOT)
2018-10-16 15:19:00 +00:00
Andy Wilkinson
1150f46b40
Merge branch 'gh-14503' into 2.0.x
2018-10-16 13:02:12 +01:00
Andy Wilkinson
d4cad5e916
Polish "Servlet path not explicitly required for EndpointRequest"
...
Closes gh-14503
2018-10-16 13:01:49 +01:00
Madhura Bhave
0fd873f0f9
Servlet path not explicitly required for EndpointRequest
2018-10-16 11:58:07 +01:00
Andy Wilkinson
85f2db3864
Merge branch '1.5.x' into 2.0.x
2018-10-16 11:11:08 +01:00