Commit Graph

2655 Commits

Author SHA1 Message Date
Andy Wilkinson 376e7fdfa1 Document profile activation limitation of .spring-boot-devtools.properties
Closes gh-15151
2018-11-27 12:09:56 +00:00
Andy Wilkinson e74b084c67 Auto-configure codec customizations and JSON when using @WebFluxTest
Closes gh-15070
2018-11-27 11:48:30 +00:00
Andy Wilkinson 9553d4f64b Polish "Auto-configure Spring Session's cookie serializer"
Closes gh-15163
2018-11-27 11:08:15 +00:00
Vedran Pavic 0daf83efab Auto-configure Spring Session's cookie serializer
See gh-15163
2018-11-27 11:08:05 +00:00
Stephane Nicoll e89d1a8ebe Upgrade to Spring Framework 5.0.11
Closes gh-15189
2018-11-27 11:06:57 +01:00
Andy Wilkinson 69edf8960f Correct stale reference to embeddedLaunchScriptProperties with Gradle
Closes gh-15094
2018-11-26 17:53:27 +00:00
Andy Wilkinson 898d9f80f3 Merge branch '1.5.x' into 2.0.x 2018-11-26 17:40:35 +00:00
Andy Wilkinson 7ddbb37bd5 Polish 2018-11-26 16:52:49 +00:00
Andy Wilkinson 5201584c60 Upgrade to Neo4j Ogm 3.1.5
Closes gh-15293
2018-11-26 15:51:01 +00:00
Andy Wilkinson 55721f06df Upgrade to Kotlin 1.2.71
Closes gh-15292
2018-11-26 15:50:59 +00:00
Andy Wilkinson d2756319cb Polish 2018-11-26 12:09:14 +00:00
Andy Wilkinson 4bc32e6358 Use a HandlerInterceptor for timing long tasks
Closes gh-15204
2018-11-26 11:30:06 +00:00
Stephane Nicoll 5f0ac46d78 Unwrap DataSource target rather than plain instanceof calls
Closes gh-15227
2018-11-26 10:35:10 +01:00
Stephane Nicoll e424dfbe15 Polish "Perform best effort to retrieve DataSourceProxy"
Closes gh-15206
2018-11-26 10:18:48 +01:00
Tadaya Tsuyukubo 26f9a92837 Perform best effort to retrieve DataSourceProxy
Prior to this commit, `DataSourceJmxConfiguration` with tomcat
`DataSource`, it can only find `DataSourceProxy` if the given
`DataSource` is a direct child of it.  Since it uses `instanceof`, it
could not find `DataSourceProxy` if the `DataSource` is
wrapped(delegated) or proxied.

This is because `DataSourceProxy#unwrap()` always returns null; thus
cannot use this method to directly obtain `DataSourceProxy`.

In this commit, updated the check logic to perform the best effort to
retrieve `DataSourceProxy`. If given `DataSource` is wrapped or proxied
by spring, tries to unwrap or get target datasource recursively to find
`DataSourceProxy`.

See gh-15206
2018-11-26 10:18:48 +01:00
Andy Wilkinson 44632ea55c Merge branch '1.5.x' into 2.0.x 2018-11-23 20:15:26 +00:00
Andy Wilkinson 8772f90e2f Polish 2018-11-23 17:00:16 +00:00
Andy Wilkinson 3331fa2d02 Merge branch '1.5.x' into 2.0.x 2018-11-23 16:59:18 +00:00
Andy Wilkinson a54de61e61 Polish
Revert change inadvertently committed as part of gh-15017
2018-11-23 16:41:25 +00:00
Andy Wilkinson 058428a14c Clarify how multiple attributes are treated by ConditionalOn(Missing)Bean
Closes gh-15177
2018-11-23 15:44:58 +00:00
Andy Wilkinson d104205880 Update docs to reflect that @AutoConfigureRestDocs supports WebTestClient
Closes gh-15220
2018-11-23 15:26:01 +00:00
Andy Wilkinson 1f39b5dd7a Align MeterRegistryConfigurer's javadoc with its implementation
Closes gh-15017
2018-11-23 15:22:09 +00:00
Andy Wilkinson 8ee57ac574 Remove redundant suggestion to add a dependency on Woodstox
It's now a transitive dependency of jackson-dataformat-xml so there is no
need to depend on it explicitly.

Closes gh-15092
2018-11-23 15:11:03 +00:00
Andy Wilkinson ce0a3d0311 Add missing classpath setters to BootJar and BootWar
Closes gh-15087
2018-11-23 13:46:56 +00:00
Andy Wilkinson 3bda78a3d3 Fix tests after HandlerExceptionResolver logging changes
See gh-14936 and gh-15189
2018-11-22 20:27:19 +00:00
Andy Wilkinson 97f7984812 Merge branch '1.5.x' into 2.0.x 2018-11-22 17:31:03 +00:00
Andy Wilkinson 9ca96cb751 Start building against Spring Framework 5.1.1 snapshots
See gh-15189
2018-11-22 15:33:10 +00:00
Andy Wilkinson 39bec2c50f Start building against Spring Integration 5.0.10 snapshots
See gh-15251
2018-11-22 15:32:21 +00:00
Andy Wilkinson 00f1e92350 Start building against Spring Session Apple-SR7 snapshots
See gh-15254
2018-11-22 15:30:40 +00:00
Andy Wilkinson 739de913d5 Start building against Spring AMQP 2.0.10 snapshots
See gh-15256
2018-11-22 15:29:55 +00:00
Andy Wilkinson de84a51f26 Upgrade to Spring Cloud Connectors 2.0.4.RELEASE
Closes gh-15250
2018-11-22 15:21:59 +00:00
Andy Wilkinson ff22df0475 Upgrade to Jetty El 8.5.33.1
Closes gh-15249
2018-11-22 15:21:58 +00:00
Andy Wilkinson d08edf7e14 Upgrade to Elasticsearch 5.6.13
Closes gh-15248
2018-11-22 15:21:57 +00:00
Andy Wilkinson 350e397d53 Upgrade to Janino 3.0.11
Closes gh-15247
2018-11-22 15:21:56 +00:00
Andy Wilkinson ec219b30d2 Upgrade to Activemq 5.15.8
Closes gh-15246
2018-11-22 15:21:56 +00:00
Andy Wilkinson 941d8744cb Upgrade to Javax Json 1.1.4
Closes gh-15245
2018-11-22 15:21:55 +00:00
Andy Wilkinson 6761747e39 Upgrade to Reactor Bom Bismuth-SR14
Closes gh-15244
2018-11-22 15:21:54 +00:00
Andy Wilkinson 40005c0e59 Upgrade to Unboundid Ldapsdk 4.0.9
Closes gh-15243
2018-11-22 15:21:53 +00:00
Andy Wilkinson ba4461a7a2 Merge branch '1.5.x' into 2.0.x 2018-11-22 15:09:38 +00:00
Phillip Webb e87664f295 Add JettyAccessLogCustomizer
Add a `JettyAccessLogCustomizer` to customize management access logs
when the management server is running on a different port.

Closes gh-15041
2018-11-15 13:28:51 -08:00
Phillip Webb c64a007e12 Format POM file 2018-11-15 13:22:50 -08:00
Phillip Webb e4d5714d50 Polish "Skip scoped targets when determining endpoints"
See gh-15182
2018-11-15 10:41:14 -08:00
Rahul Ahuja 4853e6a7af Skip scoped targets when determining endpoints
Update `EndpointDiscoverer` to filter out scoped target beans when
finding endpoints.

Closes gh-15182
2018-11-15 10:38:05 -08:00
Phillip Webb 3baf782822 Merge branch '1.5.x' into 2.0.x 2018-11-14 18:24:32 -08:00
Johnny Lim 8470d649bc Polish
See gh-15134
2018-11-11 10:58:31 +01:00
Stephane Nicoll 69d9b7a813 Polish contribution
Closes gh-15081
2018-11-04 07:59:26 +01:00
Nishant Raut 08ddb59f92 Update documentation to remind how JobParameters should be specified
See gh-15081
2018-11-04 07:51:31 +01:00
Stephane Nicoll f5ba9952db Make UndertowAccessLogCustomizer conditional on class
Closes gh-15065
2018-11-03 16:35:03 +01:00
Stephane Nicoll 01091aab2a Polish "Update docs to Spock 1.2"
Closes gh-15060
2018-11-02 13:59:03 +01:00
Jeff Sheets 01b17af530 Update docs to Spock 1.2
See gh-15060
2018-11-02 13:58:47 +01:00
Stephane Nicoll 2927195b02 Fix StaticResourceRequest javadoc examples
Closes gh-15050
2018-11-01 17:48:56 +09:00
Nooheat 8380031039 Simplify ArrayList calling addAll() immediately
Closes gh-15033
2018-11-01 17:10:16 +09:00
Misagh Moayyed e820f04926 Polish EnableConfigurationPropertiesImportSelector javadoc
Closes gh-15049
2018-11-01 10:13:35 +09:00
Andy Wilkinson 9ea5c58e38 Remove stale mention of module layout from Maven plugin's docs
Closes gh-14854
2018-10-29 16:38:58 +00:00
Andy Wilkinson 7eb1df1650 Test the Gradle Plugin against Gradle 4.10.2
Closes gh-15004
2018-10-29 13:11:41 +00:00
dreis2211 62ca9e47b8 Use MeterRegistry.isClosed() for tests
Closes gh-14975
2018-10-29 11:57:16 +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
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 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 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
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
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
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
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
Jack Gough 94770cc0fd Force JMX hostname to 127.0.0.1
Closes gh-14836
2018-10-17 18:05:28 +02: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
Stephane Nicoll 9ade4898ef Polish 2018-10-16 12:03:32 +02:00
Johnny Lim 47daf96c48 Polish
See gh-14843
2018-10-16 11:37:02 +02:00
Andy Wilkinson c2588f4e33 Upgrade to Spring AMQP 2.0.8.RELEASE
Closes gh-14833
2018-10-16 09:44:21 +01:00
Andy Wilkinson 11afc75b83 Upgrade to Spring Security 5.0.9.RELEASE
Closes gh-14850
2018-10-16 09:44:01 +01:00
Andy Wilkinson 1163d86f26 Upgrade to Spring Session Apple-SR6
Closes gh-14732
2018-10-16 09:12:40 +01:00
Phillip Webb a12a6f2ade Polish 2018-10-15 21:24:35 -07:00
Phillip Webb 8ecb659a35 Deprecate SecurityPrerequisite
Deprecate `SecurityPrerequisite` interface since we don't support it
in Spring Boot 2.

Closes gh-14846
2018-10-15 21:00:53 -07:00
Phillip Webb cd1c2638e5 Polish 2018-10-15 15:42:15 -07:00
Phillip Webb 5d219bcd19 Polish 2018-10-15 14:45:49 -07:00
Stephane Nicoll 45121f225e Fix default property value 2018-10-15 23:20:38 +02:00
Phillip Webb 192340c5ee Upgrade to Spring AMQP 2.0.8.RELEASE
Closes gh-14833
2018-10-15 14:20:16 -07:00
Phillip Webb b25e222136 Retain original case when mapping endpoint paths
Update `MappingWebEndpointPathMapper` to keep the original case rather
than using a lower-case version.

Closes gh-14773
2018-10-15 14:20:16 -07:00
Stephane Nicoll 935d621a42 Fix mapping of Wavefront base properties
Closes gh-14839
2018-10-15 23:18:12 +02:00
Stephane Nicoll 94b2092218 Add base test for StepRegistryPropertiesConfigAdapter 2018-10-15 23:05:54 +02:00