99 Commits

Author SHA1 Message Date
Stephane Nicoll
02be86ddca Remove unnecessary exclusion on aopalliance
Closes gh-10691
2017-10-19 08:57:47 +02:00
Stephane Nicoll
b2839e2210 Merge branch '1.5.x' 2017-10-18 21:12:15 +02:00
Brian Clozel
14081c8557 Update to Bismuth-BUILD-SNAPSHOT
See gh-10679
2017-10-18 12:06:03 +02:00
Andy Wilkinson
a5a9fc5186 Upgrade to Snakeyaml 1.19
Closes gh-10678
2017-10-18 08:49:48 +01:00
Andy Wilkinson
a1843a378f Upgrade to Jooq 3.10.1
Closes gh-10677
2017-10-18 08:49:48 +01:00
Andy Wilkinson
5e70714b30 Upgrade to Solr 6.6.2
Closes gh-10676
2017-10-18 08:49:48 +01:00
Andy Wilkinson
ec2e3e53bb Upgrade to Sendgrid 4.1.1
Closes gh-10675
2017-10-18 08:49:48 +01:00
Andy Wilkinson
06939023e3 Upgrade to Jackson 2.9.2
Closes gh-10674
2017-10-18 08:49:48 +01:00
dreis2211
ed213ec462 Polish HttpHeaderInterceptor
Closes gh-10670
2017-10-18 08:57:09 +02:00
Andy Wilkinson
77cbab794e Make TomcatEmbeddedWebappClassLoader parallel capable
Closes gh-10477
2017-10-17 16:04:27 +01:00
Andy Wilkinson
027c5a0e35 Remove usage of Mockito's internals
Previously, we relied on Mockito's internals to bypass any Spring AOP
proxy during verification of a spy. Thanks to a new API in Mockito,
we can replace the use of Mockito's internals with a
VerificationStartedListener. This listener changes Mockito's view of
the mock to be the ultimate target of the AOP proxy, i.e. to be the
actual Mockito-created spy, allowing Mockito's verification of the
spy to proceed successfully.

This above-described change will mean that we require a very
up-to-date version of Mockito so the tests that verify our
compatibility with 2.5 have been removed as we will no longer support
it when using @MockBean or @SpyBean.

Lastly, two tests have been updated to replace their usage of the
internal MockUtil class with the equivalent public API calls.

Closes gh-10352
2017-10-17 15:56:28 +01:00
Andy Wilkinson
ec4b80443f Upgrade to Mockito 2.11.0
Closes gh-10668
2017-10-17 15:56:16 +01:00
Andy Wilkinson
688da652ac Polish 2017-10-17 15:41:55 +01:00
Andy Wilkinson
70f6c784c7 Upgrade to Spring Web Services 3.0.0.RC1
Closes gh-10666
2017-10-17 15:41:55 +01:00
Stephane Nicoll
dd90f071c6 Bump ASM version to be Java 8+ compatible
Closes gh-10647
2017-10-17 16:29:06 +02:00
Johnny Lim
caa6e18be1 Remove "Securing the H2 console" section
Closes gh-10657
2017-10-17 15:44:13 +02:00
Stephane Nicoll
2eba1c5f62 Polish "Use Assert.state() with Supplier where possible"
Closes gh-10658
2017-10-17 15:36:51 +02:00
dreis2211
3b71393e0a Use Assert.state() with Supplier where possible
See gh-10658
2017-10-17 15:35:59 +02:00
Johnny Lim
5aa32b3d0f Polish
Closes gh-10636
2017-10-17 15:29:13 +02:00
Andy Wilkinson
0af4536316 Ensure media types are used consistently across endpoint mappings
Previously, the media types that are consumed and produced by
endpoints were configured in the web stack-specific configuration.
Furthermore, these configured media types were not used for the
discovery "endpoint" that links to all the available endpoints.

This commit introduces EndpointMediaTypes that is configred in a
single, central location and then used to configure the consumed and
produced media types for endpoints exposed via WebFlux, Web MVC, and
Jersey as well as the discovery "endpoint" provided by each.

Closes gh-10659
2017-10-17 12:47:45 +01:00
Stephane Nicoll
22de4303c5 Polish "When pool autocommit is disabled, inform Hibernate"
Closes gh-9737
2017-10-17 11:39:44 +02:00
Craig Andrews
d0e70e90de When pool autocommit is disabled, inform Hibernate
Starting with Hibernate 5.2.10, the JPA property
`hibernate.connection.provider_disables_autocommit` should be set to true
when the datasource has autocommit disabled in order to improve
performance.

See gh-9737
2017-10-17 09:19:47 +02:00
James McShane
3237b05785 Update docs for OpenShift
The current documentation references mechanisms for OpenShift 2, which
has been changed significantly with the latest releases, specifically the
OpenShift 3 release.

Closes gh-10609
2017-10-17 09:16:15 +02:00
Johnny Lim
e234fb5d19 Fix broken links
Closes gh-10616
2017-10-17 09:11:22 +02:00
Vedran Pavic
12233672db Use properties in Security OAuth2 Client doc config example
Closes gh-10615
2017-10-17 09:07:59 +02:00
Vedran Pavic
d705696bdd Fix Security OAuth2 Client documentation
This commit fixes incorrect section level and sample configuration properties.

See gh-10615
2017-10-17 09:07:43 +02:00
Madhura Bhave
d307eba0a3 Add property to configure base-path for web endpoints.
Also, move properties corresponding to management server under
`management.server.*`.

Closes gh-10230
2017-10-16 15:17:55 -07:00
Brian Clozel
68db43cf44 Support error conventions in Spring WebFlux
This commit adds support for Spring Boot error conventions with WebFlux.
The Spring MVC support for that is based on an `Controller` that's
mapped on a specific `"/error"` path and configured as an error page in
the Servlet container. With WebFlux, this support leverages a
`WebExceptionHandler`, which catches exceptions flowing through the
reactive pipeline and handles them.

The `DefaultErrorWebExceptionHandler` supports the following:
* return a JSON error response to machine clients
* return error HTML views (templates, static or default HTML view)

One can customize the error information by contributing an
`ErrorAttributes` bean to the application context.

Spring Boot provides an `ErrorWebExceptionHandler` marker interface and a
base implementation that provides high level constructs to handle
errors, based on the Spring WebFlux functional flavor.
The error handling logic can be completely changed by providing a custom
`RouterFunction` there.

Fixes gh-8625
2017-10-16 21:55:05 +02:00
Andy Wilkinson
f8602817af Merge branch '1.5.x' 2017-10-13 16:30:17 +01:00
Andy Wilkinson
63b7591031 Add another dependency required for javadoc generation with Java 9
See gh-10515
2017-10-13 15:11:17 +01:00
Andy Wilkinson
c3d10a811e Add dependencies required for javadoc generation with Java 9
See gh-10515
2017-10-13 14:36:41 +01:00
Andy Wilkinson
44acef2ae2 Merge branch '1.5.x' 2017-10-13 12:43:00 +01:00
Andy Wilkinson
be09f1c256 Merge branch '1.5.x' 2017-10-13 12:27:51 +01:00
Brian Clozel
81d1b3c6ee Build against Spring Framework 5.0.1.BUILD-SNAPSHOT
See gh-10587
2017-10-12 15:52:11 +02:00
Andy Wilkinson
273defdb1f Merge branch '1.5.x' 2017-10-12 14:40:02 +01:00
Johnny Lim
a51765d0f4 Fix broken documentation links
Update links following recent project restructure.

Closes gh-10601
2017-10-11 13:30:35 -07:00
Phillip Webb
97afe8e938 Fix package tangle in properties source
Update `SpringConfigurationPropertySource` so that it no longer
references types in `org.springframework.boot.env`.

Closes gh-10592
2017-10-11 11:24:46 -07:00
Phillip Webb
f48550aa44 Fix package tangle in binder
Update the `BinderConversionService` so that it no longer references
classes from `org.springframework.boot.context.properties.bind`.

See gh-10592
2017-10-11 11:23:14 -07:00
Andy Wilkinson
1bd44d89d6 Test metrics endpoint using tag available on Java 9 as well as 8
See gh-10524
2017-10-11 16:50:23 +01:00
Andy Wilkinson
bcfb1d17b1 Merge branch '1.5.x' 2017-10-11 16:19:25 +01:00
Spencer Gibb
ce2058fa97 Change @ConditionalOnClass from Servlet to Flux
Update `ReactiveManagementContextAutoConfiguration` to check for a
`Flux` class rather than `Servlet`.

Closes gh-10590
2017-10-10 21:45:24 -07:00
Phillip Webb
f337323819 Allow recursive binding in Maps
Update `Binder` so that Maps containing references to themselves may
be bound. The existing stack-overflow protection (required when binding
a bean to a non enumerable source) now only applies to bean properties.

Fixes gh-9801
2017-10-10 21:41:53 -07:00
Madhura Bhave
3ec3b64d45 Guard against binding non-instantiable types
Update `JavaBeanBinder` so that null instances that are non-instantiable
are not bound.

Fixes gh-10131
2017-10-10 17:55:35 -07:00
Madhura Bhave
b7c37c2807 Expose webServer from ReactiveWebServerApplicationContext
Closes gh-9746
2017-10-10 14:51:11 -07:00
Phillip Webb
22a6ee03eb Polish MetricsEndpoint
See gh-10535
2017-10-10 13:58:10 -07:00
Jon Schneider
37975836f0 Support composite registries in MetricsEndpoint
Update `MetricsEndpoint` to deal with `CompositeMeterRegistry`
instances.

Closes gh-10535
2017-10-10 13:57:51 -07:00
Phillip Webb
b3555fa5c5 Fix checkstyle violation in properties file
See gh-10565
2017-10-10 13:48:33 -07:00
dreis2211
a76005e8d9 Remove concatenations with empty string
Closes gh-10512
2017-10-10 12:44:33 -07:00
Thiago Hirata
85e71f2373 Update OriginTrackedPropertiesLoader to ISO 8859-1
Align `OriginTrackedPropertiesLoader` with Java default property loading
by using ISO 8859-1 character encoding.

Closes gh-10565
2017-10-10 12:31:43 -07:00
Phillip Webb
8e030d4769 Upgrade to Spring Session 2.0.0.M5
Closes gh-10326
2017-10-10 12:19:25 -07:00