Commit Graph

21208 Commits

Author SHA1 Message Date
Stephane Nicoll
20c8f61473 Merge branch '2.0.x' 2018-08-27 18:20:42 +02:00
Stephane Nicoll
352a6671e8 Merge pull request #14213 from dreis2211:collapse-identical-catch-blocks
* pr/14213:
  Collapse identical catch blocks
2018-08-27 18:20:29 +02:00
dreis2211
70add0617a Collapse identical catch blocks
Closes gh-14213
2018-08-27 18:18:06 +02:00
Stephane Nicoll
e1ebbcd720 Merge pull request #13795 from dsyer:gh-13490
* pr/13795:
  Make some nested private classes package private
2018-08-27 18:16:10 +02:00
Dave Syer
c7b7a1402a Make some nested private classes package private
Closes gh-13795
2018-08-27 18:15:53 +02:00
Stephane Nicoll
b298efc182 Merge pull request #13727 from dreis2211:polish-collectors
* pr/13727:
  Polish "Polish some Collectors"
  Polish some Collectors
2018-08-27 18:12:41 +02:00
Stephane Nicoll
d9c0dbb99d Polish "Polish some Collectors"
Closes gh-13727
2018-08-27 18:09:19 +02:00
dreis2211
422a436df1 Polish some Collectors
See gh-13727
2018-08-27 18:09:02 +02:00
Stephane Nicoll
10c3c0801b Merge pull request #14212 from izeye:polish-20180828
* pr/14212:
  Polish
2018-08-27 17:28:46 +02:00
Johnny Lim
cf17106d8d Polish
Closes gh-14212
2018-08-27 17:28:27 +02:00
Stephane Nicoll
a86d7cdb97 Add execution id to repackage goal
Closes gh-14210
2018-08-27 13:56:48 +02:00
Stephane Nicoll
f77651a795 Merge pull request #14202 from izeye:polish-20180826
* pr/14202:
  Polish
2018-08-26 10:48:25 +02:00
Johnny Lim
fe3fe0fa63 Polish
Closes gh-14202
2018-08-26 10:48:05 +02:00
Madhura Bhave
2a016a47e2 Merge pull request #14190 from ayudovin
* gh-14190:
  Polish "OIDC issuer uri in OAuth resource server config"
  Support OIDC issuer uri in OAuth resource server config
2018-08-24 14:59:18 -07:00
Madhura Bhave
cf31325e5d Polish "OIDC issuer uri in OAuth resource server config"
Closes gh-14190
2018-08-24 14:57:45 -07:00
artsiom
0c299bbc1f Support OIDC issuer uri in OAuth resource server config 2018-08-24 14:19:14 -07:00
Madhura Bhave
abf83e1e25 Merge pull request #13865 from mhyeon-lee
* gh-13865:
  Add user-info-authentication-method
2018-08-24 12:39:52 -07:00
mhyeon.lee
c827530f4b Add user-info-authentication-method
Closes gh-13865
2018-08-24 12:38:27 -07:00
Madhura Bhave
3f095c135b Merge pull request #14156 from ayudovin
* gh-14156:
  Polish "OAuth2 client secret should not be required"
  OAuth2 client secret property should not be required
2018-08-24 12:24:53 -07:00
Madhura Bhave
d07e2fa0b2 Polish "OAuth2 client secret should not be required"
Closes gh-14156
2018-08-24 12:23:41 -07:00
artsiom
6be4307712 OAuth2 client secret property should not be required 2018-08-24 12:20:43 -07:00
Madhura Bhave
caf7221485 Update OAuth2 config following changes in Spring Security DSL
Closes gh-14169
2018-08-24 12:15:35 -07:00
Stephane Nicoll
dea67e9aca Merge branch '2.0.x' 2018-08-24 18:05:18 +02:00
Stephane Nicoll
af426e383f Review slice documentation to clarify the scope and alternative options
Closes gh-13810
2018-08-24 18:05:05 +02:00
Stephane Nicoll
876def3693 Merge branch '2.0.x' 2018-08-24 17:08:45 +02:00
Stephane Nicoll
f53e6c701f Improve actuator documentation about the types supported for endpoints
Closes gh-13896
2018-08-24 17:08:29 +02:00
Stephane Nicoll
086fec09ef Merge branch '2.0.x' 2018-08-24 16:41:13 +02:00
Stephane Nicoll
f5482a33a3 Document custom DispatcherServlet requirement
Closes gh-14145
2018-08-24 16:38:24 +02:00
Stephane Nicoll
7eecfe3108 Polish
See gh-14184
2018-08-24 11:50:18 +02:00
Stephane Nicoll
82280e34c7 Merge branch '2.0.x' 2018-08-24 11:49:30 +02:00
Stephane Nicoll
9e5395f0a1 Merge pull request #14184 from izeye:polish-20180823-2nd
* pr/14184:
  Polish
2018-08-24 11:49:17 +02:00
Johnny Lim
fb71174c24 Polish
Closes gh-14184
2018-08-24 11:48:41 +02:00
Stephane Nicoll
833e39eeb6 Let Hibernate configure the transaction manager on WebSphere
Closes gh-8926
2018-08-24 10:48:20 +02:00
Madhura Bhave
fc4340c5d4 Rename OAuth2 resource server properties
Closes gh-14165
2018-08-23 16:51:27 -07:00
Stephane Nicoll
26353a8f35 Port test to use ehcache3
Hibernate 5.3 has deprecated the ehcache2 region factory so this commit
upgrades the integration test to use JCache instead.
2018-08-23 17:07:52 +02:00
Brian Clozel
0881b7c390 Revert "Consider only current context in WebFlux setup"
This reverts commit da4624a882.
2018-08-23 16:50:48 +02:00
Stephane Nicoll
03d6cd9f0b Merge branch '2.0.x' 2018-08-23 16:16:25 +02:00
Stephane Nicoll
be00c1db63 Fix dependency between cache and hibernate
This commit fixes the ordering between `CacheAutoConfiguration` and
`HibernateJpaAutoConfiguration` so that the auto-configured
`CacheManager` is configured before Hibernate starts.

Closes gh-14181
2018-08-23 16:15:42 +02:00
Brian Clozel
da4624a882 Consider only current context in WebFlux setup
This commit introduces a subclass of `DispatcherHandler` that only
considers the current context when looking for WebFlux infrastructure
beans.

This avoids issues where a child context (e.g. with Actuator) picks up
infrastructure beans from the parent context and exposes all endpoints
instead of getting only the ones from the current context.

Closes gh-14012
2018-08-23 15:35:34 +02:00
Stephane Nicoll
8fcd3fcd4c Fix javadoc generation on Java10+ 2018-08-23 14:49:56 +02:00
Stephane Nicoll
429cd8d114 Optimize use of Jackson ObjectMapper instances
Closes gh-1789
2018-08-23 14:09:48 +02:00
Stephane Nicoll
60eace17d4 Merge pull request #14172 from izeye:polish-20180823
* pr/14172:
  Polish
2018-08-23 11:42:48 +02:00
Johnny Lim
9602a32a8d Polish
Closes gh-14172
2018-08-23 11:40:44 +02:00
Stephane Nicoll
1b7f713487 Merge branch '2.0.x' 2018-08-23 11:34:49 +02:00
Stephane Nicoll
5e7be50265 Restore trace request param behaviour with error controller
This commits restores the behaviour of Spring Boot 1.x with regards to
the "trace" request param used to add the stacktrace to the model.

This was inadvertently changed so that the stacktrace would be added
if the parameter wasn't set.

Closes gh-14171
2018-08-23 11:34:16 +02:00
Brian Clozel
53f3982748 Support Jetty RS as HTTP driver for WebClient
This commit adds a new auto-configuration choice for
`ClientHttpConnector`, this time using the Jetty RS HTTP client library
if available.

This is the best choice in case the application runs on a Jetty reactive
server, as both client and server will share resources.

Closes gh-14005
2018-08-23 10:51:43 +02:00
Sebastien Deleuze
f74dd7d58c Manage dependency for Jetty RS HTTP client
This commit adds the Jetty RS HTTP client to the Spring Boot
dependency management. As of SPR-15092 and SPR-17124, this HTTP
client library is supported by Spring Framework.

This commit is first step towards supporting that library as
a driver for the WebClient / ClientHttpConnector auto-configuration.

See gh-14005
2018-08-23 10:37:58 +02:00
Stephane Nicoll
1bbe3afdec Merge branch '2.0.x' 2018-08-23 10:27:47 +02:00
Stephane Nicoll
9938d1f4b6 Order IntegrationAutoConfiguration properly
This commit makes sure that the auto-configuration for Spring
Integration runs after the datasource has been auto-configured if
necessary as there is an optional part that can initialize the jdbc
schema.

Closes gh-14175
2018-08-23 10:27:25 +02:00
Brian Clozel
e2a7594246 Configure Reactor HTTP client resources
This commit adds support for the new `ReactorResourceFactory` and
ensures that such a bean is created and destroyed with the application
context. This will create a `ClientHttpConnector` bean, to be configured
on the `WebClient.Builder` instance - or let developers create their own
`ClientHttpConnector` bean to override that opinion.

By default, the `ReactorResourceFactory` is configured to participate
with the global resources, for better efficiency.

Closes gh-14058
2018-08-22 19:14:34 +02:00