Commit Graph

3512 Commits

Author SHA1 Message Date
Stephane Nicoll 0dafc37f76 Merge branch '2.0.x' 2018-09-07 14:50:04 +02:00
Stephane Nicoll b7e1a2ea6c Add reference to Rollbar starter
Closes gh-14343
2018-09-07 14:49:25 +02:00
Andy Wilkinson 4ae057694f Merge branch '2.0.x' 2018-09-07 11:09:06 +01:00
Andy Wilkinson aa45f3c702 Merge branch '1.5.x' into 2.0.x 2018-09-07 10:53:15 +01:00
Stephane Nicoll 61344f7d9c Upgrade to Reactor Bom Bismuth-SR11
Closes gh-14322
2018-09-07 09:44:05 +02:00
Stephane Nicoll 128ed77a69 Start building against Spring Framework 5.0 snapshots
See gh-14325
2018-09-07 09:43:05 +02:00
Brian Clozel 5e83192d7d Upgrade to Reactor Californium RC1
Closes gh-14323
2018-09-07 09:07:40 +02:00
Madhura Bhave 62cb87b40b Merge branch '2.0.x' 2018-09-06 15:46:07 -07:00
Madhura Bhave ccdbc0aa06 Polish "Remove redundancy from actuator documentation"
Closes gh-14206
2018-09-06 15:41:08 -07:00
kuldeepsidhu88 abf5e63b54 Remove redundancy from actuator documentation
See gh-14206
2018-09-06 15:40:46 -07:00
Phillip Webb 04710373bf Add @Author attribution
See gh-11077
2018-09-06 13:42:29 -07:00
Phillip Webb bc357225b5 Polish MockitoPostProcessor
Closes gh-11077
2018-09-06 13:31:35 -07:00
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
2018-09-06 13:31:33 -07:00
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>
2018-09-06 13:24:41 -07:00
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
2018-09-06 13:22:46 -07:00
Brian Clozel a32cd1965e Switch to Reactor Californium-BUILD-SNAPSHOT
In preparation for gh-14323
2018-09-06 20:39:32 +02:00
Andy Wilkinson ad4179cc43 Merge branch '2.0.x' 2018-09-06 16:38:55 +01:00
Andy Wilkinson 6c865f9b43 Polish
See gh-1176
2018-09-06 16:38:27 +01:00
Stephane Nicoll 4d031999ce Polish "Fix use of deprecated Mongo API"
Closes gh-14318
2018-09-06 16:44:56 +02:00
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
2018-09-06 16:44:55 +02:00
Stephane Nicoll f3ece97d9d Add spring-framework.version alias for spring.version
Closes gh-12544
2018-09-06 15:31:28 +02:00
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
2018-09-06 15:08:39 +02:00
Andy Wilkinson 79a964e563 Merge branch '2.0.x' 2018-09-06 13:11:50 +01:00
Andy Wilkinson 53372d5fd7 Document the use of --args to pass arguments to bootRun
Closes gh-1176
2018-09-06 13:08:40 +01:00
Stephane Nicoll 45ef926a90 Merge branch '2.0.x' 2018-09-06 12:18:12 +02:00
Stephane Nicoll ff8b8c55c6 Remove reference to "management.metrics.binders.integration.enabled"
Closes gh-14319
2018-09-06 12:17:57 +02:00
Phillip Webb 0e725543d5 Merge branch '2.0.x' 2018-09-05 13:43:16 -07:00
Phillip Webb a2cea6a45a Upgrade amqp-client to 5.4.1
See gh-14259
2018-09-05 13:41:50 -07:00
Phillip Webb ec27137632 Merge branch '1.5.x' into 2.0.x 2018-09-05 13:40:48 -07:00
Phillip Webb 8c34e053f5 Update copyright header of changed files 2018-09-05 13:09:03 -07:00
Phillip Webb c3de4c84f2 Polish 2018-09-05 12:54:20 -07:00
Stephane Nicoll 9dec5811fb Polish "Add reference to Stripe Payment Gateway Service starter"
Closes gh-14304
2018-09-05 17:39:59 +02:00
pankajtandon 40e574c3c2 Add reference to Stripe Payment Gateway Service starter
See gh-14304
2018-09-05 17:39:31 +02:00
Andy Wilkinson b580dd70f8 Polish 2018-09-05 14:28:48 +01:00
Andy Wilkinson da13871f84 Merge branch '2.0.x' 2018-09-05 14:28:11 +01:00
Andy Wilkinson 86d87ad215 Polish 2018-09-05 14:26:51 +01:00
Andy Wilkinson 7442e37154 Add JAXB API to Data JPA starter so it works out-of-the-box on Java 9+
Closes gh-14287
2018-09-05 14:23:18 +01:00
Stephane Nicoll 304c6a02ba Polish "Make it possible to disable the BackgroundPreinitializer"
Closes gh-14298
2018-09-05 14:33:54 +02:00
artsiom 5779767513 Make it possible to disable the BackgroundPreinitializer
See gh-14298
2018-09-05 14:32:56 +02:00
Stephane Nicoll 5f56adc334 Add activation API to WebServices samples on Java 11+
Closes gh-14308
2018-09-05 14:17:31 +02:00
Stephane Nicoll 7ff41e7c8c Polish 2018-09-05 13:39:51 +02:00
Stephane Nicoll ca8be3f6bd Polish "Add Health details using maps"
Closes gh-14305
2018-09-05 13:39:18 +02:00
Michael Pratt 5c86f9eca4 Add Health details using maps
See gh-14305
2018-09-05 13:20:03 +02:00
Stephane Nicoll 45204d7ee0 Harmonize JAXB version in dependency management
Closes gh-14308
2018-09-05 10:35:28 +02:00
Stephane Nicoll 3469142fec Partially revert 59d911d
This commit restores the public `UsesUnsafeJava` and flag it as
deprecated.

Closes gh-14072
2018-09-05 09:42:18 +02:00
Stephane Nicoll 5df75e74ae Update property description 2018-09-05 09:31:38 +02:00
Stephane Nicoll 9da0b25890 Merge branch '2.0.x' 2018-09-05 09:29:45 +02:00
Stephane Nicoll c410f7d153 Merge branch '1.5.x' into 2.0.x 2018-09-05 09:29:29 +02:00
Johnny Lim 49c760d275 Update @since tag
This commit updates @since tag in CloudServiceConnectorsAutoConfiguration
as it has been renamed in cfd0ab7646.

Closes gh-14297
2018-09-05 08:46:25 +02:00
Madhura Bhave f0d7533e0b Merge branch '2.0.x' 2018-09-04 17:09:52 -07:00
Madhura Bhave 9c82d5c382 Make ApplicationContextServerWebExchangeMatcher and subclasses thread-safe
Fixes gh-14161
2018-09-04 17:06:24 -07:00
Phillip Webb 9d1b3a2b49 Merge branch '2.0.x' 2018-09-04 16:25:17 -07:00
Phillip Webb cafff43022 Update copyright header of changed files 2018-09-04 16:19:05 -07:00
Phillip Webb 9af6b3422f Polish 2018-09-04 16:18:47 -07:00
Madhura Bhave 75937f5b5c Make jmsListenerContainerFactory @ConditionalOnSingleCandidate
Closes gh-12700
2018-09-04 16:06:18 -07:00
Phillip Webb 59b5c54489 Upgrade to Rabbit AMQP Client to 5.4.0
Closes gh-14303
2018-09-04 15:21:06 -07:00
Phillip Webb 0cd64ea690 Merge branch '2.0.x' 2018-09-04 15:15:57 -07:00
Phillip Webb 45613f8c3c Merge branch '1.5.x' into 2.0.x 2018-09-04 15:12:22 -07:00
Andy Wilkinson 8ee4775820 Polish 2018-09-04 20:46:35 +01:00
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
2018-09-04 15:37:39 +02:00
Stephane Nicoll 3e745eefc0 Upgrade to Spring Batch 4.1.0.M3
Closes gh-14296
2018-09-04 15:18:54 +02:00
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
2018-09-04 15:04:02 +02:00
Stephane Nicoll c0e45b7333 Adapt to Spring Framework API change 2018-09-04 14:09:57 +02:00
Stephane Nicoll cb7de2a963 Allow binding number to DataSize
Closes gh-14294
2018-09-04 11:04:22 +02:00
Stephane Nicoll 8771b34c15 Polish "Align max HTTP header size configuration"
Closes gh-14234
2018-09-04 10:51:54 +02:00
qct dbbb378650 Align max HTTP header size configuration
See gh-14234
2018-09-04 10:51:36 +02:00
Johnny Lim 5427d778fe Polish
Closes gh-14293
2018-09-04 08:52:55 +02:00
Stephane Nicoll 3d732e86f4 Merge branch '2.0.x' 2018-09-04 08:52:35 +02:00
Johnny Lim ca57e58ee5 Polish
See gh-14293
2018-09-04 08:52:13 +02:00
Stephane Nicoll e0ee4f22a5 Merge branch '2.0.x' 2018-09-04 08:49:04 +02:00
Johnny Lim 3eef927499 Use InvalidEndpointRequestException for MetricsEndpoint
Closes gh-14291
2018-09-04 08:33:33 +02:00
Brian Clozel 1a20e7efa1 Merge branch '2.0.x' 2018-09-03 21:05:18 +02:00
Kedar Joshi 72ebfb0332 Update default compressible media types
Closes gh-14278
2018-09-03 19:13:09 +02:00
Stephane Nicoll 3dfece779c Upgrade to Kotlin 1.2.61
Closes gh-14290
2018-09-03 14:10:30 +02:00
Stephane Nicoll 960acb0cbf Merge branch '2.0.x' 2018-09-03 12:16:32 +02:00
Stephane Nicoll 42bf594d96 Polish condition name
See gh-14285
2018-09-03 12:16:18 +02:00
artsiom 11f0f668ff Throw an exception on invalid syntax in SPRING_APPLICATION_JSON
Closes gh-14251
2018-09-03 11:28:02 +02:00
Stephane Nicoll 5a1aefc76f Merge branch '2.0.x' 2018-09-03 11:17:59 +02:00
Stephane Nicoll ddeae9b58e Polish "Fix WSDL locations condition to work with a list"
Closes gh-14285
2018-09-03 11:09:44 +02:00
Eneias Cordeiro da Silva 80358f7fbf Fix WSDL locations condition to work with a list
See gh-14285
2018-09-03 11:06:34 +02:00
Stephane Nicoll 143ca5d1fa Merge branch '2.0.x' 2018-09-03 10:00:54 +02:00
Stephane Nicoll 6078865372 Merge branch '1.5.x' into 2.0.x 2018-09-03 10:00:31 +02:00
Johnny Lim d510bc71b1 Polish
Closes gh-14271
2018-09-03 08:53:07 +02:00
Stephane Nicoll 7dff13b632 Merge branch '2.0.x' 2018-09-03 08:52:46 +02:00
Stephane Nicoll 8950c3ebb4 Polish
See gh-14271
2018-09-03 08:51:51 +02:00
Stephane Nicoll 314cd34716 Merge branch '2.0.x' 2018-09-02 09:04:08 +02:00
Stephane Nicoll 00233cd57e Merge branch '1.5.x' into 2.0.x 2018-09-02 09:03:42 +02:00
Madhura Bhave f3dbd946de Document how to test secure mockmvc tests
See gh-14227
2018-08-31 12:47:25 -07:00
Stephane Nicoll 8b753297c3 Merge branch '2.0.x' 2018-08-31 15:24:11 +02:00
Stephane Nicoll ea2fb620b4 Clarify structure of prefixes
Closes gh-14258
2018-08-31 15:23:53 +02:00
Stephane Nicoll 4634811c7c Polish 2018-08-31 14:45:17 +02:00
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
2018-08-31 14:45:03 +02:00
Stephane Nicoll 2fc557a5a9 Improve WebSocket documentation for reactive applications
Closes gh-14069
2018-08-31 11:53:51 +02:00
Stephane Nicoll 374cf2c781 Merge branch '2.0.x' 2018-08-31 11:35:03 +02:00
Stephane Nicoll 6d637bc53b Add missing condition
Closes gh-14264
2018-08-31 11:34:32 +02:00
Madhura Bhave b16927ce91 Add @WithMockUser to tests
See gh-14227
2018-08-30 18:55:02 -07:00
Madhura Bhave 8f946260d2 Update copyright year for changed files 2018-08-30 16:56:37 -07:00
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
2018-08-30 16:47:31 -07:00
Madhura Bhave d91c71b508 Deprecate secure flag on @WebMvcTest
Closes gh-14227
2018-08-30 16:47:31 -07:00
Phillip Webb 174f53e1cf Merge branch '2.0.x' 2018-08-30 16:02:25 -07:00
Phillip Webb 2e2f91d4a0 Merge branch '1.5.x' into 2.0.x 2018-08-30 15:59:02 -07:00
Stephane Nicoll 6c26315cd1 Merge branch '2.0.x' 2018-08-30 13:08:42 +02:00
Stephane Nicoll 0625443d27 Polish "Limit metrics collection of incoming requests"
Closes gh-14173
2018-08-30 12:59:07 +02:00
Dmytro Nosan 81a6701914 Limit metrics collection of incoming requests
See gh-14173
2018-08-30 12:26:06 +02:00
asomov 46c30d01e9 Upgrade to SnakeYAML 1.23
Closes gh-14224
2018-08-30 11:31:11 +02:00
Stephane Nicoll 0590c4de32 Merge branch '2.0.x' 2018-08-29 17:38:15 +02:00
Stephane Nicoll f9081a2c23 Revert "Polish some joining collectors"
See gh-14221
2018-08-29 17:37:33 +02:00
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
2018-08-29 15:46:03 +02:00
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
2018-08-28 15:40:54 -07:00
Madhura Bhave a54898b8f5 Remove explicit call to `authorizationCodeGrant`
See gh-13812
2018-08-28 13:56:03 -07:00
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
2018-08-28 13:49:07 -07:00
Stephane Nicoll 5af7835e83 Merge branch '2.0.x' 2018-08-28 17:18:20 +02:00
dreis2211 afda71e419 Polish some joining collectors
Closes gh-14221
2018-08-28 17:17:46 +02:00
Stephane Nicoll b7ae55866e Polish "Improve Kafka Auto-configuration"
Closes gh-14215
2018-08-28 17:10:49 +02:00
Gary Russell 59c6dc5c7a Improve Kafka Auto-configuration
- transaction manager
- error handler
- after rollback processor

See gh-14215
2018-08-28 16:22:12 +02:00
Stephane Nicoll e8d21fc964 Merge branch '2.0.x' 2018-08-28 16:21:33 +02:00
Stephane Nicoll 3997b3ae5e Polish 2018-08-28 16:21:17 +02:00
Stephane Nicoll 56329e67d7 Polish "Add support for com.mongodb.client.MongoClient"
Closes gh-14176
2018-08-28 15:24:31 +02:00
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
2018-08-28 14:52:24 +02:00
Johnny Lim 46415cb859 Add Spring Boot starter for Narayana in doc
Closes gh-14220
2018-08-28 14:44:45 +02:00
Stephane Nicoll dd94adbc11 Merge branch '2.0.x' 2018-08-28 09:14:35 +02:00
Stephane Nicoll ff11166af8 Restore RabbitMQ advanced starter as it is compatible with Spring Boot 2 2018-08-28 09:14:20 +02:00
Madhura Bhave f3fa952cbc Support WebExceptionHandler in @WebFluxTest
Closes gh-13627
2018-08-27 16:35:49 -07:00
Madhura Bhave 35d7bb7f34 Polish "issuer uri in reactive resource-server config"
Closes gh-14199
2018-08-27 14:10:40 -07:00
artsiom 04b7c4c6d9 Support issuer uri in reactive OAuth2 resource-server config 2018-08-27 14:10:32 -07:00
Stephane Nicoll db27d8fdf8 Revert "Polish dependency management for OIDC starter"
This reverts commit 3ad3cfd7e2.

Closes gh-14137
2018-08-27 18:28:27 +02:00
Stephane Nicoll 20c8f61473 Merge branch '2.0.x' 2018-08-27 18:20:42 +02:00
dreis2211 70add0617a Collapse identical catch blocks
Closes gh-14213
2018-08-27 18:18:06 +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 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
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
Johnny Lim fe3fe0fa63 Polish
Closes gh-14202
2018-08-26 10:48:05 +02: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
mhyeon.lee c827530f4b Add user-info-authentication-method
Closes gh-13865
2018-08-24 12:38:27 -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
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
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