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

3456 Commits

Author SHA1 Message Date
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
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
Stephane Nicoll 6d4bab911c Polish "Add Kafka Streams auto-configuration" 
Closes gh-14021
 2018-08-22 16:08:25 +02:00
Gary Russell a7acbbd625 Add Kafka Streams auto-configuration 
See gh-14021
 2018-08-22 15:41:42 +02:00
Stephane Nicoll 597fe237b5 Polish "Add PropertyMapper.from(value)" 
Closes gh-13837
 2018-08-22 15:40:36 +02:00
Dmytro Nosan 1bd52bc432 Add PropertyMapper.from(value) 
See gh-13837
 2018-08-22 15:27:00 +02:00
Stephane Nicoll dd9209c7d9 Merge branch '2.0.x' 2018-08-22 10:48:35 +02:00
Stephane Nicoll 000cb94323 Polish "Fix String concatenation in a loop" 
Closes gh-14153
 2018-08-22 10:47:05 +02:00
Hiroaki Yoshida 43acc37587 Fix String concatenation in a loop 
See gh-14153
 2018-08-22 10:46:14 +02:00
Johnny Lim c95b339f02 Polish 
Closes gh-14149
 2018-08-22 10:38:00 +02:00
Madhura Bhave 84901fa58e OnClassCondition report should only include relevant condition 
Closes gh-11086
 2018-08-21 18:59:34 -07:00
Madhura Bhave b03f8e4a4a Merge branch '2.0.x' 2018-08-21 12:56:27 -07:00
Madhura Bhave 55406d91d2 Consider dash & underscore when equating indexed elements 
Fixes gh-14136
 2018-08-21 12:53:25 -07:00
Stephane Nicoll fe81db59bb Merge branch '2.0.x' 2018-08-21 17:48:04 +02:00
Stephane Nicoll 3d7d1e070f Upgrade to Neo4j Ogm 3.1.2 
Closes gh-14164
 2018-08-21 17:43:47 +02:00
Brian Clozel 551689c38b Switch back to Spring Framework 5.1.0 SNAPSHOTs 2018-08-21 16:40:47 +02:00
Stephane Nicoll df6e2170a7 Polish 2018-08-21 10:09:50 +02:00
Stephane Nicoll 456f5ce2f4 Merge branch '2.0.x' 2018-08-21 10:03:12 +02:00
Hiroaki Yoshida 6e86ba12b7 Fix potential infinite recursive loop in toString 
Closes gh-14152
 2018-08-21 10:02:10 +02:00
Stephane Nicoll f5d922c712 Upgrade to Spring Integration 5.1.0.M2 
Upgrade to M2 broke a test that was looking for a particular bean that
is configured by Spring Integration (`HeaderChannelRegistry`).

It looks like INT-4517 is related to the regression as it registers the
bean too late for the auto-configuration to see it.

This commit changes the condition to a more central bean that is created
very early on.

Closes gh-14142
 2018-08-21 09:56:19 +02:00
Stephane Nicoll 4dc8b71200 Upgrade to Spring Security 5.1.0.RC1 
Closes gh-14144
 2018-08-21 09:54:34 +02:00
Stephane Nicoll 16374599d6 Upgrade to Spring Session Bean-M2 
Closes gh-14123
 2018-08-21 09:54:33 +02:00
Stephane Nicoll 579bed48a9 Upgrade to Spring Kafka 2.2.0.M2 
Closes gh-14143
 2018-08-21 09:02:32 +02:00
Stephane Nicoll 3085647024 Upgrade to Spring Amqp 2.1.0.M2 
Closes gh-14155
 2018-08-21 08:59:34 +02:00
Stephane Nicoll b60fbe5a1f Merge branch '2.0.x' 2018-08-20 17:00:36 +02:00
Stephane Nicoll b0d388830f Polish test 2018-08-20 17:00:21 +02:00
Stephane Nicoll c00dbc6c2f Fix merge commit 2018-08-20 15:04:08 +02:00
Stephane Nicoll d9a42a5165 Merge branch '2.0.x' 2018-08-20 15:03:24 +02:00
Stephane Nicoll e03f01564a Deprecate EntityManagerFactoryBeanCallback 
Closes gh-14083
 2018-08-20 14:54:32 +02:00
Stephane Nicoll f804d5ce4c Upgrade to Spring Data Lovelace RC2 
Closes gh-14081
 2018-08-20 11:29:51 +02:00
Stephane Nicoll e95661876c Merge branch '2.0.x' 2018-08-20 11:23:39 +02:00
Stephane Nicoll e034b383db Fix checkstyle violation 
Closes gh-14125
 2018-08-20 11:19:01 +02:00
Stephane Nicoll 91af9e2ca9 Merge branch '2.0.x' 2018-08-20 10:34:03 +02:00
Stephane Nicoll d80ed27339 Fix checkstyle violation 2018-08-20 10:33:46 +02:00
Stephane Nicoll b26dedb547 Merge branch '2.0.x' 2018-08-20 10:26:21 +02:00
Stephane Nicoll eedeaa29e5 Polish "Replace loops with Arrays.setAll where possible" 
Closes gh-14125
 2018-08-20 10:23:16 +02:00
dreis2211 0bc66dc4a9 Replace loops with Arrays.setAll where possible 
See gh-14125
 2018-08-20 10:16:50 +02:00
Marcel Overdijk b80f57f336 Fix typo 
Closes gh-14138
 2018-08-20 09:48:47 +02:00
dreis2211 a601bc863b Remove unused method in TypeUtils 
Closes gh-14130
 2018-08-19 15:39:39 +02:00
Stephane Nicoll 3ad3cfd7e2 Polish dependency management for OIDC starter 
See gh-13830
 2018-08-19 15:28:54 +02:00
Stephane Nicoll 70fe276d53 Merge branch '2.0.x' 2018-08-19 15:16:42 +02:00
Gerrit Meier 7e570acf07 Upgrade to Neo4j Ogm 3.1.1 
Closes gh-14132
 2018-08-19 15:14:45 +02:00
Vedran Pavic 644ab5f3e4 Align SessionsEndpoint with Spring Session API improvements 
This commit aligns SessionsEndpoint with
FindByIndexNameSessionRepository API improvements that simplifies
retrieval of sessions by principal name.

Closes gh-14124
 2018-08-18 11:27:35 +02:00
Vedran Pavic 94d45c7361 Start building against Spring Session Bean M2 snapshots 
See gh-14123
 2018-08-18 11:25:38 +02:00
Madhura Bhave f6f9f27189 Merge branch '2.0.x' 2018-08-17 16:04:43 -07:00
Madhura Bhave f7135ff18f Use ResolverStyle.SMART when a custom format is specified 
Fixes gh-13970
 2018-08-17 16:01:10 -07:00
Madhura Bhave 09e09bf430 Add starter for OpenID Connect/OAuth2 client 
Closes gh-13830
 2018-08-17 13:03:55 -07:00
artsiom 1c224e5fbb Add WebFluxRegistrations for custom WebFlux beans 
This commit adds a new `WebFluxRegistrations` interface that
allows developers to register custom instances of key WebFlux
infrastructure components, such as `RequestMappingHandlerMapping`
and `RequestMappingHandlerAdapter`.

Closes gh-13997
 2018-08-17 16:59:41 +02:00
Stephane Nicoll ba2f2a3727 Polish jaxb setup for JDK 9 and further 2018-08-17 16:17:00 +02:00
Brian Clozel 6ecbd8d21b Auto-Configure FormContentFilter in Spring MVC 
Because `HttpPutFormContentFilter` has been deprecated in Spring
Framework 5.1, this commit updates the auto-configuration to replace it
with the new `FormContentFilter`. This new filter is building on the
previous one and supports HTTP DELETE requests as well.

Both filters should not be used in addition, so the former
configuration has been removed. This commit also adds configuration
metadata to let developers know about the configuration key change.

Closes: gh-13363
 2018-08-17 15:25:14 +02:00
Stephane Nicoll 4fdb50417d Disable Groovy scripts for doc generation on Java11 
See gh-14028
 2018-08-17 15:16:07 +02:00
Stephane Nicoll d1ac774af2 Configure build to be compatible with Java 11 
See gh-14028
 2018-08-17 15:16:02 +02:00
Stephane Nicoll 930c838da9 Remove Narayana support 
The Spring Boot integration is now handled by the Narayana project
itself at https://github.com/snowdrop/narayana-spring-boot

This commit removes our support.

Closes gh-12026
 2018-08-17 15:08:55 +02:00
Stephane Nicoll 598f630b8c Upgrade to Hibernate 5.3.5.Final 
Closes gh-14120
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 4e92d590ad Upgrade to Rest Assured 3.1.1 
Closes gh-14119
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 0643d0a5d7 Upgrade to Rxjava2 2.2.0 
Closes gh-14118
 2018-08-17 13:53:04 +02:00
Stephane Nicoll d9a95df159 Upgrade to Xmlunit2 2.6.1 
Closes gh-14117
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 29ee712a7c Upgrade to Selenium 3.14.0 
Closes gh-14116
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 143f94aeb6 Upgrade to Selenium Htmlunit 2.32.1 
Closes gh-14115
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 9b4a8e784e Upgrade to Lombok 1.18.2 
Closes gh-14114
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 837d4d97da Upgrade to Pooled Jms Version 1.0.3 
Closes gh-14113
 2018-08-17 13:53:04 +02:00
Stephane Nicoll b20611633b Upgrade to Junit Jupiter 5.3.0-RC1 
Closes gh-14112
 2018-08-17 13:53:04 +02:00
Stephane Nicoll c399c73ee4 Upgrade to Jooq 3.11.4 
Closes gh-14111
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 65528a1781 Upgrade to Kotlin 1.2.60 
Closes gh-14110
 2018-08-17 13:53:04 +02:00
Stephane Nicoll bbda4480a9 Upgrade to Influxdb Java 2.12 
Closes gh-14109
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 409b684ecd Upgrade to Elasticsearch 6.3.2 
Closes gh-14108
 2018-08-17 13:53:04 +02:00
Stephane Nicoll ad33822df7 Upgrade to Groovy 2.5.2 
Closes gh-14107
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 7454989c8e Upgrade to Log4j2 2.11.1 
Closes gh-14106
 2018-08-17 13:53:04 +02:00
Stephane Nicoll ddfb157717 Upgrade to Htmlunit 2.32 
Closes gh-14105
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 5cb2c8ed4b Upgrade to Byte Buddy 1.8.17 
Closes gh-14104
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 906b04e993 Upgrade to Mysql 8.0.12 
Closes gh-14103
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 023a001ca5 Upgrade to Undertow 2.0.13.Final 
Closes gh-14102
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 4485466fe4 Upgrade to Netty Tcnative 2.0.13.Final 
Closes gh-14101
 2018-08-17 13:53:04 +02:00
Stephane Nicoll 08bc604158 Upgrade to Hazelcast 3.10.4 
Closes gh-14100
 2018-08-17 13:53:04 +02:00
Stephane Nicoll cf8fb949ef Upgrade to Couchbase Client 2.6.1 
Closes gh-14099
 2018-08-17 13:53:04 +02:00
Brian Clozel 5e836b1231 Merge branch '2.0.x' 2018-08-17 13:41:36 +02:00
artsiom 51fd27fad4 Configure HiddenHttpMethodFilter for Spring WebFlux 
Closes gh-14008
 2018-08-17 13:40:43 +02:00
Stephane Nicoll 82e3a6a1a4 Polish 2018-08-17 13:29:07 +02:00
Brian Clozel 8c1df92566 Align with DispatcherServlet changes 
The `shouldHandleFailure` configuration option has been removed from
`DispatcherServlet`.

See gh-13511
 2018-08-17 13:24:00 +02:00
Stephane Nicoll f30453dc52 Upgrade to Spring Framework 5.1.0.RC2 
Closes gh-14038
 2018-08-17 11:49:43 +02:00
Stephane Nicoll 5cdff9bce6 Merge branch '2.0.x' 2018-08-17 11:49:04 +02:00
Stephane Nicoll 22bc2bd7ba Upgrade to Httpasyncclient 4.1.4 
Closes gh-14098
 2018-08-17 11:34:43 +02:00
Stephane Nicoll 412ff051e3 Upgrade to Derby 10.14.2.0 
Closes gh-14097
 2018-08-17 11:34:43 +02:00
Stephane Nicoll b1805f4d37 Upgrade to Activemq 5.15.5 
Closes gh-14096
 2018-08-17 11:34:42 +02:00
Stephane Nicoll bffc542409 Upgrade to Jest 5.3.4 
Closes gh-14095
 2018-08-17 11:34:41 +02:00
Stephane Nicoll 05dfdfad1d Upgrade to Rxjava2 2.1.17 
Closes gh-14094
 2018-08-17 11:34:41 +02:00
Stephane Nicoll 83ee7fc934 Upgrade to Netty 4.1.28.Final 
Closes gh-14093
 2018-08-17 11:34:40 +02:00
Stephane Nicoll 8c29586699 Upgrade to Lettuce 5.0.5.RELEASE 
Closes gh-14092
 2018-08-17 11:34:40 +02:00
Stephane Nicoll a303109d93 Upgrade to Unboundid Ldapsdk 4.0.7 
Closes gh-14091
 2018-08-17 11:34:39 +02:00
artsiom d22c3e2787 Add property to disable HiddenHttpMethodFilter 
Closes gh-14030
 2018-08-17 10:29:06 +02:00
Stephane Nicoll 4bc5535c37 Rework "Remove redundant spring-boot-starter dependency" 
This commit reworks 40d8726 as it has introduced an unfortunate side
effect for those who are using a starter with optional starter
dependencies.

`spring-boot-starter-web` defines the json and the tomcat starter. The
latter is part of a set of starters that do not bring the base starter
and the former can be excluded to use gson rather than jackson.

When such arrangement happens, spring-boot-starter-web no longer defines
the base starter (and therefore doesn't bring the core dependencies
that Spring Boot needs to bootstrap).

This commit reviews the starters that define optional starters and
reintroduce the base starter.

Closes gh-14076
 2018-08-17 10:28:36 +02:00
Madhura Bhave d724f154f4 Merge branch '2.0.x' 2018-08-16 15:45:20 -07:00
Madhura Bhave b93c2b9a9f Allow actuator endpoints to be used with mvcMatchers 
This commit changes AbstractWebMvcEndpointHandlerMapping to
be a MatchableHandlerMapping. Additionally, EndpointRequest,
now delegates to MvcRequestMatcher for Spring MVC applications.

For all other applications, AntPathRequestMatcher is used as
a delegate.

Closes gh-13962
 2018-08-16 15:41:02 -07:00
Andy Wilkinson 90608fa40e Align test with changes made in ab1f5931 
See gh-13511
 2018-08-16 20:47:08 +01:00
Andy Wilkinson 30ee481c98 Do not block in DSInitializedPublisher when EMF is using async bootstrap 
Previously, we would retrieve the EntityManagerFactory’s DataSource as
soon as it was being post-processed. When the native
EntityManagerFactory is being bootstrapped asynchronously, this
retrieval would block until bootstrapping had completed. This negated
some of the benefits of asynchronous bootstrapping.

This commit updates DataSourceInitializedPublisher so that it only
accesses the EntityManagerFactory’s DataSource once its bootstrapping
has completed. This is achieved using a decorated JpaVendorAdapter
that is called one the boostrapping has completed.

Closes gh-14061
 2018-08-16 20:01:24 +01:00
Andy Wilkinson f28528a527 Allow Data JPA's bootstrap mode to be configured via the environment 
In Spring Data Lovelace, repositories' bootstrap mode can be
configured via @EnableJpaRepositories. This commit adds support for
configuring the mode via the environment rather than having to use
the annotation. Additionally, when deferred or lazy bootstrapping is
being used, the LocalContainerEntityManagerFactoryBean is configured
to use a bootstrap executor. This allows JPA's initialization to be
performed on a separate thread, allowing the rest of application
context initialization to proceed in parallel.

Closes gh-13833
 2018-08-16 20:01:24 +01:00
Brian Clozel ab1f5931a0 Disable DispatcherServlet shouldHandleFailure 
This change broke a Spring Security sample, reverting it.

See gh-13511
 2018-08-16 20:14:01 +02:00
Brian Clozel f2511b7fa3 Improve Web DEBUG logging output configuration 
Since SPR-16946, Spring Framework revisited the DEBUG logging output
developers get while working on Spring MVC and Spring WebFlux
applications.

This commit aligns to those changes where DEBUG output was produced
in Spring Boot (especially in `DefaultErrorWebExceptionHandler`).

This also enables DEBUG logging on the related packages when running an
application with Spring Boot Developer Tools, providing a better
development experience.

This is also adding the new `spring.insights.web.log-request-details`
configuration property, which logs additional information about the
incoming requests at the DEBUG and TRACE levels. Since that information
can be sensitive (e.g. credentials, tokens, etc.), this property is not
enabled by default nor activated by the Developer Tools.

Closes: gh-13511
 2018-08-16 18:19:38 +02:00
Andy Wilkinson 98b9a57252 Start building against Spring Data Lovelace RC2 snapshots 
See gh-14081
 2018-08-16 16:33:55 +01:00
Stephane Nicoll 8ffd44077d Upgrade to gmavenplus-plugin 1.6.1 2018-08-16 17:25:28 +02:00
Stephane Nicoll 8f2ab952f5 Polish javadoc formatting 2018-08-16 17:19:25 +02:00
Stephane Nicoll 16331616dc Merge branch '2.0.x' 2018-08-16 16:31:57 +02:00
Stephane Nicoll 376ef83dc0 Merge branch '1.5.x' into 2.0.x 2018-08-16 16:31:39 +02:00
Stephane Nicoll de470540ea Add auto-configuration support for TaskScheduler 
This commit adds support for providing a default ThreadPoolTaskScheduler
with sensible defaults. A new TaskSchedulerBuilder is provided with
defaults from the `spring.task.scheduler.*` namespace and can be used
to create custom instances.

If no custom `TaskScheduler` bean is present, `@EnableScheduling` now
uses the auto-configured task scheduler.

Closes gh-1397
 2018-08-16 14:55:57 +02:00
Stephane Nicoll dcd80c087e Harmonize task execution naming 2018-08-16 14:55:57 +02:00
Andy Wilkinson bb8dd25d24 Polish "Stop Elasticsearch REST client from pulling in commons-logging" 
Closes gh-14004
 2018-08-16 12:16:52 +01:00
Filip Procházka 7c43c89e11 Stop Elasticsearch REST client from pulling in commons-logging 
See gh-14004
 2018-08-16 12:16:31 +01:00
Andy Wilkinson 075a745e32 Polish "Allow properties to be configured using slice test annotations" 
Closes gh-14052
 2018-08-16 11:27:49 +01:00
artsiom 0cf1749e85 Allow properties to be configured using slice test annotations 
See gh-14052
 2018-08-16 11:27:49 +01:00
Andy Wilkinson 971caad6f8 Merge branch '2.0.x' 2018-08-16 10:19:05 +01:00
Andy Wilkinson 3e093035b4 Merge branch '1.5.x' into 2.0.x 2018-08-16 10:18:52 +01:00
Stephane Nicoll 91e3856947 Polish 2018-08-16 10:52:09 +02:00
Andy Wilkinson f10377bdb7 Polish "Add support for multiple REST Docs configuration customizers" 
Closes gh-13498
 2018-08-16 09:48:03 +01:00
Eddú Meléndez 4d310f0d5a Add support for multiple REST Docs configuration customizers 
This commit introduces support for multiple configuration customizers
for REST Docs with MockMvc, WebTestClient, and REST Assured.

Closes gh-13498
 2018-08-16 09:48:03 +01:00
Stephane Nicoll 6ac6d36395 Polish 2018-08-16 10:43:28 +02:00
Jan Groot 40d8726d47 Remove redundant spring-boot-starter dependencies from starters 
Closes gh-14078
 2018-08-16 09:30:54 +01:00
Brian Clozel 31a93035c1 Remove workaround for Netty resources cleanup 
Closes gh-9146
 2018-08-16 10:27:55 +02:00
Stephane Nicoll 9201db3200 Upgrade to Reactor Californium-M2 
Closes gh-14077
 2018-08-16 09:32:35 +02:00
Madhura Bhave 64f9d33956 Merge branch '2.0.x' 2018-08-15 16:58:21 -07:00
Johnny Lim 5f3f1a1f11 Polish 
Closes gh-14067
 2018-08-15 16:54:46 -07:00
Stephane Nicoll 5ae4b43877 Upgrade to Assertj 3.11.0 
Closes gh-14073
 2018-08-15 19:30:43 +02:00
Stephane Nicoll 4a68e2e4a1 Merge branch '2.0.x' 2018-08-15 15:00:17 +03:00
Stephane Nicoll ca4ca15ef2 Restore Jade Templates starter as it is compatible with Spring Boot 2 2018-08-15 14:44:48 +03:00
Stephane Nicoll c00fc6449b Merge branch '2.0.x' 2018-08-15 14:37:40 +03:00
dreis2211 59d911d6e0 Remove @UsesUnsafeJava annotations 
Closes gh-14072
 2018-08-15 14:36:51 +03:00
Johnny Lim d5eaaf6e2a Polish 
Closes gh-14049
 2018-08-15 10:43:46 +03:00
Stephane Nicoll d0f272960e Merge branch '2.0.x' 2018-08-15 10:43:28 +03:00
Johnny Lim b4abccc07c Polish 
See gh-14049
 2018-08-15 10:43:04 +03:00
Madhura Bhave baaf8c95ff Polish "Update OIDC configuration" 
Closes gh-14065
 2018-08-14 15:31:29 -07:00
Josh Cummings e34723efd2 Update OIDC config following Spring Security changes 
The location changed for the class that provides a ClientRegistration
via an issuer URL, and this updates Spring Boot accordingly.
 2018-08-14 15:31:29 -07:00
Spencer Gibb 8427341480 Exclude protobuf-java from mysql-connector-java 
Closes gh-14062
 2018-08-14 20:01:07 +01:00
Madhura Bhave a8a75f1bbb Merge branch '2.0.x' 2018-08-14 11:25:24 -07:00
Madhura Bhave 895d092640 PropertySourcesLoader with highest precedence should win 
Fixes gh-13955
 2018-08-14 11:23:55 -07:00
Andy Wilkinson e3e3a44045 Merge branch '2.0.x' 2018-08-14 12:33:11 +01:00
Andy Wilkinson 1973e342c9 Do not use lambda for task action as it breaks up-to-date checks 
Due to gradle/gradle#5510, using a lambda for a task action breaks
up-to-date checks in certain circumstances.

This commit updates JavaPluginAction to use an inner-class in place
of a lambda for the action that it adds to JavaCompile tasks. A test
has not been added as it does not appear to be possible to reproduce
it with a TestKit-based test.

Closes gh-14054
 2018-08-14 12:32:36 +01:00
Stephane Nicoll f187ab72a4 Polish 2018-08-14 11:00:20 +03:00
Andy Wilkinson 9032e5b470 Update SSL tests and certs for Java 11 and TLSv1.3 
See gh-14028
 2018-08-14 08:51:38 +03:00
Stephane Nicoll 10fe9ba0d9 Merge branch '2.0.x' 2018-08-14 08:49:45 +03:00
Stephane Nicoll da1858f620 Upgrade to Hibernate Validator 6.0.12.Final 
Closes gh-14053
 2018-08-14 08:48:16 +03:00
Madhura Bhave 727e9c6b0f Merge branch '2.0.x' 2018-08-13 12:23:48 -07:00
Madhura Bhave dfb97eb0f5 Convert environment if webApplicationType changes 
If the web application type is set via properties,
it is available only after binding. The environment needs
to be converted to the appropriate type if it does not match.
If a custom environment is set, it is not converted.

Fixes gh-13977
 2018-08-13 12:12:30 -07:00
Andy Wilkinson 04215e6651 Polish 2018-08-13 15:59:48 +01:00
Stephane Nicoll e7b5d95681 Adapt ServerProperties with a default size to DataSize 
See gh-13974
 2018-08-13 16:43:23 +03:00
Stephane Nicoll 6734e11222 Adapt MultipartConfig to use DataSize support 
See gh-13974
 2018-08-13 16:43:23 +03:00
Stephane Nicoll 94013aaba6 Add support for DataSize 
This commit adds support for Spring Framework's `DataSize` allowing to
express a size in bytes and other convenient units.

Similar to the `Duration` support introduced previously, this commit
adds transparent binding support as well as detection of default values
in `@ConfigurationProperties`-annotated object.

Closes gh-13974
 2018-08-13 16:43:23 +03:00
Andy Wilkinson 78dd7bd934 Merge branch '2.0.x' 2018-08-13 13:18:55 +01:00
Andy Wilkinson 6e5ff77bb0 Merge branch '1.5.x' into 2.0.x 
The 3.0.1 version of the Maven Javadoc Plugin contains a bug [1] that
means that a link URL must redirect otherwise it is ignored.

[1] https://issues.apache.org/jira/browse/MJAVADOC-532
 2018-08-13 13:16:50 +01:00
Andy Wilkinson 76d9b1cdbd Merge branch '2.0.x' 2018-08-13 12:30:10 +01:00
Andy Wilkinson 58aaf4863f Merge pull request #14032 from Nikolay Rybak 
* gh-14032:
  Propagate retryWrites flag from connection URI to ReactiveMongoClient
 2018-08-13 12:30:00 +01:00
Nikolay Rybak 7759dcd9df Propagate retryWrites flag from connection URI to ReactiveMongoClient 
Closes gh-14032
 2018-08-13 12:10:47 +01:00
Andy Wilkinson e41519b6b1 Merge branch '2.0.x' 2018-08-13 11:38:56 +01:00
Andy Wilkinson 29e38f4af8 Merge branch '1.5.x' into 2.0.x 2018-08-13 11:35:46 +01:00
dreis2211 c9bdc98935 Add missing @Override 
Closes gh-14043
 2018-08-13 13:14:02 +03:00
Stephane Nicoll eede660b84 Merge branch '2.0.x' 2018-08-13 13:11:08 +03:00
Stephane Nicoll f4b0101632 Merge branch '1.5.x' into 2.0.x 2018-08-13 13:10:05 +03:00
Andy Wilkinson da550efc6b Merge branch '2.0.x' 2018-08-10 12:50:31 +01:00
Andy Wilkinson 263e157ef0 Merge branch '1.5.x' into 2.0.x 2018-08-10 12:50:15 +01:00
Stephane Nicoll bfd616ac7a Prevent JavaFX to be added to the classpath with Java 11 
See https://hibernate.atlassian.net/browse/HV-1644
 2018-08-10 13:46:39 +02:00
Stephane Nicoll 0d04d7adf8 Migrate @EventListener to ApplicationListener 
Closes gh-14041
 2018-08-10 12:52:14 +02:00
Stephane Nicoll 9d40df9a2a Upgrade to Mockito 2.21.0 
Closes gh-14039
 2018-08-10 09:55:09 +02:00
Stephane Nicoll ca8bdc8a72 Resume building against Spring Framework snapshots 
See gh-14038
 2018-08-10 09:53:10 +02:00
Stephane Nicoll 817a8a8302 Polish 2018-08-10 09:48:57 +02:00
Stephane Nicoll 0ca8f1083a Fix ClassCastException message detection on Java 11 
This commit also fixes the detection of a ClassCastException that can
be safely ignored on the module path with Java 9

Closes gh-14033
 2018-08-10 09:48:22 +02:00
Stephane Nicoll 295995829f Remove outdated Java10 profile 2018-08-09 13:33:03 +02:00
Andy Wilkinson 2756d87b3f Merge branch '2.0.x' 2018-08-09 11:15:13 +01:00
Andy Wilkinson 27f5e46587 Polish "Fix NPE in FlywayEndpoint when migration.installedOn is null" 
Closes gh-14019
 2018-08-09 11:10:21 +01:00
artsiom 83fbdc6ea8 Fix NPE in FlywayEndpoint when migration.installedOn is null 
See gh-14019
 2018-08-09 11:10:02 +01:00
Johnny Lim b90113ac33 Align server.tomcat.max-swallow-size with Tomcat's default value 
Closes gh-14025
 2018-08-09 09:56:23 +02:00
Johnny Lim 05a7d21305 Polish ItemMetadata.buildName() 
Closes gh-14024
 2018-08-09 09:47:02 +02:00
Johnny Lim 101cc59b7d Polish 
Closes gh-14023
 2018-08-09 09:32:10 +02:00
Stephane Nicoll a12ca0a0dc Merge branch '2.0.x' 2018-08-08 16:05:34 +02:00
Stephane Nicoll a023bd030a Add configurable timeout for Couchbase health indicator 
This commit makes sure to use a configurable timeout to check if the
Couchbase cluster is up, rather than relying on the default that can be
quite long.

Closes gh-13879
 2018-08-08 16:01:58 +02:00
Stephane Nicoll 7b191bb9ed Merge branch '2.0.x' 2018-08-08 14:47:16 +02:00
Stephane Nicoll 21691f0b20 Merge branch '1.5.x' into 2.0.x 2018-08-08 14:46:55 +02:00
Stephane Nicoll 13d5b00fe7 Merge branch '2.0.x' 2018-08-08 11:13:15 +02:00
Stephane Nicoll fbf3c48bf8 Fix setter detection in `configprops` endpoint 
Previously, the setter of a property whose second letter is upper-case (
such as `oAuth2Uri`) was not detected properly. The JavaBean spec states
that, in such a case, the first letter should not be capitalized (i.e.
the setter should be `setoAuth2Uri` rather than `setOAuth2Uri`).

This commit makes sure that Jackson uses standard bean names and fixes
the setter detection algorithm to take this case into account.

Closes gh-13878
 2018-08-08 11:13:03 +02:00
Stephane Nicoll a96856c99a Merge branch '2.0.x' 2018-08-08 09:54:07 +02:00
dreis2211 72707b9d58 Polish OnWebApplicationCondition 
Closes gh-14015
 2018-08-08 09:51:51 +02:00
Stephane Nicoll cc79cbd09f Merge branch '2.0.x' 2018-08-08 09:35:44 +02:00
dreis2211 47ed48625c Fix typo 
Closes gh-14013
 2018-08-08 09:34:46 +02:00
Madhura Bhave bc6e4e6e55 Add auto-config for reactive OAuth2 Resource Server 
Closes gh-13948
 2018-08-07 20:46:55 -07:00
Madhura Bhave 319fec4be4 Polish 2018-08-07 14:48:16 -07:00
Stephane Nicoll 5cfe8dbee9 Polish 2018-08-07 17:52:47 +02:00
Stephane Nicoll 7e499590c6 Merge branch '2.0.x' 2018-08-07 17:32:16 +02:00
Stephane Nicoll e68dc2d3c4 Prune 3rd party starters that are not compatible with Spring Boot 2 
Those can be re-added at any time there is Spring Boot 2 support

Closes gh-13510
 2018-08-07 17:31:03 +02:00
Stephane Nicoll 60d8c7979f Polish 2018-08-07 09:28:21 +02:00
Stephane Nicoll ace242db7a Fix javadoc generation on Java 9/10 2018-08-07 08:54:14 +02:00
Madhura Bhave 5bf9d31d91 Fix checkstyle 2018-08-06 17:10:30 -07:00
Madhura Bhave d6b6a5f81f Add auto-config for spring-security-oauth2-resource-server 
Closes gh-13787
 2018-08-06 16:53:36 -07:00
Stephane Nicoll 6a2cb883a5 Merge branch '2.0.x' 2018-08-06 18:35:54 +02:00
Stephane Nicoll f731f6aa39 Restore customization of HTTP trace request headers 
This commit restore the use of the `postProcessRequestHeaders` method
when overridden in a custom HttpExchangeTracer implementation.

Closes gh-13924
 2018-08-06 18:35:12 +02:00
Stephane Nicoll 14a9ec8711 Polish 2018-08-06 14:44:44 +02:00
Stephane Nicoll e6b44189e0 Polish "Add global support for JMX unique names" 
This commit ensures that the new "spring.jmx.unique-names" property
deprecates the Endpoint's specific property as they share the same goal.

If both are set with an incompatible value, an exception is thrown
inviting the user to update their configuration.

Closes gh-13990
 2018-08-06 14:35:18 +02:00
artsiom 1a3f08d772 Add global support for JMX unique names 
See gh-13990
 2018-08-06 13:36:11 +02:00
Stephane Nicoll c071f34a4a Add auto-configuration support for TaskExecutor 
This commit adds support for providing a default ThreadPoolTaskExecutor
with sensible defaults. A new TaskExecutorBuilder is provided with
defaults from the `spring.task.*` namespace and can be used to create
custom instances.

If no custom `Executor` bean is present, `@EnableAsync` now uses the
auto-configure application task executor. Same goes for the async support
in Spring MVC.

Closes gh-1563
 2018-08-06 11:00:40 +02:00
Stephane Nicoll 193b2f187b Upgrade to Maven Compiler Plugin 3.8.0 
Closes gh-14000
 2018-08-05 05:01:35 +02:00
Gary Russell 740d64242f Upgrade to Kafka 2.0.0 
Closes gh-13983
 2018-08-04 16:59:06 +02:00
Stephane Nicoll 624c1306fd Merge branch '2.0.x' 2018-08-03 18:25:24 +02:00
Stephane Nicoll 737b4a275b Polish 2018-08-03 18:24:59 +02:00
Stephane Nicoll 8fdc9b6403 Merge branch '2.0.x' 2018-08-03 13:47:43 +02:00
Stephane Nicoll 0f095abded Polish 2018-08-03 13:47:23 +02:00
dreis2211 8440443237 Include @ in javadoc links for annotations 
Closes gh-13988
 2018-08-03 09:40:08 +02:00
Stephane Nicoll a656513cb8 Merge branch '2.0.x' 2018-08-03 09:39:29 +02:00
Stephane Nicoll 20ea16fe9f Merge branch '1.5.x' into 2.0.x 2018-08-03 09:37:01 +02:00
Stephane Nicoll 0e750f982b Merge branch '2.0.x' 2018-08-03 09:25:15 +02:00
Johnny Lim 7b6b91aae7 Return null immediately when sla is null in convertSla() 
Closes gh-13991
 2018-08-03 09:23:22 +02:00
Johnny Lim d92441e53f Update assertion message in AnnotatedClassFinder.scanPackage() 
Closes gh-13989
 2018-08-03 09:06:38 +02:00
Madhura Bhave b9fcb6a5e5 Merge branch '2.0.x' 2018-08-02 15:19:35 -07:00
Madhura Bhave 16aff4cd2c Refactor PropertySourcesDeducer 
Prior to the changes that fixed #12451,
`FilteredPropertySources` and `CompositePropertySources` were required
by the `PropertySourcesDeducer` to ensure that configuration properties binding
could see changes to the environment even when there was a
PropertySourcesPlaceholderConfigurer in the context. #12451 changed the way
property sources are adapted by `SpringConfigurationPropertySources`, removing the
need for `FilteredPropertySources` and `CompositePropertySources`.

Fixes gh-13738
 2018-08-02 15:00:01 -07:00
Madhura Bhave c41199bad1 Merge branch '2.0.x' 2018-08-02 11:01:47 -07:00
Madhura Bhave 7e2494ebdd Set environment active profiles according to processing order 
Fixes gh-13965
 2018-08-02 11:01:22 -07:00
Stephane Nicoll 65f43505fe Merge branch '2.0.x' 2018-08-02 16:20:07 +02:00
cmakinen 07d96689c6 Add dependency management for micrometer-registry-cloudwatch 
Closes gh-13982
 2018-08-02 16:19:15 +02:00
Stephane Nicoll a8b9718073 Polish "Make "MaxSwallowSize" more easily configurable" 
Closes gh-13966
 2018-08-02 16:09:06 +02:00
artsiom 0d40c5aecc Make "MaxSwallowSize" more easily configurable 
See gh-13966
 2018-08-02 15:45:57 +02:00
Johnny Lim 02e82cd22b Remove unused dependencies 
Closes gh-13973
 2018-08-02 15:17:45 +02:00
Stephane Nicoll 71d26f9ceb Add missing dependency for Javadoc generation 2018-08-01 14:16:39 +02:00
Stephane Nicoll 76d44ca888 Fix formatting 2018-08-01 13:12:20 +02:00
Stephane Nicoll f7032bd8d3 Polish contribution 
Closes gh-13963
 2018-08-01 11:08:59 +02:00
Johnny Lim 7b72fe0ffa Polish 
See gh-13963
 2018-08-01 11:08:22 +02:00
Stephane Nicoll 960817a8c6 Merge branch '2.0.x' 2018-08-01 11:05:49 +02:00
Johnny Lim 94468e5865 Polish 
See gh-13963
 2018-08-01 11:04:59 +02:00
Stephane Nicoll 0c1b229764 Merge branch '2.0.x' 2018-08-01 10:59:05 +02:00
Stephane Nicoll 4e45f36bd1 Clean basePath if necessary 
This commit makes sure that ServletEndpointRegistrar does not add a
duplicate `/` if the basePath is suffixed with it already

Close gh-13964
 2018-08-01 10:58:40 +02:00
Stephane Nicoll 143e4f026f Merge branch '2.0.x' 2018-08-01 08:48:09 +02:00
dreis2211 66b1742f96 Optimize some StringBuilder.append() calls 
Closes gh-13961
 2018-08-01 08:41:03 +02:00
Stephane Nicoll 8367c57d96 Avoid double binding of Flyway's locations 
Closes gh-4995
 2018-07-31 17:19:07 +02:00
Stephane Nicoll 14b413bf08 Remove outdated hint 2018-07-31 17:00:33 +02:00
Stephane Nicoll 435c47925e Switch JMS pooling to `pooled-jms` 
This commit removes support for `activemq-pool` in benefit of
`pooled-jms`. While the former is not JMS 2 compliant, the latter is and
is independent of the ActiveMQ codebase (so potentially reusable in
custom code).

Closes gh-13927
 2018-07-31 16:55:52 +02:00
Stephane Nicoll fbf95b6997 Merge branch '2.0.x' 2018-07-31 16:25:11 +02:00
Stephane Nicoll d31f68380a Deprecate PooledConnectionFactory properties 
This commit deprecated the properties of `PooledConnectionFactory` that
are no longer supported by an alternative that is a JMS 2 compliant.

This commit also adds a note to warn users that this pool implementation
is not JMS 2 compliant.

Closes gh-13956
 2018-07-31 16:17:43 +02:00
Stephane Nicoll fd85cebfef Polish "Make RabbitTemplate default receive queue configurable" 
Closes gh-13930
 2018-07-31 14:32:44 +02:00
artsiom d7621261b2 Make RabbitTemplate default receive queue configurable 
See gh-13930
 2018-07-31 14:32:44 +02:00
Stephane Nicoll f1e2abce2d Merge branch '2.0.x' 2018-07-31 14:29:52 +02:00
Muhammad Hewedy 2f69785c6a Add classpath prefix to the flyway location 
Closes gh-13933
 2018-07-31 14:28:59 +02:00
dreis2211 fe4b3e493d Fix deprecation in KafkaAutoConfigurationIntegrationTests 
Closes gh-13937
 2018-07-31 14:26:42 +02:00
dreis2211 449e1cce9f Avoid annotation attribute lookup in OnBeanCondition 
Close gh-13941
 2018-07-31 11:05:50 +02:00
Johnny Lim daf3f82006 Polish AutoConfigurationGroup.selectImports() 
Closes gh-13943
 2018-07-31 08:40:15 +02:00
Stephane Nicoll d12a099a6d Merge branch '2.0.x' 2018-07-31 08:17:46 +02:00
Johnny Lim d4fba783fb Remove ex.printStackTrace() in tests 
Closes gh-13952
 2018-07-31 08:16:40 +02:00
Andy Wilkinson d67611518f Merge branch '2.0.x' 2018-07-30 13:02:30 +01:00
Andy Wilkinson 06b4007ce4 Avoid installing unwanted ConsoleHandler when cleaning up 
Closes gh-13470
 2018-07-30 13:00:34 +01:00
Stephane Nicoll e7526a458d Upgrade to Spring Session Bean-M1 
Closes gh-13889
 2018-07-30 08:42:32 +02:00
Madhura Bhave d3719eed3f Merge branch '2.0.x' 2018-07-29 22:57:26 -07:00
Madhura Bhave 01abb196ef Fix typo 2018-07-29 22:56:49 -07:00
Stephane Nicoll 025142de69 Merge branch '2.0.x' 2018-07-29 19:01:40 +02:00
Stephane Nicoll 1435d83c18 Upgrade to Spring Session Apple-SR4 
Closes gh-13888
 2018-07-29 18:58:55 +02:00
Phillip Webb 4d86ac4713 Polish copyright date on changed files 2018-07-29 09:30:26 +01:00
Phillip Webb 1b91c0ceb7 Merge branch '2.0.x' 2018-07-29 09:29:57 +01:00
Phillip Webb 0ec22c8bf9 Polish copyright date on changed files 2018-07-29 09:29:29 +01:00
Phillip Webb 80da9cf5eb Merge branch '2.0.x' 2018-07-29 09:28:56 +01:00
Phillip Webb aeb885192e Polish ternary expressions 2018-07-29 09:24:46 +01:00
Stephane Nicoll bb7401a80d Upgrade to Spring Integration 5.1.0.M1 
Closes gh-13891
 2018-07-28 15:54:21 +02:00
Stephane Nicoll b24bb688b8 Upgrade to Spring Integration 5.0.7.RELEASE 
Closes gh-13886
 2018-07-28 15:48:39 +02:00
Phillip Webb ce9c053cbf Fix checkstyle issues on master 
Fix checkstyle issues following 2.0.x merge and
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:36:04 +01:00
Phillip Webb a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +01:00
Phillip Webb 63b609827e Fix checkstyle method order issues 
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:53 +01:00
Phillip Webb e6a68b39a3 Fix checkstyle javadoc issues 
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
Phillip Webb 7fc455654a Fix checkstyle ternary issues 
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
Phillip Webb ec1100a896 Upgrade to spring-javaformat 0.0.6 
Closes gh-13932
 2018-07-28 01:11:48 +01:00
Phillip Webb cddd794a07 Polish 2018-07-28 00:05:25 +01:00
Madhura Bhave f2a9030788 Merge branch '2.0.x' 2018-07-27 12:23:51 -07:00
Madhura Bhave e753b530fa EndpointRequest should match links with trailing slash 
Fixes gh-13921
 2018-07-27 12:23:27 -07:00
Stephane Nicoll f7b90a73a0 Upgrade to Spring Kafka 2.1.8.RELEASE 
Closes gh-13887
 2018-07-27 19:53:47 +02:00
Stephane Nicoll e9a42e27d6 Merge branch '2.0.x' 2018-07-27 11:36:25 +02:00
Stephane Nicoll 2a0d1918f1 Merge branch '1.5.x' into 2.0.x 2018-07-27 11:36:10 +02:00
Stephane Nicoll 659535d1ec Upgrade to Spring Data Kay SR9 
Closes gh-13890
 2018-07-27 10:02:18 +02:00
Stephane Nicoll 3d43bf7797 Upgrade to Spring Security 5.1.0.M2 
Closes gh-13899
 2018-07-27 09:23:40 +02:00
Stephane Nicoll dea1e29683 Merge branch '2.0.x' 2018-07-27 01:56:52 +02:00
Johnny Lim 8a9224b78c Polish NoSuchBeanDefinitionFailureAnalyzer 
Closes gh-13923
 2018-07-27 01:55:38 +02:00
Stephane Nicoll 4139e1b9ab Upgrade to Spring Kafka 2.2.0.M1 
Closes gh-13023
 2018-07-27 01:51:51 +02:00
Stephane Nicoll 73fe8d482e Merge branch '2.0.x' 2018-07-27 01:47:54 +02:00
Stephane Nicoll 54a6ee7a06 Upgrade to Spring HATEOAS 0.25.0.RELEASE 
Closes gh-13742
 2018-07-27 01:46:08 +02:00
Stephane Nicoll d8192d7e04 Upgrade to Spring Amqp 2.1.0.M1 
Closes gh-13885
 2018-07-27 01:41:08 +02:00
Stephane Nicoll 8603fdddb1 Upgrade to Spring Amqp 2.0.5.RELEASE 
Closes gh-3884
 2018-07-27 01:38:20 +02:00
Stephane Nicoll d98b23bdd9 Upgrade to Spring Framework 5.0.8 
Closes gh-13704
 2018-07-27 01:30:47 +02:00
Stephane Nicoll ec2e3c4c0e Merge branch '2.0.x' 2018-07-27 01:03:37 +02:00
dreis2211 bfbf57b0eb Fix typo 
Closes gh-13919
 2018-07-27 01:03:01 +02:00
Stephane Nicoll 0f15b72fab Upgrade to Spring Security 5.0.7.RELEASE 
Closes gh-13898
 2018-07-27 01:01:08 +02:00
Stephane Nicoll 4b3c40ff10 Merge branch '2.0.x' 2018-07-27 00:47:09 +02:00
Stephane Nicoll 85cffd1ab5 Upgrade to Spring Web Services 3.0.3.RELEASE 
Closes gh-13912
 2018-07-27 00:46:19 +02:00
Stephane Nicoll 37f1146c31 Fix formatting 2018-07-27 00:45:31 +02:00
Madhura Bhave db1d3fa282 Merge branch '2.0.x' 2018-07-26 12:36:40 -07:00
Madhura Bhave c775ff8f60 Fix import 2018-07-26 12:33:52 -07:00
Madhura Bhave 6fe366bd64 Merge branch '2.0.x' 2018-07-26 12:19:57 -07:00
Madhura Bhave 6bd438a737 Document `@ConditionalOnProperty` limitation with collections 
Closes gh-7483
 2018-07-26 12:19:06 -07:00
Madhura Bhave 78cb802f98 Merge branch '2.0.x' 2018-07-26 11:39:42 -07:00
Madhura Bhave 57515dfa78 Fix typo 2018-07-26 11:38:23 -07:00
Stephane Nicoll f780179777 Polish contribution 
Closes gh-13904
 2018-07-26 17:22:58 +02:00
artsiom df6feb3e2a Make SpringBootConfigurationFinder public and usable with other annotations 
See gh-13904
 2018-07-26 17:07:55 +02:00
dreis2211 4bb78d5a48 Fix unchecked assignment in AutoConfigurationImportSelector 
Closes gh-13908
 2018-07-26 17:06:04 +02:00
Phillip Webb b5b60c2053 Merge branch '2.0.x' 2018-07-26 13:23:07 +01:00
Stephane Nicoll 276f978261 Upgrade to Spring Data Lovelace RC1 
Closes gh-13740
 2018-07-26 13:19:16 +02:00
Phillip Webb 9a9111af21 Support path discovery for main dispatcher servlet 
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
 2018-07-26 11:35:12 +01:00
Phillip Webb d37e717500 Polish 2018-07-26 11:35:12 +01:00
Stephane Nicoll 406d848406 Merge branch '2.0.x' 2018-07-26 11:30:00 +02:00
Stephane Nicoll 12f8ef1b6e Upgrade to Spring Web Services 3.0.2.RELEASE 
Closes gh-13912
 2018-07-26 11:24:47 +02:00
Stephane Nicoll 787927ba81 Upgrade to Spring Framework 5.1.0.RC1 
Closes gh-13911
 2018-07-26 11:11:58 +02:00
Stephane Nicoll 1e7aa7c4bc Fix Spring Integration imports 2018-07-25 16:25:06 +02:00
Stephane Nicoll 37f5e69173 Start building against Spring Security 5.0.7 snapshots 
See gh-13898
 2018-07-25 15:48:09 +02:00
Stephane Nicoll bdf028a2e6 Merge branch '2.0.x' 2018-07-25 15:39:01 +02:00
Stephane Nicoll 99f33d5070 Start building against Spring Data Kay snapshots 
See gh-13890
 2018-07-25 15:34:52 +02:00
Andy Wilkinson 1ab98ca33f Start building against Spring HATEOAS 0.25.0 snapshots 
See gh-13742
 2018-07-25 15:21:20 +02:00
Stephane Nicoll 56542ef809 Start building against Spring Integration 2.1.0 snapshots 
See gh-13891
 2018-07-25 14:50:14 +02:00
Stephane Nicoll 9e34938ce0 Start building against Spring Amqp 2.1.0 snapshots 
See gh-13885
 2018-07-25 14:43:25 +02:00
Stephane Nicoll 21160da9f5 Use SNAPSHOTs for upcoming releases 2018-07-25 14:32:02 +02:00
Stephane Nicoll a2494df596 Merge branch '2.0.x' 2018-07-25 11:48:20 +02:00
Stephane Nicoll e6cf082dbc Fix typo 2018-07-25 11:44:55 +02:00
dreis2211 2399092f16 Fix deprecation in UndertowServletWebServerFactory 
Closes gh-13873
 2018-07-25 10:19:42 +02:00
Stephane Nicoll af0aa11d15 Polish "Add reactive health indicator for Cassandra" 
Closes gh-13864
 2018-07-25 10:16:17 +02:00
artsiom 61c41555c8 Add reactive health indicator for Cassandra 
See gh-13864
 2018-07-25 10:16:17 +02:00
Stephane Nicoll 0c41384e50 Merge branch '2.0.x' 2018-07-25 09:18:04 +02:00
Stephane Nicoll a25b6bd473 Restore support for TransactionAwareCacheDecorator 
This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.

Closes gh-13861
 2018-07-25 09:17:49 +02:00
Madhura Bhave e524adb2fc Merge branch '2.0.x' 2018-07-24 17:43:47 -07:00
Madhura Bhave 1831f3be16 Fix NPE when Collection contains unbound children 
Fixes gh-13636
 2018-07-24 17:42:51 -07:00
Madhura Bhave eefa0ada9f Allow property overrides for OIDC Configuration Provider 
Closes gh-13869
 2018-07-24 15:11:05 -07:00
Madhura Bhave 5011bc6451 Merge branch '2.0.x' 2018-07-24 14:28:01 -07:00
Madhura Bhave 6032b454b0 Polish 2018-07-24 14:11:01 -07:00
Madhura Bhave f5617601aa Polish "Register OAuth2AuthorizedClientRepository bean" 
Closes gh-13870
 2018-07-24 13:31:03 -07:00
artsiom 2dcf19938d Register OAuth2AuthorizedClientRepository bean 2018-07-24 13:30:36 -07:00
Stephane Nicoll b163120ece Upgrade to Reactor Californium-M1 
Closes gh-12849
 2018-07-24 18:20:11 +02:00
Brian Clozel 57dbea0db3 Finalize upgrade to Reactor Netty 0.8 
This commit fixes the last issue for the upgrade to Reactor Netty 0.8.

Closes: gh-13321
 2018-07-24 14:56:23 +02:00
Brian Clozel e15ca514c8 Update HttpResources cleaning for Reactor Netty 
This commit updates the workaround for issue gh-9146
 2018-07-24 14:07:57 +02:00
Brian Clozel dd79143d1a Support http/2 configuration with Reactor-Netty 
Just like Jetty, Reactor Netty supports ALPN with JDK8 or with a
dependency that delegates TLS to a native library using boringSSL.

Closes gh-13333
 2018-07-24 14:07:57 +02:00
Stephane Nicoll c98bb40136 Adapt NoSuchBeanDefinitionFailureAnalyzer to framework change 
This commit adapts to a Spring Framework change based on SPR-11419 and
SPR-15338. Rather than throwing an exception when injecting a List or
Map of a candidate bean that is not present, an empty collection/map is
injected.
 2018-07-24 13:36:38 +02:00
Stephane Nicoll f3ef7caf09 Merge branch '2.0.x' 2018-07-24 13:35:25 +02:00
Stephane Nicoll 829ac3fbef Prevent headers to be mutated 
This commit rework 1189ccc to prevent a mutate call on the original
headers map.

Closes gh-13871
 2018-07-24 13:34:49 +02:00
Stephane Nicoll 5fb2060566 Polish "Add configuration for Tomcat's cachingAllowed property" 
Closes gh-13614
 2018-07-24 11:20:35 +02:00
Rob Tompkins 200ac6db30 Add configuration for Tomcat's cachingAllowed property 
See gh-13614
 2018-07-24 11:18:33 +02:00
Stephane Nicoll dcd230fc00 Merge branch '2.0.x' 2018-07-24 10:38:48 +02:00
Stephane Nicoll 7d2e25f6f8 Merge branch '1.5.x' into 2.0.x 2018-07-24 10:37:31 +02:00
dreis2211 d0918f87b2 Fix OAuth2WebSecurityConfigurationTests 
Closes gh-13872
 2018-07-24 09:57:42 +02:00
Stephane Nicoll 2ad548485c Merge branch '2.0.x' 2018-07-24 09:40:38 +02:00
Stephane Nicoll 1a0afc6bbe Polish "Use Collection.removeIf() where possible" 
Closes gh-13871
 2018-07-24 09:38:51 +02:00
dreis2211 1189ccc936 Use Collection.removeIf() where possible 
See gh-13871
 2018-07-24 09:38:34 +02:00
Stephane Nicoll 6dc0cb4f67 Merge branch '2.0.x' 2018-07-24 09:33:22 +02:00
Stephane Nicoll 7176c54f5e Polish "Add metric description and base unit to metrics endpoint" 
Closes gh-13813
 2018-07-24 09:32:22 +02:00
Johannes Edmeier ab1f8cf77b Add metric description and base unit to metrics endpoint 
See gh-13813
 2018-07-24 09:32:22 +02:00
Stephane Nicoll ecb8da2536 Polish "Upgrade to Micrometer 1.0.6" 
Closes gh-13819
 2018-07-24 09:25:54 +02:00
Jon Schneider f478911c54 Upgrade to Micrometer 1.0.6 
See gh-13819
 2018-07-24 09:12:06 +02:00
Stephane Nicoll ccabf83815 Merge branch '2.0.x' 2018-07-23 09:31:54 +02:00
Stephane Nicoll dcb68d4c64 Deprecate unused property 
Closes gh-13836
 2018-07-23 09:31:02 +02:00
Andy Wilkinson 70dbcba7b6 Merge branch '2.0.x' 2018-07-20 17:04:25 +01:00
Andy Wilkinson daad992c96 Merge branch '1.5.x' into 2.0.x 2018-07-20 17:03:59 +01:00
Andy Wilkinson c7f6fb8660 Upgrade to Mockito 2.19.1 
Closes gh-13859
 2018-07-20 16:39:24 +01:00
Andy Wilkinson f8c8c47351 Upgrade to Jooq 3.11.3 
Closes gh-13858
 2018-07-20 16:39:24 +01:00
Andy Wilkinson 0ea85800c4 Upgrade to Infinispan 9.3.1.Final 
Closes gh-13857
 2018-07-20 16:39:23 +01:00
Andy Wilkinson 2d340fcae1 Upgrade to Hibernate 5.3.3.Final 
Closes gh-13856
 2018-07-20 16:39:22 +01:00
Andy Wilkinson 3b79802c19 Upgrade to Flyway 5.1.4 
Closes gh-13855
 2018-07-20 16:39:22 +01:00
Andy Wilkinson 98f19fcc81 Upgrade to Elasticsearch 6.3.1 
Closes gh-13854
 2018-07-20 16:39:21 +01:00
Andy Wilkinson e9d1abf2ce Upgrade to Groovy 2.5.1 
Closes gh-13853
 2018-07-20 16:39:20 +01:00
Andy Wilkinson 921d883559 Upgrade to Kafka 1.1.1 
Closes gh-13852
 2018-07-20 16:39:20 +01:00
Andy Wilkinson 7a706b1581 Upgrade to Commons Pool2 2.6.0 
Closes gh-13851
 2018-07-20 16:39:19 +01:00
Andy Wilkinson f28ae9e4c5 Upgrade to Commons Dbcp2 2.5.0 
Closes gh-13850
 2018-07-20 16:39:19 +01:00
Andy Wilkinson 1df725fddc Upgrade to Byte Buddy 1.8.13 
Closes gh-13849
 2018-07-20 16:39:18 +01:00
Andy Wilkinson a19d340b60 Upgrade to Undertow 2.0.11.Final 
Closes gh-13848
 2018-07-20 16:39:17 +01:00
Andy Wilkinson 9d72838796 Upgrade to Hazelcast 3.10.3 
Closes gh-13847
 2018-07-20 16:39:17 +01:00
Andy Wilkinson 5e58a50311 Upgrade to Couchbase Client 2.6.0 
Closes gh-13846
 2018-07-20 16:39:16 +01:00
Andy Wilkinson 13337c648c Merge branch '2.0.x' 2018-07-20 16:35:19 +01:00
Andy Wilkinson 136be5916c Upgrade to Postgresql 42.2.4 
Closes gh-13845
 2018-07-20 16:30:17 +01:00
Andy Wilkinson 8f2a8576a6 Upgrade to Mariadb 2.2.6 
Closes gh-13844
 2018-07-20 16:30:16 +01:00
Andy Wilkinson e5a4cfabc3 Upgrade to Hibernate Validator 6.0.11.Final 
Closes gh-13843
 2018-07-20 16:30:15 +01:00
Andy Wilkinson 1c6e75ff10 Upgrade to Kafka 1.0.2 
Closes gh-13842
 2018-07-20 16:30:15 +01:00
Andy Wilkinson 4003c3c6e5 Upgrade to Jna 4.5.2 
Closes gh-13841
 2018-07-20 16:30:14 +01:00
Andy Wilkinson 3fd6f00155 Upgrade to Netty 4.1.27.Final 
Closes gh-13840
 2018-07-20 16:30:13 +01:00
Andy Wilkinson 478181eb2c Merge branch '1.5.x' into 2.0.x 2018-07-20 16:26:30 +01:00
Stephane Nicoll 0f0fc9ec62 Adapt assertion to logging change in Spring Framework 2018-07-20 17:12:56 +02:00
Stephane Nicoll 11d9a7c30d Merge branch '2.0.x' 2018-07-20 15:51:28 +02:00
Stephane Nicoll fc0a687ee0 Migrate test to ApplicationContextRunner 2018-07-20 15:51:14 +02:00
Madhura Bhave 14a0064c53 Merge branch '2.0.x' 2018-07-19 16:32:59 -07:00
Madhura Bhave 660d284f45 Document when and how to use brackets when binding to maps 
Closes gh-13506
 2018-07-19 16:31:59 -07:00
Madhura Bhave d958e83799 Merge branch '2.0.x' 2018-07-19 15:48:29 -07:00
Madhura Bhave 56235187d0 Fix typo 2018-07-19 15:47:14 -07:00
Andy Wilkinson a33dd8b9cb Merge branch '2.0.x' 2018-07-19 20:43:58 +01:00
Andy Wilkinson 10b91602e9 Increase connect and read timeouts when testing against Cassandra 2018-07-19 20:43:39 +01:00
Andy Wilkinson 1852ecc444 Merge branch '2.0.x' 2018-07-19 19:59:08 +01:00
Andy Wilkinson de7899fba4 Improve reliability by give Cassandra more time and attempts to start 2018-07-19 19:57:54 +01:00
Andy Wilkinson d11ee29fa1 Merge branch '2.0.x' 2018-07-19 18:32:49 +01:00
Andy Wilkinson bfc4cad692 Upgrade to Spring REST Docs 2.0.2.RELEASE 
Closes gh-13505
 2018-07-19 18:32:38 +01:00
Stephane Nicoll 5be84dd32b Merge branch '2.0.x' 2018-07-19 17:58:14 +02:00
Stephane Nicoll cdbe6fa122 Document properties migrator usage 
Closes gh-13600
 2018-07-19 17:57:42 +02:00
Andy Wilkinson 13835c5dc7 Upgrade to Spring Batch 4.1.0.M2 
Closes gh-13820
 2018-07-19 16:56:38 +01:00
Stephane Nicoll 1c0eb8de36 Merge branch '2.0.x' 2018-07-19 16:42:51 +02:00
Stephane Nicoll a1ef3f070a Improve documentation for using a mock environment with @SpringBootTest 
Closes gh-13827
 2018-07-19 16:40:24 +02:00
Stephane Nicoll 237f2fb494 Merge branch '2.0.x' 2018-07-19 14:55:21 +02:00
Stephane Nicoll 592754d806 Polish "Make sure exception tag values are not empty in web metrics" 
Closes gh-13187
 2018-07-19 14:53:29 +02:00
Jon Schneider ee37dc1c31 Make sure exception tag values are not empty in web metrics 
See gh-13187
 2018-07-19 14:40:58 +02:00
Stephane Nicoll bc7db86c8c Consistently apply exclude on auto-configuration 
Previously, exclude of an import selector was applied only locally. In
other words, if one import selector imports `AcmeAutoConfiguration` and
another one exclude it, it would still be imported because exclude were
applied separately

This commit collects the outcome of all auto-configuration import
selectors and then apply exclusions in a single pass.

Closes gh-12586
 2018-07-19 14:08:10 +02:00
Stephane Nicoll 184cd0c708 Avoid CGLIB requirement in MessageSourceAutoConfiguration 
Closes gh-13824
 2018-07-19 13:58:19 +02:00
Madhura Bhave ceaac98847 Update docs with OIDC provider configuration 
See gh-13210
 2018-07-18 12:27:13 -07:00
Madhura Bhave 6333edbe16 Merge branch '2.0.x' 2018-07-18 11:01:38 -07:00
Madhura Bhave 66156cc24f Polish 2018-07-18 10:29:43 -07:00