Commit Graph

3452 Commits (d0de4657d4fa7c0b181a2d6ef05402deee5b5785)

Author SHA1 Message Date
Andy Wilkinson bd4a5f5c91 Upgrade to Infinispan 9.3.2.Final
Closes gh-14386
6 years ago
Andy Wilkinson 9be62edfa2 Upgrade to Hibernate 5.3.6.Final
Closes gh-14385
6 years ago
Andy Wilkinson f897a50833 Upgrade to Elasticsearch 6.4.0
Closes gh-14384
6 years ago
Andy Wilkinson fccb8f5619 Upgrade to Ehcache3 3.6.0
Closes gh-14383
6 years ago
Andy Wilkinson 22ef443d51 Upgrade to Assertj 3.11.1
Closes gh-14382
6 years ago
Andy Wilkinson 495025af97 Upgrade to Tomcat 9.0.11
Closes gh-14381
6 years ago
Andy Wilkinson 1ef8e05374 Upgrade to Commons Lang3 3.8
Closes gh-14380
6 years ago
Andy Wilkinson 3b1c4f7c19 Upgrade to Artemis 2.6.3
Closes gh-14379
6 years ago
Andy Wilkinson e5680816fa Upgrade to Byte Buddy 1.8.22
Closes gh-14378
6 years ago
Andy Wilkinson 75a74d6a94 Upgrade to Rxjava2 2.2.2
Closes gh-14377
6 years ago
Andy Wilkinson 3cec99d8aa Upgrade to Netty Tcnative 2.0.15.Final
Closes gh-14376
6 years ago
Andy Wilkinson c9bdc09c14 Upgrade to Lettuce 5.1.0.RC1
Closes gh-14375
6 years ago
Andy Wilkinson 753dd454fb Upgrade to Cassandra Driver 3.6.0
Closes gh-14374
6 years ago
Andy Wilkinson 89944edf27 Upgrade to Couchbase Client 2.6.2
Closes gh-14373
6 years ago
Andy Wilkinson 2471d5c7c2 Merge branch '2.0.x' 6 years ago
Andy Wilkinson a6feebb39d Upgrade to Spring Kafka 2.1.9.RELEASE
Closes gh-14372
6 years ago
Andy Wilkinson be498f945c Upgrade to Postgresql 42.2.5
Closes gh-14371
6 years ago
Andy Wilkinson 54302b9a7b Upgrade to Jetty El 8.5.33
Closes gh-14370
6 years ago
Andy Wilkinson 5010a690e8 Upgrade to Jaybird 3.0.5
Closes gh-14369
6 years ago
Andy Wilkinson e2e8db3876 Upgrade to Elasticsearch 5.6.11
Closes gh-14368
6 years ago
Andy Wilkinson 03eda003d0 Upgrade to Janino 3.0.9
Closes gh-14367
6 years ago
Andy Wilkinson cdd819adaa Upgrade to Johnzon Jsonb 1.1.9
Closes gh-14366
6 years ago
Andy Wilkinson 59cb5bf44c Upgrade to Activemq 5.15.6
Closes gh-14365
6 years ago
Andy Wilkinson 5c891f8e1b Upgrade to Netty 4.1.29.Final
Closes gh-14364
6 years ago
Andy Wilkinson 956ef0f785 Upgrade to Javax Mail 1.6.2
Closes gh-14363
6 years ago
Andy Wilkinson 2a44319706 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 590ea73097 Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll 67d543c64c Start building against Spring Session Bean snapshots
See gh-14333
6 years ago
Stephane Nicoll 8afa201271 Start building against Spring Session Apple snapshots
See gh-14332
6 years ago
Stephane Nicoll 1740f039f3 Start building against Spring Integration snapshots
See gh-14330
6 years ago
Stephane Nicoll d53839eecb Start building against Spring Data Kay snapshots
See gh-14328
6 years ago
Stephane Nicoll 0493355241 Use deterministic order for configuration properties metadata
This commit updates the annotation processor to write metadata in a
consistent way. Groups, properties and hints are written and each item
is ordered alphabetically based on its name.

Also, deprecated items are written last.

Closes gh-14347
6 years ago
Madhura Bhave d3ecd02987 Merge branch '2.0.x' 6 years ago
Madhura Bhave e41394233b Harmonize ReactiveSecurityAutoConfiguration
Fixes gh-14263
6 years ago
Stephane Nicoll 24051b42d0 Polish "Add support for configuring missingQueuesFatal property"
See gh-14252
6 years ago
dreis2211 4fc2806089 Polish CommandCompleter
Closes gh-14339
6 years ago
Stephane Nicoll c1322a543c Polish "Add support for configuring missingQueuesFatal property"
Closes gh-14252
6 years ago
Dmytro Nosan 91e731a4b4 Add support for configuring missingQueuesFatal property
See gh-14252
6 years ago
Stephane Nicoll ce63db2e42 Upgrade to Spring Framework 5.0.9
Closes gh-14325
6 years ago
Stephane Nicoll 49b4913d48 Upgrade to Spring Framework 5.1.0.RC3
Closes gh-14324
6 years ago
Stephane Nicoll 0dafc37f76 Merge branch '2.0.x' 6 years ago
Stephane Nicoll b7e1a2ea6c Add reference to Rollbar starter
Closes gh-14343
6 years ago
Andy Wilkinson 4ae057694f Merge branch '2.0.x' 6 years ago
Andy Wilkinson aa45f3c702 Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll 61344f7d9c Upgrade to Reactor Bom Bismuth-SR11
Closes gh-14322
6 years ago
Stephane Nicoll 128ed77a69 Start building against Spring Framework 5.0 snapshots
See gh-14325
6 years ago
Brian Clozel 5e83192d7d Upgrade to Reactor Californium RC1
Closes gh-14323
6 years ago
Madhura Bhave 62cb87b40b Merge branch '2.0.x' 6 years ago
Madhura Bhave ccdbc0aa06 Polish "Remove redundancy from actuator documentation"
Closes gh-14206
6 years ago
kuldeepsidhu88 abf5e63b54 Remove redundancy from actuator documentation
See gh-14206
6 years ago
Phillip Webb 04710373bf Add @Author attribution
See gh-11077
6 years ago
Phillip Webb bc357225b5 Polish MockitoPostProcessor
Closes gh-11077
6 years ago
Andreas Neiser a5b3a2646b Test @MockBean/@SpyBean with @Primary
Add additional tests to ensure that `@MockBean` and `@SpyBean`
work consistently when combined with `@Primary`.

See gh-11077
6 years ago
Phillip Webb c777614d8f Support @MockBean/@SpyBean with @Primary
Update `MockitoPostProcessor` so that `@MockBean` and `@SpyBean`
work consistently when combined with `@Primary`.

See gh-11077

Co-authored-by: Andreas Neiser <andreas.neiser@gmail.com>
6 years ago
Phillip Webb 82b27c60a4 Drop MockitoPostProcessor factory method
Remove factory method previously used to create the mock instance.
Since commit 0e00a49dcc, the method is not longer needed.

See gh-11077
6 years ago
Brian Clozel a32cd1965e Switch to Reactor Californium-BUILD-SNAPSHOT
In preparation for gh-14323
6 years ago
Andy Wilkinson ad4179cc43 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 6c865f9b43 Polish
See gh-1176
6 years ago
Stephane Nicoll 4d031999ce Polish "Fix use of deprecated Mongo API"
Closes gh-14318
6 years ago
Mark Paluch b97892ff88 Fix use of deprecated Mongo API
We now use com.mongodb.MongoClientSettings to configure the reactive
MongoDB driver. This is a breaking change as
MongoClientSettingsBuilderCustomizer and user-provided
MongoClientSettings beans referenced the package the settings type
from com.mongodb.async.client.

MongoClient.getSettings() is deprecated and still in use within tests
until a replacement is available.

See gh-14318
6 years ago
Stephane Nicoll f3ece97d9d Add spring-framework.version alias for spring.version
Closes gh-12544
6 years ago
Stephane Nicoll a170bfcc76 Deprecate micrometer meter's enabled flags
This commit deprecates the few 'enabled' flags that control whether
certain meter binders are registered in the context.

Metrics auto-configuration for the JVM, Logback and System-related
information have been moved to individual auto-configurations so that
they can be excluded rather than using the now deprecated flag.

This harmonizes our policy with regards to disabling behaviour,
especially since other similar auto-configurations do not have such
flag.

Closes gh-13408
6 years ago
Andy Wilkinson 79a964e563 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 53372d5fd7 Document the use of --args to pass arguments to bootRun
Closes gh-1176
6 years ago
Stephane Nicoll 45ef926a90 Merge branch '2.0.x' 6 years ago
Stephane Nicoll ff8b8c55c6 Remove reference to "management.metrics.binders.integration.enabled"
Closes gh-14319
6 years ago
Phillip Webb 0e725543d5 Merge branch '2.0.x' 6 years ago
Phillip Webb a2cea6a45a Upgrade amqp-client to 5.4.1
See gh-14259
6 years ago
Phillip Webb ec27137632 Merge branch '1.5.x' into 2.0.x 6 years ago
Phillip Webb 8c34e053f5 Update copyright header of changed files 6 years ago
Phillip Webb c3de4c84f2 Polish 6 years ago
Stephane Nicoll 9dec5811fb Polish "Add reference to Stripe Payment Gateway Service starter"
Closes gh-14304
6 years ago
pankajtandon 40e574c3c2 Add reference to Stripe Payment Gateway Service starter
See gh-14304
6 years ago
Andy Wilkinson b580dd70f8 Polish 6 years ago
Andy Wilkinson da13871f84 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 86d87ad215 Polish 6 years ago
Andy Wilkinson 7442e37154 Add JAXB API to Data JPA starter so it works out-of-the-box on Java 9+
Closes gh-14287
6 years ago
Stephane Nicoll 304c6a02ba Polish "Make it possible to disable the BackgroundPreinitializer"
Closes gh-14298
6 years ago
artsiom 5779767513 Make it possible to disable the BackgroundPreinitializer
See gh-14298
6 years ago
Stephane Nicoll 5f56adc334 Add activation API to WebServices samples on Java 11+
Closes gh-14308
6 years ago
Stephane Nicoll 7ff41e7c8c Polish 6 years ago
Stephane Nicoll ca8be3f6bd Polish "Add Health details using maps"
Closes gh-14305
6 years ago
Michael Pratt 5c86f9eca4 Add Health details using maps
See gh-14305
6 years ago
Stephane Nicoll 45204d7ee0 Harmonize JAXB version in dependency management
Closes gh-14308
6 years ago
Stephane Nicoll 3469142fec Partially revert 59d911d
This commit restores the public `UsesUnsafeJava` and flag it as
deprecated.

Closes gh-14072
6 years ago
Stephane Nicoll 5df75e74ae Update property description 6 years ago
Stephane Nicoll 9da0b25890 Merge branch '2.0.x' 6 years ago
Stephane Nicoll c410f7d153 Merge branch '1.5.x' into 2.0.x 6 years ago
Johnny Lim 49c760d275 Update @since tag
This commit updates @since tag in CloudServiceConnectorsAutoConfiguration
as it has been renamed in cfd0ab7646.

Closes gh-14297
6 years ago
Madhura Bhave f0d7533e0b Merge branch '2.0.x' 6 years ago
Madhura Bhave 9c82d5c382 Make ApplicationContextServerWebExchangeMatcher and subclasses thread-safe
Fixes gh-14161
6 years ago
Phillip Webb 9d1b3a2b49 Merge branch '2.0.x' 6 years ago
Phillip Webb cafff43022 Update copyright header of changed files 6 years ago
Phillip Webb 9af6b3422f Polish 6 years ago
Madhura Bhave 75937f5b5c Make jmsListenerContainerFactory @ConditionalOnSingleCandidate
Closes gh-12700
6 years ago
Phillip Webb 59b5c54489 Upgrade to Rabbit AMQP Client to 5.4.0
Closes gh-14303
6 years ago
Phillip Webb 0cd64ea690 Merge branch '2.0.x' 6 years ago
Phillip Webb 45613f8c3c Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 8ee4775820 Polish 6 years ago
Brian Clozel 2af8a9617b Revert temporary workaround for reactor resources
This switches back the Reactor resources on global by default.

See gh-14058
See SPR-17199
6 years ago
Stephane Nicoll 3e745eefc0 Upgrade to Spring Batch 4.1.0.M3
Closes gh-14296
6 years ago
Stephane Nicoll 1ceb076035 Harmonize Metrics test
This commit harmonizes metrics test to rely on `MetricRun.simple()`
rather than configuring a simple `MeterRegistry` manually. Rather than
applying related auto-configurations automatically, `MetricsRun` only
enable the absolute minimum.

See gh-14255
6 years ago
Stephane Nicoll c0e45b7333 Adapt to Spring Framework API change 6 years ago
Stephane Nicoll cb7de2a963 Allow binding number to DataSize
Closes gh-14294
6 years ago
Stephane Nicoll 8771b34c15 Polish "Align max HTTP header size configuration"
Closes gh-14234
6 years ago
qct dbbb378650 Align max HTTP header size configuration
See gh-14234
6 years ago
Johnny Lim 5427d778fe Polish
Closes gh-14293
6 years ago
Stephane Nicoll 3d732e86f4 Merge branch '2.0.x' 6 years ago
Johnny Lim ca57e58ee5 Polish
See gh-14293
6 years ago
Stephane Nicoll e0ee4f22a5 Merge branch '2.0.x' 6 years ago
Johnny Lim 3eef927499 Use InvalidEndpointRequestException for MetricsEndpoint
Closes gh-14291
6 years ago
Brian Clozel 1a20e7efa1 Merge branch '2.0.x' 6 years ago
Kedar Joshi 72ebfb0332 Update default compressible media types
Closes gh-14278
6 years ago
Stephane Nicoll 3dfece779c Upgrade to Kotlin 1.2.61
Closes gh-14290
6 years ago
Stephane Nicoll 960acb0cbf Merge branch '2.0.x' 6 years ago
Stephane Nicoll 42bf594d96 Polish condition name
See gh-14285
6 years ago
artsiom 11f0f668ff Throw an exception on invalid syntax in SPRING_APPLICATION_JSON
Closes gh-14251
6 years ago
Stephane Nicoll 5a1aefc76f Merge branch '2.0.x' 6 years ago
Stephane Nicoll ddeae9b58e Polish "Fix WSDL locations condition to work with a list"
Closes gh-14285
6 years ago
Eneias Cordeiro da Silva 80358f7fbf Fix WSDL locations condition to work with a list
See gh-14285
6 years ago
Stephane Nicoll 143ca5d1fa Merge branch '2.0.x' 6 years ago
Stephane Nicoll 6078865372 Merge branch '1.5.x' into 2.0.x 6 years ago
Johnny Lim d510bc71b1 Polish
Closes gh-14271
6 years ago
Stephane Nicoll 7dff13b632 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 8950c3ebb4 Polish
See gh-14271
6 years ago
Stephane Nicoll 314cd34716 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 00233cd57e Merge branch '1.5.x' into 2.0.x 6 years ago
Madhura Bhave f3dbd946de Document how to test secure mockmvc tests
See gh-14227
6 years ago
Stephane Nicoll 8b753297c3 Merge branch '2.0.x' 6 years ago
Stephane Nicoll ea2fb620b4 Clarify structure of prefixes
Closes gh-14258
6 years ago
Stephane Nicoll 4634811c7c Polish 6 years ago
Stephane Nicoll 7bee9dfc22 Harmonize HTTP client metrics
This commit harmonizes the auto-configurations for RestTemplate and
WebClient in a single `HttpClientMetricsAutoConfiguration`. Doing so
allows to give a better scope for the shared `MeterFilter`.

As a result`WebClientMetricsAutoConfiguration` has moved to the `client`
package.

Closes gh-14269
6 years ago
Stephane Nicoll 2fc557a5a9 Improve WebSocket documentation for reactive applications
Closes gh-14069
6 years ago
Stephane Nicoll 374cf2c781 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 6d637bc53b Add missing condition
Closes gh-14264
6 years ago
Madhura Bhave b16927ce91 Add @WithMockUser to tests
See gh-14227
6 years ago
Madhura Bhave 8f946260d2 Update copyright year for changed files 6 years ago
Madhura Bhave 0384a88b57 Include web security config classes in @WebMvcTest
Security config classes are not included when the
secure flag is set to false.

Closes gh-6514
6 years ago
Madhura Bhave d91c71b508 Deprecate secure flag on @WebMvcTest
Closes gh-14227
6 years ago
Phillip Webb 174f53e1cf Merge branch '2.0.x' 6 years ago
Phillip Webb 2e2f91d4a0 Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll 6c26315cd1 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 0625443d27 Polish "Limit metrics collection of incoming requests"
Closes gh-14173
6 years ago
Dmytro Nosan 81a6701914 Limit metrics collection of incoming requests
See gh-14173
6 years ago
asomov 46c30d01e9 Upgrade to SnakeYAML 1.23
Closes gh-14224
6 years ago
Stephane Nicoll 0590c4de32 Merge branch '2.0.x' 6 years ago
Stephane Nicoll f9081a2c23 Revert "Polish some joining collectors"
See gh-14221
6 years ago
Stephane Nicoll cfd0ab7646 Remove `spring.cloud.enabled` property
This commit removes an undocumented property and rename the Spring
Cloud Service Connectors auto-configuration.

Closes gh-14219
6 years ago
Madhura Bhave a33e58fc45 Deprecate OAuth2 login redirect-uri-template
This property is deprecated in favor of
`spring.security.oauth2.client.registration.login.*.redirect-uri

Closes gh-14226
6 years ago
Madhura Bhave a54898b8f5 Remove explicit call to `authorizationCodeGrant`
See gh-13812
6 years ago
Madhura Bhave f5deebf0cb Support authorization_code grant for OAuth2 client
This commit also refactors OAuth2 client properties. With
the added support for authorization_code clients, client
registrations are now divided into `login` and `authorization_code`.
An environment post processor is used for backward compatibility with
old Open ID Connect login clients.

Closes gh-13812
6 years ago
Stephane Nicoll 5af7835e83 Merge branch '2.0.x' 6 years ago
dreis2211 afda71e419 Polish some joining collectors
Closes gh-14221
6 years ago
Stephane Nicoll b7ae55866e Polish "Improve Kafka Auto-configuration"
Closes gh-14215
6 years ago
Gary Russell 59c6dc5c7a Improve Kafka Auto-configuration
- transaction manager
- error handler
- after rollback processor

See gh-14215
6 years ago
Stephane Nicoll e8d21fc964 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 3997b3ae5e Polish 6 years ago
Stephane Nicoll 56329e67d7 Polish "Add support for com.mongodb.client.MongoClient"
Closes gh-14176
6 years ago
Christoph Strobl d549e6001a Add support for com.mongodb.client.MongoClient
Next to com.mongodb.MongoClient the MongoDB Java driver offers the
com.mongodb.client.MongoClient as entry point for database and
collection operations. Spring Data MongoDB supports
c.m.client.MongoClient via its MongoDbFactory using
SimpleMongoClientDbFactory.

The MongoAutoConfiguration now backs off if any of those two clients is
already defined in the Application context allowing
MongoDataAutoConfiguration to pick up the users driver implementation of
choice.

See gh-14176
6 years ago
Johnny Lim 46415cb859 Add Spring Boot starter for Narayana in doc
Closes gh-14220
6 years ago
Stephane Nicoll dd94adbc11 Merge branch '2.0.x' 6 years ago
Stephane Nicoll ff11166af8 Restore RabbitMQ advanced starter as it is compatible with Spring Boot 2 6 years ago
Madhura Bhave f3fa952cbc Support WebExceptionHandler in @WebFluxTest
Closes gh-13627
6 years ago
Madhura Bhave 35d7bb7f34 Polish "issuer uri in reactive resource-server config"
Closes gh-14199
6 years ago
artsiom 04b7c4c6d9 Support issuer uri in reactive OAuth2 resource-server config 6 years ago
Stephane Nicoll db27d8fdf8 Revert "Polish dependency management for OIDC starter"
This reverts commit 3ad3cfd7e2.

Closes gh-14137
6 years ago
Stephane Nicoll 20c8f61473 Merge branch '2.0.x' 6 years ago
dreis2211 70add0617a Collapse identical catch blocks
Closes gh-14213
6 years ago
Dave Syer c7b7a1402a Make some nested private classes package private
Closes gh-13795
6 years ago
Stephane Nicoll d9c0dbb99d Polish "Polish some Collectors"
Closes gh-13727
6 years ago
dreis2211 422a436df1 Polish some Collectors
See gh-13727
6 years ago
Johnny Lim cf17106d8d Polish
Closes gh-14212
6 years ago
Stephane Nicoll a86d7cdb97 Add execution id to `repackage` goal
Closes gh-14210
6 years ago
Johnny Lim fe3fe0fa63 Polish
Closes gh-14202
6 years ago
Madhura Bhave cf31325e5d Polish "OIDC issuer uri in OAuth resource server config"
Closes gh-14190
6 years ago
artsiom 0c299bbc1f Support OIDC issuer uri in OAuth resource server config 6 years ago
mhyeon.lee c827530f4b Add user-info-authentication-method
Closes gh-13865
6 years ago
Madhura Bhave d07e2fa0b2 Polish "OAuth2 client secret should not be required"
Closes gh-14156
6 years ago
artsiom 6be4307712 OAuth2 client secret property should not be required 6 years ago
Madhura Bhave caf7221485 Update OAuth2 config following changes in Spring Security DSL
Closes gh-14169
6 years ago
Stephane Nicoll dea67e9aca Merge branch '2.0.x' 6 years ago
Stephane Nicoll af426e383f Review slice documentation to clarify the scope and alternative options
Closes gh-13810
6 years ago
Stephane Nicoll 876def3693 Merge branch '2.0.x' 6 years ago
Stephane Nicoll f53e6c701f Improve actuator documentation about the types supported for endpoints
Closes gh-13896
6 years ago
Stephane Nicoll 086fec09ef Merge branch '2.0.x' 6 years ago
Stephane Nicoll f5482a33a3 Document custom DispatcherServlet requirement
Closes gh-14145
6 years ago
Stephane Nicoll 7eecfe3108 Polish
See gh-14184
6 years ago
Stephane Nicoll 82280e34c7 Merge branch '2.0.x' 6 years ago
Johnny Lim fb71174c24 Polish
Closes gh-14184
6 years ago
Stephane Nicoll 833e39eeb6 Let Hibernate configure the transaction manager on WebSphere
Closes gh-8926
6 years ago
Madhura Bhave fc4340c5d4 Rename OAuth2 resource server properties
Closes gh-14165
6 years ago
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.
6 years ago
Brian Clozel 0881b7c390 Revert "Consider only current context in WebFlux setup"
This reverts commit da4624a882.
6 years ago
Stephane Nicoll 03d6cd9f0b Merge branch '2.0.x' 6 years ago
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
6 years ago
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
6 years ago
Stephane Nicoll 8fcd3fcd4c Fix javadoc generation on Java10+ 6 years ago
Stephane Nicoll 429cd8d114 Optimize use of Jackson ObjectMapper instances
Closes gh-1789
6 years ago
Johnny Lim 9602a32a8d Polish
Closes gh-14172
6 years ago
Stephane Nicoll 1b7f713487 Merge branch '2.0.x' 6 years ago