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

3972 Commits

Author SHA1 Message Date
Phillip Webb 683484e4a8 Fix primary beans with ApplicationContextAssert 
Update `ApplicationContextAssert.getBean` so that multiple beans are
supported as long as one of them is primary. This aligns better with
the way that the standard `ApplicationContext.getBean` method works.

Closes gh-14874
 2018-10-24 21:34:17 -07:00
Phillip Webb 62cb0f9593 Rename oauth2-oidc-client starter in dependencies 
Fixup dependencies POM following rename of the oauth2-oidc-client
starter.

See gh-14951
 2018-10-24 19:36:32 -07:00
Phillip Webb 69b0d37fe0 Rename oauth2-oidc-client starter 
Rename `spring-boot-starter-oauth2-oidc-client` to
`spring-boot-starter-oauth2-client`.

Closes gh-14951
 2018-10-24 18:08:44 -07:00
Phillip Webb 99e166516d Restore conversion service binary compatibility 
Change `ApplicationConversionService.getSharedInstance()` to again
return a `ConversionService` rather than `ApplicationConversionService`.

This restore binary compatibly with Spring Boot 2.0

Closes gh-14938
 2018-10-24 15:22:42 -07:00
Phillip Webb 2097b6a4c1 Improve ResourceUrlEncodingFilter conditions 
Update Thymeleaf and FreeMarker configurations to make use of the new
`@ConditionalOnMissingFilterBean` annotation.

Closes gh-14926
 2018-10-24 15:10:49 -07:00
Phillip Webb 44a46f1514 Add @ConditionalOnMissingFilterBean 
Add a new condition that can be used to check for servlet `Filter`
beans that are either registered directly, or via a
`FilterRegistrationBean`.

Closes gh-14940
 2018-10-24 15:10:49 -07:00
Phillip Webb 9f858e759c Support parameterizedContainer in bean conditions 
Add a `parameterizedContainer` attribute to `ConditionalOnBean` and
`ConditionalOnMissingBean` which can be used to support generic types
when checking for the presence of beans.

Closes gh-14940
 2018-10-24 15:10:49 -07:00
Phillip Webb 4d3d711e0e Migrate ConditionalOnMissingBeanTests to context runner 2018-10-24 15:10:49 -07:00
Phillip Webb 1bd1ffdb60 Polish 2018-10-24 15:10:49 -07:00
Madhura Bhave 34156b2137 Rename DatabaseDriver#SAP to DatabaseDriver#HANA 
Closes gh-14918
 2018-10-24 13:00:38 -07:00
dreis2211 4857b45ea5 Replace lambdas with method reference or call 
Closes gh-14937
 2018-10-24 10:12:36 +02:00
Madhura Bhave eb61b2bbde Merge branch '2.0.x' 2018-10-23 14:21:31 -07:00
Madhura Bhave 4322b9781b Polish 2018-10-23 14:21:06 -07:00
Madhura Bhave 5f24af6c3c Polish 
Closes gh-14915
 2018-10-23 13:51:13 -07:00
michal 7181e76135 Skip restarter for JUnit5 
See gh-14915
 2018-10-23 13:50:57 -07:00
Madhura Bhave 80bb7ea9d6 Merge branch '2.0.x' 2018-10-23 13:43:40 -07:00
Madhura Bhave bc58d4456f Rationalize DefaultRestartInitializerTests 
Closes gh-14927
 2018-10-23 13:43:11 -07:00
Brian Clozel 1651690d57 Fix tests after HandlerExceptionResolver logging changes 
See gh-14936
 2018-10-23 15:34:06 +02:00
Johnny Lim c3ac423fdd Use Commons Logging for PrometheusPushGatewayManager 
Closes gh-14910
 2018-10-22 21:58:00 -07:00
Madhura Bhave fd20618f4b Merge branch '2.0.x' 2018-10-22 21:55:01 -07:00
dreis2211 3fea487c7b Use Errors.hasErrors() in DefaultErrorAttributes 
Closes gh-14912
 2018-10-22 21:51:21 -07:00
Madhura Bhave 0dc4afdefd Merge branch '2.0.x' 2018-10-22 15:05:16 -07:00
Madhura Bhave d6991e6d91 Fix formatting violation 2018-10-22 15:02:31 -07:00
Madhura Bhave f0004c4ade Merge branch '2.0.x' 2018-10-22 14:57:10 -07:00
dreis2211 5c0d7f4ac0 Avoid creation of unnecessary collections 
Closes gh-14916
 2018-10-22 14:54:39 -07:00
Phillip Webb 31335bb50f Merge branch '2.0.x' 2018-10-22 14:35:03 -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 660b912100 Merge branch '2.0.x' 2018-10-19 18:21:55 +01: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 4e27d17b7e Starting building against Spring Session snapshots for Bean-RELEASE 
See gh-14733
 2018-10-19 17:50:07 +01:00
Andy Wilkinson 6b84fac8f6 Start building against Spring Kafka snapshots for 2.2.0.RELEASE 
See gh-14892
 2018-10-19 17:50:07 +01:00
Andy Wilkinson 21100d83ae Start building against Spring Integration snapshots for 5.1.0.RELEASE 
See gh-14889
 2018-10-19 17:50:07 +01:00
Andy Wilkinson e504c6b193 Start building against Spring Data snapshots for Lovelace-SR2 
See gh-14888
 2018-10-19 17:50:07 +01:00
Andy Wilkinson ad5f308f32 Start building against Spring Batch snapshots for 4.1.0.RELEASE 
See gh-14891
 2018-10-19 17:50:07 +01:00
Andy Wilkinson 4d9714a0cb Start building against Micrometer snapshots for 1.1.0 
See gh-14890
 2018-10-19 17:50:07 +01:00
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