root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
19,200 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

3935 Commits

Author SHA1 Message Date
Andy Wilkinson efbc0fc2ca Merge branch '2.0.x' 2018-10-19 11:41:38 +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 22e722d9f9 Polish 2018-10-18 15:51:20 +01:00
Andy Wilkinson cefc7842d6 Merge branch '2.0.x' 2018-10-18 15:38:17 +01:00
Andy Wilkinson 9b8ead825c Polish 2018-10-18 15:38:06 +01:00
Brian Clozel 5bf51f52b9 Fix WebFlux instrumentation after SPR-17395 
SPR-17395 ensures that WebFlux.fn is adding a request attribute of type
`PathPattern` on the `HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE`.

A specific tag provider for WebFlux.fn is no longer necessary.

See gh-14876
 2018-10-18 14:58:39 +02:00
Brian Clozel 64c9dfe7d6 Upgrade to Spring Framework 5.1.2.BUILD-SNAPSHOT 
See gh-14887
 2018-10-18 14:58:01 +02:00
Andy Wilkinson 1b0677bdd9 Merge branch '2.0.x' 2018-10-18 11:10:22 +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 3995c66b37 Merge branch '2.0.x' 2018-10-18 10:47:46 +01:00
Andy Wilkinson 993c75ea38 Merge branch '1.5.x' into 2.0.x 2018-10-18 10:47:35 +01:00
Andy Wilkinson 3177584588 Back off auto-config of Log4J2Metrics when context is backed by SLF4J 
Closes gh-14883
 2018-10-18 10:31:10 +01:00
Johnny Lim c8c3f59e93 Polish 
Closes gh-14884
 2018-10-18 09:36:27 +02:00
Stephane Nicoll 2a0451c461 Merge branch '2.0.x' 2018-10-17 18:06:19 +02:00
Jack Gough 94770cc0fd Force JMX hostname to 127.0.0.1 
Closes gh-14836
 2018-10-17 18:05:28 +02:00
Stephane Nicoll 6b3a2ac469 Upgrade to Maven Surefire Plugin 2.22.1 
Closes gh-14870
 2018-10-17 14:38:19 +02:00
Stephane Nicoll 40b56040d2 Upgrade to Spring Amqp 2.1.0.RELEASE 
Closes gh-14869
 2018-10-17 14:38:18 +02:00
Stephane Nicoll e6f5e8933a Upgrade to Influxdb Java 2.14 
Closes gh-14868
 2018-10-17 14:38:18 +02:00
Stephane Nicoll c5c646f841 Upgrade to Hibernate 5.3.7.Final 
Closes gh-14867
 2018-10-17 14:38:18 +02:00
Stephane Nicoll 57c2507db9 Upgrade to Lettuce 5.1.1.RELEASE 
Closes gh-14865
 2018-10-17 14:31:16 +02:00
Stephane Nicoll bc1c0dc93c Upgrade to Sendgrid 4.3.0 
Closes gh-14864
 2018-10-17 14:31:15 +02:00
Stephane Nicoll 5e96daab58 Upgrade to Hazelcast 3.10.6 
Closes gh-14863
 2018-10-17 14:31:15 +02:00
Stephane Nicoll 2c383859f0 Upgrade to Couchbase Client 2.7.0 
Closes gh-14862
 2018-10-17 14:31:14 +02:00
Stephane Nicoll 474da80b4d Revert "Restructure of security packages" 
See gh-14412
 2018-10-17 12:22:51 +02:00
Stephane Nicoll 5805c0fc0a Polish "Fix a broken table in doc" 
Closes gh-14859
 2018-10-17 08:47:10 +02:00
Johnny Lim 9e25fa1247 Fix a broken table in doc 
See gh-14859
 2018-10-17 08:46:59 +02:00
Stephane Nicoll fd0e8815b1 Polish 2018-10-16 18:00:55 +02:00
Stephane Nicoll 5f2517f889 Auto-configure AppOptics metrics 
Closes gh-14819
 2018-10-16 17:35:23 +02:00
Stephane Nicoll 3dc74fea4b Polish 2018-10-16 15:55:07 +02:00
Stephane Nicoll 134682a7de Add error metadata for properties removed recently 2018-10-16 15:55:07 +02:00
Andy Wilkinson bd0a41d82d Merge branch '2.0.x' 2018-10-16 13:31:35 +01:00
Andy Wilkinson d4cad5e916 Polish "Servlet path not explicitly required for EndpointRequest" 
Closes gh-14503
 2018-10-16 13:01:49 +01:00
Stephane Nicoll 620d88e4ed Polish 
See gh-14849
 2018-10-16 13:50:37 +02:00
Madhura Bhave 0fd873f0f9 Servlet path not explicitly required for EndpointRequest 2018-10-16 11:58:07 +01:00
Brian Clozel 96fc92609d Polish 
Closes gh-14849
 2018-10-16 12:23:04 +02:00
Daniel Fernández 56c1247bbb Add new config keys for Thymeleaf 3.0.10 features 
This commit adds the following configuration properties:

* `spring.thymeleaf.render-hidden-markers-before-checkboxes`
* `spring.thymeleaf.servlet.produce-partial-output-while-processing`
 2018-10-16 12:23:04 +02:00
Andy Wilkinson 98d95268e1 Align with changes to CouchbaseReactiveHealthIndicator 
Closes gh-14799
 2018-10-16 11:14:36 +01:00
Stephane Nicoll 9ade4898ef Polish 2018-10-16 12:03:32 +02:00
Johnny Lim 7f9671fd14 Polish 
Closes gh-14843
 2018-10-16 11:38:51 +02:00
Stephane Nicoll 39f8b685df Merge branch '2.0.x' 2018-10-16 11:38:39 +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
Brian Clozel 8397878857 Polish 
See gh-12838
 2018-10-16 10:35:25 +02:00
Andy Wilkinson d49cc20e79 Rework CouchbaseReactiveHealthIndicator to use DiagnosticsReport 
Closes gh-14799
 2018-10-16 09:28:42 +01:00
Stephane Nicoll 1e6851cf81 Polish "Remove usages of BasicAuthorizationInterceptor" 
Closes gh-14830
 2018-10-16 10:21:32 +02:00
dreis2211 8b14754cda Remove usages of BasicAuthorizationInterceptor 
See gh-14830
 2018-10-16 10:21:32 +02:00
Andy Wilkinson 1163d86f26 Upgrade to Spring Session Apple-SR6 
Closes gh-14732
 2018-10-16 09:12:40 +01:00
Hanope c3f3240e2c Fix typos 
closes gh-14844
 2018-10-16 01:04:28 -07:00
Phillip Webb 29707bf75a Complete restructure of security packages 
Complete the restructuring of the security auto-configuration
packages by removing the direct import of web configuration from
the main security auto-configuration.

Closes gh-14412
 2018-10-16 01:01:11 -07:00
Madhura Bhave f835f82582 Preliminary restructure of security packages 
Restructure the security auto-configuration packages to better reflect
the part of the system that the configuration applies to.

See gh-14412
 2018-10-16 01:01:10 -07:00
Rahul Narula c078d0cb8a Polish SpringBootJoranConfigurator 
Closes gh-14845
 2018-10-15 22:05:11 -07:00
Phillip Webb f986a30d2c Rollback to Spring Session Bean-RC1 
Rollback to RC1 of Spring Session "Bean" since the GA release has been
pushed back.

See gh-14733
 2018-10-15 22:03:16 -07:00
Phillip Webb b8bc4c6f3c Delete deprecated SecurityPrerequisite 
Remove `SecurityPrerequisite` which was deprecated in 2.0.6.

See gh-14846
 2018-10-15 22:02:09 -07:00
Phillip Webb d558a1a762 Merge branch '2.0.x' 2018-10-15 22:01:25 -07: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 6b37d87497 Allow multiple endpoint PathMapper beans 
Update `WebEndpointDiscoverer` and related classes to that multiple
`PathMapper` beans can be registered. Mappers are now tried in order
until one returns a non-null value.

Closes gh-14841
 2018-10-15 18:25:42 -07:00
Phillip Webb a5dc004e0b Merge branch '2.0.x' 2018-10-15 15:43:31 -07:00
Phillip Webb cd1c2638e5 Polish 2018-10-15 15:42:15 -07:00
Andy Wilkinson 6765afa19b Upgrade to Spring Security 5.1.1.RELEASE 
Closes gh-14730
 2018-10-15 23:18:55 +01:00
Andy Wilkinson 9d5d81d36a Upgrade to Micrometer 1.1.0-rc1 
Closes gh-14809
 2018-10-15 23:12:08 +01:00
Phillip Webb f0f999a27d Merge branch '2.0.x' 2018-10-15 14:47:11 -07:00
Phillip Webb 5d219bcd19 Polish 2018-10-15 14:45:49 -07:00
Stephane Nicoll 31b0fc2368 Upgrade to Spring Integration 5.1.0.RC2 
Closes gh-14731
 2018-10-15 23:26:20 +02:00
Phillip Webb 765b54830b Merge branch '2.0.x' 2018-10-15 14:23:06 -07:00
Phillip Webb 734e9e4b74 Merge branch '2.0.x' 2018-10-15 14:22:44 -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 e901a0bd0e Merge branch '2.0.x' 2018-10-15 23:18:26 +02: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
Stephane Nicoll 7c6d61ee10 Update documentation to mention execution id of repackage goal 
This commit updates the documentation to reference the default execution
id of the `repackage` goal when a project uses
`spring-boot-starter-parent`.

Closes gh-14835
 2018-10-15 22:51:12 +02:00
Brian Clozel 2c3e8de959 Include "trace" info in whitelabel error views 
This commit shows the stacktrace information in default WhiteLabel error
views for Spring MVC and Spring WebFlux.

This information is only shown if it is present in the model map, which
depends on the `server.error.include-stacktrace` configuration property.

Closes gh-12838
 2018-10-15 22:22:36 +02:00
Andy Wilkinson a70aafd35a Upgrade to Reactor Bismuth-SR12 
Closes gh-14838
 2018-10-15 21:02:11 +01:00
Andy Wilkinson a9524d32ac Upgrade to Spring Integration 5.0.9.RELEASE 
Closes gh-14834
 2018-10-15 21:01:55 +01:00
Phillip Webb 3665917d44 Merge branch '2.0.x' 2018-10-15 11:32:09 -07:00
Phillip Webb c306e03112 Support '-' in endpoint names 
Update the `EndpointId` constraints to allow '-' in names.

Closes gh-14773
 2018-10-15 11:27:30 -07:00
Andy Wilkinson 1e2d5a1382 Auto-configure Micrometer's HumioMeterRegistry 
Closes gh-14804
 2018-10-15 18:10:35 +01:00
Phillip Webb 9a80e88a73 Merge branch '2.0.x' 2018-10-15 09:52:09 -07:00
Phillip Webb d8b9685635 Support '.' in endpoint names 
Update the `EndpointId` constraints to allow '.' in names.

Closes gh-14773
 2018-10-15 09:37:44 -07:00
Stephane Nicoll edf4045c3b Add missing tests for Kairos config adapter 
Closes gh-14821
 2018-10-15 17:55:07 +02:00
Stephane Nicoll ffe5e88d8e Merge branch '2.0.x' 2018-10-15 16:43:32 +02:00
Stephane Nicoll 99a45bdef8 Fix datasource prefix in multiple-datasource configuration doc 
Closes gh-13195
 2018-10-15 16:42:34 +02:00
Andy Wilkinson e53e8bf79f Merge branch '2.0.x' 2018-10-15 15:29:10 +01:00
Andy Wilkinson 0fedf8d2af Keep Liquibase-specific DataSource open for use by LiquibaseEndpoint 
Closes gh-13832
 2018-10-15 15:26:26 +01:00
Stephane Nicoll d4ec45e192 Fix javadoc generation 2018-10-15 15:12:52 +02:00
Andy Wilkinson a4eb636913 Merge branch '2.0.x' 2018-10-15 13:58:17 +01:00
Andy Wilkinson 6d98851fb5 Use Couchbase's DiagnosticsReport to determine its health 
Previously, Couchbase's health was determined by retrieving the bucket info
from the cluster info. This retrieval could take over one minute in some
cases even when Couchbase is health. This latency is too large for a health
check.

The Couchbase team have recommended the of a Cluster#diagnostics instead.
This provides a much lower latency view of the cluster's health. This
commit updates CouchbaseHealthIndicator to use Cluster#diagnostics while
retaining support, in a deprecated form, for the old info-based mechanism
should anyone want to opt back into that in 2.0.x.

Closes gh-14685
 2018-10-15 13:44:42 +01:00
Stephane Nicoll b7b9bf209e Upgrade to Spring Data Kay SR11 
Closes gh-14728
 2018-10-15 14:15:27 +02:00
Stephane Nicoll 89349c6eb9 Auto-configure KairosDB metrics 
Closes gh-14821
 2018-10-15 14:13:10 +02:00
Andy Wilkinson 267eff15f1 Merge branch '2.0.x' 2018-10-15 12:24:39 +01:00
Andy Wilkinson ab7c1af3ec Auto-configure SpringSecurityDialect for v5 and deprecate v4 
Closes gh-14828
 2018-10-15 12:18:40 +01:00
Andy Wilkinson a25e4a860c Upgrade to Thymeleaf Extras Spring Security 3.0.3.RELEASE 
Closes gh-14829
 2018-10-15 12:02:16 +01:00
Andy Wilkinson eaf38e9355 Upgrade to Spring Data Lovelace-SR1 
Closes gh-14729
 2018-10-15 11:46:27 +01:00
Stephane Nicoll 0fdf96da3b Upgrade to Spring Framework 5.0.10.RELEASE 
Closes gh-14722
 2018-10-15 11:26:16 +02:00
Brian Clozel d5236b91ce Polish 2018-10-15 10:59:38 +02:00
artsiom 9e5f171510 Support cachecontrol config property in WebFlux 
Closes gh-14724
 2018-10-15 10:59:38 +02:00
Stephane Nicoll 66af20f940 Upgrade to Spring Framework 5.0.10.RELEASE 
Closes gh-14722
 2018-10-15 10:51:14 +02:00