6540 Commits

Author SHA1 Message Date
Andy Wilkinson
82ea3b51b3 Polish 2019-08-30 08:26:12 +01:00
Andy Wilkinson
0e2a131e5d Polish "Upgrade to Flyway 6.0.1"
See gh-17997
2019-08-30 08:19:07 +01:00
Semyon Danilov
278b20d9c9 Upgrade to Flyway 6.0.1
See gh-17997
2019-08-30 08:19:07 +01:00
Phillip Webb
1e2f8959d9 Fix broken asciidoc rendering
Restore the blank line at the end of `executable-jar-format.adoc`
which appears to be required.

See gh-18007
2019-08-29 23:53:16 -07:00
Phillip Webb
b6e3f48a89 Delete old appendix file
Delete file accidentally added during merge.

See gh-18007
2019-08-29 23:25:09 -07:00
Phillip Webb
d70519038b Fix broken asciidoc syntax
See gh-18007
2019-08-29 21:18:51 -07:00
Phillip Webb
ca53780c43 Merge branch '2.1.x'
Closes gh-18007
2019-08-29 18:05:31 -07:00
Phillip Webb
64d4bf823a Reformat documentation to one sentence per line
Update reference documentation to use one sentence per line formatting
as recommended by the Asciidoctor team.

Closes gh-12445
2019-08-29 14:58:48 -07:00
Andy Wilkinson
9a7b2ce007 Upgrade to Mssql Jdbc 7.4.1.jre8
Closes gh-17965
2019-08-29 13:53:13 +01:00
Andy Wilkinson
a04a6c3e92 Merge branch '2.1.x'
Closes gh-17996
2019-08-29 13:51:05 +01:00
Ben Hale
2a04d94cf1 Use exec when launching the JVM in CLI's shell script
Previously, when the Spring Boot CLI ran the Java command line for an
application it did a straight invocation which suppressed propagation of
signals to the JVM in certain circumstances (e.g within Docker containers).

This change prepends the command with exec which causes the Java process to
replace the script process in a shell ensuring that signals are propagated to
the Java process without suppression.

See gh-17976

Signed-off-by: Ben Hale <bhale@pivotal.io>
2019-08-29 13:49:46 +01:00
Andy Wilkinson
0217de4349 Polish "Improve handling of non-standard status codes in RestTemplate metrics"
See gh-17991
2019-08-29 13:44:35 +01:00
Johnny Lim
1acff410a2 Improve handling of non-standard status codes in RestTemplate metrics
See gh-17991
2019-08-29 13:44:12 +01:00
Andy Wilkinson
7f8b3a7b86 Test the Gradle Plugin against Gradle 5.6.1
Closes gh-17995
2019-08-29 12:53:50 +01:00
dreis2211
26a22fa523 Test the Gradle Plugin against Gradle 5.6.1
See gh-17984

Closes gh-17984
2019-08-29 12:46:26 +01:00
Andy Wilkinson
bbec7b0f37 Merge branch '2.1.x'
Closes gh-17994
2019-08-29 12:30:06 +01:00
Andy Wilkinson
9961647c7f Improve handling of reserved characters in MetaInfResourceManager
Previously, MetaInfResourceManager that we use with Undertow to serve
static resources from jar's META-INF/resources did not correctly
handle characters in the path that should be percent-encoded when
used in a URL.

This commit updates MetaInfResourceManager to encode the path before
it is used to create a URL. Prior to this encoding, encoded slashes
(%2F) are decoded as, unlike other encoded characters in the request's
URL, encoded slashes are not decoded prior to calling the
ResourceManager.

Fixes gh-17853
2019-08-29 12:13:40 +01:00
Stephane Nicoll
b57db504df Fix broken build due to Kotlin upgrade 2019-08-29 10:01:16 +02:00
Stephane Nicoll
078d53a5f2 Upgrade to Kotlin 1.3.50
Closes gh-17982
2019-08-28 17:11:49 +02:00
Andy Wilkinson
11f67b8536 Upgrade to Kotlin Coroutines 1.3.0
Closes gh-17907
2019-08-28 11:22:13 +01:00
leoli
fac4b9c830 Upgrade to Git commit ID plugin 3.0.1
See gh-17981
2019-08-28 11:15:09 +01:00
Stephane Nicoll
96596f8ecc Polish contribution
See gh-17962
2019-08-28 10:55:32 +02:00
Kant
7ee3656188 Polish
See gh-17962
2019-08-28 10:55:13 +02:00
Madhura Bhave
2726540e76 Merge branch '2.1.x'
Closes gh-17980
2019-08-28 13:13:48 +05:30
Madhura Bhave
674f2f5a6c EndpointRequest should match @ServletEndpoint
This commit also changes the request matcher for MVC
endpoints to use an AntPathRequestMatcher instead of an
MvcRequestMatcher. The endpoint is always available
under the mapped endpoint path and this way the same matcher
can be used for both MVC and Jersey.

Fixes gh-17912

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
2019-08-28 11:48:53 +05:30
dreis2211
ec57f0c31f Fix upstream RSocket method renames
See gh-17973
2019-08-27 13:12:52 +01:00
Vedran Pavic
cb3efc1ef6 Add dependency management for IBM DB2 JDBC driver
See gh-17782
2019-08-27 11:19:19 +02:00
Stephane Nicoll
cda310ba0a Polish "Fix a broken Asciidoctor syntax"
See gh-17970
2019-08-27 11:11:57 +02:00
Johnny Lim
78a467f9d3 Fix a broken Asciidoctor syntax
See gh-17970
2019-08-27 11:10:39 +02:00
Stephane Nicoll
e92a530640 Merge branch '2.1.x'
Closes gh-17972
2019-08-27 11:07:45 +02:00
leoli
34d28f48ca Fix Undertow access log dir property name in doc
See gh-17968
2019-08-27 11:06:16 +02:00
Madhura Bhave
46ea4a2501 isPublisherConfirms in RabbitProperties should not throw NPE
Fixes gh-17967
2019-08-27 08:39:55 +05:30
Phillip Webb
fb846f434f Merge branch '2.1.x'
Fixes gh-17959
2019-08-25 21:37:07 -07:00
Phillip Webb
4c446c38a6 Only add management error page for Spring MVC
Move management `ErrorPage` registration from the
`WebMvcEndpointChildContextConfiguration` to
`WebMvcEndpointChildContextConfiguration` and only add it when the
error controller is registered.

Fixes gh-17938
2019-08-25 21:34:25 -07:00
Stephane Nicoll
7d994e607d Restructure tests to exercise deprecated property in a dedicated test
See gh-17848
2019-08-24 08:22:28 +02:00
Madhura Bhave
21783faede Merge branch '2.1.x'
Closes gh-17953
2019-08-23 19:44:16 -07:00
Madhura Bhave
28d374d84d Polish "Configure Issuer Validator for Resource Server"
See gh-17952
2019-08-23 19:34:49 -07:00
HaiTao Zhang
b3d189cf87 Configure Issuer Validator for Resource Server
See gh-17952
2019-08-23 19:34:31 -07:00
Madhura Bhave
8954fe13e5 Polish "Support additional publisher confirm types"
See gh-17848
2019-08-23 18:44:42 -07:00
HaiTao Zhang
8c1c8a27d9 Support additional publisher confirm types
See gh-17848
2019-08-23 18:44:15 -07:00
Madhura Bhave
7829593746 Polish "Sanitize password in URI properties"
See gh-17939
2019-08-23 18:16:46 -07:00
HaiTao Zhang
d49a2ec98e Sanitize password in URI properties
See gh-17939
2019-08-23 18:10:43 -07:00
Madhura Bhave
0fee0ca71c Merge pull request #17915 from htztomic
* pr/17915:
  Polish "Added support for devtools YAML configuration"
  Added support for devtools YAML configuration

Closes gh-17915
2019-08-23 14:39:07 -07:00
Madhura Bhave
48b5b6a24c Polish "Added support for devtools YAML configuration"
See gh-17915
2019-08-23 14:37:54 -07:00
HaiTao Zhang
00a3ad0fd1 Added support for devtools YAML configuration
See gh-17915
2019-08-23 14:33:39 -07:00
Andy Wilkinson
b54ff7c45f Merge branch '2.1.x'
Closes gh-17950
2019-08-23 20:34:35 +01:00
Andy Wilkinson
608228d617 Improve handling of non-standard status codes in WebClient metrics
Fixes gh-17695
2019-08-23 20:28:26 +01:00
Andy Wilkinson
ba6fe60134 Merge branch '2.1.x'
Closes gh-17948
2019-08-23 19:15:02 +01:00
Andy Wilkinson
52050c173c Fix spying on scoped beans with @SpyBean
Previously, when spying on a scoped bean the creation of the spy
would be performed using the scoped proxy. This would result in
the spy being unable to spy on any of the target bean's methods as
the scoped proxy's implementations of those methods would be final.

This commit updates MockitoPostProcessor so that the creation of the
spy and injection of the @SpyBean-annotated field is performed using
the scoped target. The scoped target has not be proxied so this
allows Mockito to spy on all of its methods.

Closes gh-17817
2019-08-23 19:03:08 +01:00
Andy Wilkinson
2d2e3b3d8b Support parallel test execution with @AutoConfigureMockMvc
Previously, the deferred line writing that is used, to print MockMvc
results to the console assumed that each DeferredLinesWriter would
only be used by a single thread at a time. This assumption does not
hold true when using JUnit 5's parallel test exection if the tests
running in parallel share an application context. This resulted in
a concurrent modification exception if one thread was adding lines
to the output while another was iterating over them.

This commit updates DeferredLinesWriter so that it uses thread local
storage for the deferred lines. This ensures that each List of lines
is only ever accessed by a single thread.

Closes gh-16179
2019-08-23 14:12:54 +01:00