Commit Graph

5552 Commits

Author SHA1 Message Date
Andy Wilkinson d3541fa672 Upgrade to Tomcat 9.0.19
Closes gh-16591
2019-04-17 11:38:47 +01:00
Andy Wilkinson 853b4952a0 Upgrade to Tomcat 9.0.19
Closes gh-16591
2019-04-17 11:36:04 +01:00
Johnny Lim 2b2afd785b Polish
Closes gh-16575
2019-04-17 11:57:48 +02:00
Stephane Nicoll a79e49f1dd Merge branch '2.1.x' 2019-04-17 11:57:32 +02:00
Johnny Lim 363994515b Polish
See gh-16575
2019-04-17 11:56:31 +02:00
Stephane Nicoll b710dc71fe Polish "Use BatchErrorHandler when Kafka listener type is batch"
Closes gh-16499
2019-04-17 11:36:10 +02:00
Andy Wilkinson 7d2a99943f Merge branch '2.1.x' 2019-04-17 09:26:28 +01:00
Andy Wilkinson dfbc787737 Test the Gradle plugin against Gradle 5.4
Closes gh-16576
2019-04-17 09:25:28 +01:00
Madhura Bhave bb7940f8e4 Use BatchErrorHandler when Kafka listener type is batch
Closes gh-16499
2019-04-16 15:51:10 -07:00
Madhura Bhave ac2b0093c7 Disable DevTools' post-processors and auto-config when running tests
Closes gh-5307
2019-04-16 11:07:33 -07:00
Andy Wilkinson dacbb65fd7 Merge branch '2.0.x' into 2.1.x
Closes gh-16579
2019-04-16 15:47:17 +01:00
Andy Wilkinson 7260c0f2c4 Merge branch '1.5.x' into 2.0.x 2019-04-16 15:46:49 +01:00
Andy Wilkinson 4941217323 Update docs to reflect rename of @ConfigurationPropertiesDefaultValue
See gh-8762
2019-04-16 10:25:48 +01:00
Andy Wilkinson e7455b454b Merge branch '2.1.x'
Closes gh-16564
2019-04-16 09:47:03 +01:00
Andy Wilkinson 043f0ffbeb Restore indentation in published spring-boot-starter-parent pom
Closes gh-16466
2019-04-16 09:46:16 +01:00
Andy Wilkinson 4e97f7998c Add missing RSocket dependency management
Closes gh-16568
2019-04-16 09:40:29 +01:00
Andy Wilkinson c722cc96fc Merge branch '2.1.x'
Closes gh-16572
2019-04-16 09:12:03 +01:00
Andy Wilkinson 4e4d5f0539 Remove dependency management for solr-uima following upgrade to 7.7.1
Closes gh-16490
2019-04-16 09:10:16 +01:00
Phillip Webb 5f1bbf8c72 Update copyright header of changed files 2019-04-15 17:51:08 -07:00
Phillip Webb 7d4118a0fe Align withBean methods with ApplicationContext
Rework `AbstractApplicationContextRunner.withBean` methods to
align signatures as much as possible with those provided by
the `ApplicationContext`.

Also update the implementation to use a dedicate member
variable rather than adding initializers.

Closes gh-16011
2019-04-15 17:51:08 -07:00
Phillip Webb 2dfd916c96 Polish 2019-04-15 17:51:08 -07:00
Madhura Bhave dabe75a281 Merge branch '2.1.x' 2019-04-15 17:10:07 -07:00
Madhura Bhave f0544fb86f Polish 2019-04-15 17:09:47 -07:00
Madhura Bhave bf6f9b4c43 Polish "Add property for mongo auto-index creation"
See gh-16454
2019-04-15 16:52:44 -07:00
ayudovin 2e9005de14 Add property to configure Mongo auto index creation
Closes gh-16454
2019-04-15 16:38:54 -07:00
Madhura Bhave 08260388bf Merge branch '2.1.x' 2019-04-15 16:30:07 -07:00
Rudy Adams 0aa25fb742 Add tests for CompressionConnectorCustomizer
Closes gh-16515
2019-04-15 16:17:29 -07:00
Madhura Bhave 1d20c73d22 Make nested classes in JsonTestersAutoConfiguration package private
Closes gh-15444
2019-04-15 16:03:31 -07:00
Brian Clozel 8ac69442f1 Deprecate ElasticsearchHealthIndicator
Since the transport client has been deprecated in gh-15008, the health
indicator for that should be deprecated as well.

See gh-15008
2019-04-16 00:26:59 +02:00
Brian Clozel 60cf80f8ce Upgrade to Spring Batch 4.2.0.M1
Closes gh-16529
2019-04-16 00:23:31 +02:00
Brian Clozel ddd400ff87 Upgrade to Spring Integration 5.2.0.M1
Closes gh-16531
2019-04-16 00:22:39 +02:00
Brian Clozel 2e107929a0 Upgrade to Elasticsearch 6.7.1
Closes gh-16569
2019-04-16 00:21:17 +02:00
Brian Clozel 687c58d62c Revert "Upgrade to asciidoctor-maven-plugin 1.6.0"
This commit introduced an incompatible change in the asciidoct
API: both asciidoctorj-pdf and spring-asciidoctor-extensions
expect `org.asciidoctor.extension.JavaExtensionRegistry` to be
a class, not an interface.

This reverts commit 120ffb1ed0.
2019-04-15 23:05:22 +02:00
Brian Clozel c0a360fd71 Fix imports ordering 2019-04-15 21:50:56 +02:00
Brian Clozel 71362299ae Polish RSocket server bootstrap
See gh-16021
2019-04-15 21:42:21 +02:00
Andy Wilkinson d4c47a13a0 Upgrade to Spring Security 5.2.0.M2
Closes gh-16534
2019-04-15 19:30:45 +01:00
Stephane Nicoll 9b0c1d305c Upgrade to Spring Session Corn-M1
Closes gh-16532
2019-04-15 17:38:03 +02:00
Stephane Nicoll 120ffb1ed0 Upgrade to asciidoctor-maven-plugin 1.6.0 2019-04-15 16:52:57 +02:00
Stephane Nicoll f9c74d983f Merge branch '2.1.x'
Closes gh-16565
2019-04-15 16:18:22 +02:00
Stephane Nicoll e99deb95f7 Fix source detection in case of multiple candidates
This commit improves the detection of a property source when more than
one group with the same type exist.

Closes gh-16549
2019-04-15 16:17:11 +02:00
Andy Wilkinson 84df37fd73 Merge branch '2.1.x'
Closes gh-16564
2019-04-15 14:27:02 +01:00
Andy Wilkinson bb0037f041 Restore indentation in published spring-boot-dependencies pom
The move to an HTTPS URL for the xmlns:xslt identifier has the unwanted
side-effect of disabling indentation.

This commit moves back to an HTTPS URL. It also changes the indent size
to 2, aligning with the size used by all the other poms that are written
by the flatten plugin.

Closes gh-16466
2019-04-15 14:26:52 +01:00
Andy Wilkinson 9d1f584560 Adapt Gradle plugin tests to change in Kotlin's packaging
Closes gh-16554
2019-04-15 12:36:58 +01:00
Brian Clozel b35424478b Deprecate Elasticsearch transport and Jest clients
As of Spring Data Moore, the Elasticsearch high level REST client is
supported for Spring Data repositories. The transport client is now
deprecated and is likely to be removed in a future Spring Data release.

This commit deprecates the transport client and marks all the associated
configuration properties as deprecated. The Spring Boot starter depends
on the `spring-data-elasticsearch` project, which now depends on both
transport client and high level REST client.

This commit also deprecates the Jest client, as Spring Boot will focus
on supporting the high level REST client and the reactive client
provided by Spring Data - both being in sync with the fast release pace
of Elasticsearch.

Closes gh-15008
2019-04-15 12:05:07 +02:00
Stephane Nicoll fe9da06a7e Remove outdated exclusion to http-client
Closes gh-16510
2019-04-15 10:38:17 +02:00
Stephane Nicoll 5e281fa8ec Switch to snapshots in preparation for the release 2019-04-15 10:17:25 +02:00
Stephane Nicoll 5c37e68a2b Upgrade to Spring AMQP 2.2.0.M1
Closes gh-16530
2019-04-15 09:57:40 +02:00
Sebastien Deleuze 86c75b9fd3 Upgrade to Kotlin 1.3.30
Closes gh-16554
2019-04-15 08:39:46 +02:00
Madhura Bhave b4d6ac1f41 Fix javadoc 2019-04-12 12:32:23 -07:00
Madhura Bhave 7bbeeaa4d2 Fix build following Spring Security changes 2019-04-12 12:24:35 -07:00
Madhura Bhave 8fd8a9b618 Fix javadoc 2019-04-12 11:55:06 -07:00
Madhura Bhave 62ec8f373a Forwarded header auto-config should be conditional on missing bean
See gh-5677
2019-04-12 11:34:38 -07:00
Madhura Bhave 959e161555 Provide an option to use Spring's forwarded header support
Previously, if the `server.use-forward-headers` property
was set to true, X-Forwarded-* headers support was provided
at the server level. The property has been deprecated in favor
of `server.forward-headers-strategy` which can be also be configured
to use Spring's forwarded header support apart from native server support.

Closes gh-5677
2019-04-12 10:34:19 -07:00
Stephane Nicoll 33fecec4a8 Upgrade to Spring Kafka 2.3.0.M1
Closes gh-16302
2019-04-12 12:45:02 +02:00
Brian Clozel ddc8b6f6b9 Fix Javadoc build for new RSocket dependencies
See gh-16021
2019-04-11 21:07:26 +02:00
Brian Clozel 9eb7260699 Polish RSocket server support
Relax the `NettyRSocketBootstrap` contract to allow all types of
`SocketAcceptor` implementations.

See gh-16021
2019-04-11 20:52:49 +02:00
Brian Clozel 2112e02eda Polish
Closes gh-15952
2019-04-11 19:07:14 +02:00
Dmytro Nosan 2c20d01e25 Add requestId info to ErrorAttributes in WebFlux
See gh-15952
2019-04-11 19:06:52 +02:00
Brian Clozel b33944b53f Add RSocket server support with Spring Messaging
This commit adds support for RSocket server applications.
The auto-configuration will either add RSocket support to an existing
Reactor Netty server in a WebFlux application (as a WebSocket endpoint),
or bootstrap a brand new RSocket server instance.

Spring Boot will also auto-configure the Spring Messaging infrastructure
that supports Controller beans with `@MessageMapping` annotated methods.

Fixes gh-16021
2019-04-11 15:44:17 +02:00
Stephane Nicoll 5e58f4a8c6 Fix unresolved directives in generated documentation
Closes gh-16452
2019-04-11 14:31:41 +02:00
Stephane Nicoll a5f29bb36b Upgrade to Spring Data Moore M3
Closes gh-16528
2019-04-11 13:59:12 +02:00
Stephane Nicoll 4d4566e0f9 Merge branch '2.1.x' 2019-04-11 13:55:34 +02:00
Adam Michalik 55987a51c7 Fix package of java.time.Duration in documentation
Closes gh-16527
2019-04-11 13:54:18 +02:00
Stephane Nicoll cb4aa4cef4 Upgrade to Jooq 3.11.11
Closes gh-16525
2019-04-11 12:44:10 +02:00
Stephane Nicoll 6d7b5bea5c Upgrade to Infinispan 9.4.12.Final
Closes gh-16524
2019-04-11 12:44:08 +02:00
Stephane Nicoll b2f73f8974 Upgrade to Aspectj 1.9.3
Closes gh-16523
2019-04-11 12:44:07 +02:00
Stephane Nicoll 071128c44e Upgrade to Undertow 2.0.20.Final
Closes gh-16522
2019-04-11 12:44:06 +02:00
Vedran Pavic bbaa98175f Upgrade to Hazelcast 3.12
Closes gh-16503
2019-04-11 12:38:47 +02:00
Stephane Nicoll 61f9816361 Upgrade to Neo4j Ogm 3.2.0-alpha05
Closes gh-16521
2019-04-11 11:11:44 +02:00
Stephane Nicoll 94775b796d Upgrade to Mongodb 3.10.2
Closes gh-16520
2019-04-11 11:11:43 +02:00
Stephane Nicoll 44176c12e1 Upgrade to Junit Jupiter 5.4.2
Closes gh-16519
2019-04-11 11:11:42 +02:00
Stephane Nicoll d4117699e4 Upgrade to Rabbit Amqp Client 5.7.0
Closes gh-16518
2019-04-11 11:11:41 +02:00
Brian Clozel 054c8ee0c4 Upgrade to Spring Framework 5.2.0.M1
Fixes gh-16173
2019-04-10 12:08:54 +02:00
Brian Clozel 3e56707132 Overriding getMappingPathPatterns is not required
After a hierarchy change in Spring Framework in gh-22543,
`AbstractWebFluxEndpointHandlerMapping` doesn't need to override the
`getMappingPathPatterns` method anymore.
2019-04-10 08:41:14 +02:00
Johnny Lim 4392d7c2ed Polish
Closes gh-16494
2019-04-10 08:03:18 +02:00
Stephane Nicoll ee735a61ce Polish
See gh-15814
2019-04-09 14:20:52 +02:00
Stephane Nicoll f42b6199ae Polish 2019-04-09 12:21:28 +02:00
Stephane Nicoll a828072132 Migrate tests to use withBean
See gh-16011
2019-04-09 12:15:05 +02:00
Stephane Nicoll a780875390 Allow `ApplicationContextRunner` to accept simple bean definitions
This commit adds `withBean` methods to the `ApplicationContextRunner`
abstraction so that simple beans can be registered inline. This is a
nice alternative for cases where a inner configuration class has to be
defined for the purpose of creating a simple bean.

Closes gh-16011
2019-04-09 12:15:05 +02:00
Madhura Bhave 7054a33e70 Add support for public key file for OAuth2 resource server
Closes gh-15814
2019-04-08 18:17:12 -07:00
Stephane Nicoll cf1d6ca660 Polish "Add missing backquote"
Closes gh-16483
2019-04-08 09:46:28 +02:00
Kaze 530d3da6c9 Add missing backquote
See gh-16483
2019-04-08 09:46:12 +02:00
Stephane Nicoll 20e98cb999 Merge branch '2.1.x' 2019-04-07 17:14:46 +02:00
Stephane Nicoll 391c8b6274 Add reference to https://github.com/alimate/errors-spring-boot-starter 2019-04-07 17:14:14 +02:00
dreis2211 7042884042 Fix Thymeleaf deprecations
Closes gh-16478
2019-04-06 21:32:04 +02:00
Stephane Nicoll 84735f58f3 Fix build failure 2019-04-06 18:00:13 +02:00
dreis2211 52cd9c6cac Fix compilation error
Closes gh-16476
2019-04-06 17:26:22 +02:00
Madhura Bhave 3c203e9b0d Update devtools to use @Lazy(false)
Fixes gh-16184
2019-04-05 18:02:27 -07:00
Madhura Bhave ce0282406f Skip lazy init for beans that explicitly set lazy to false
This commit also adds tests to ensure that the child
management context works when lazy initialization is
enabled. Also, it adds a BeanFactoryPostProcessor to
the child context so that the server is created and
listening for requests but other beans in the child
context are not created until requested.

See gh-16184
2019-04-05 18:02:26 -07:00
Andy Wilkinson ff1e5076dc Merge branch '2.1.x'
Closes gh-16473
2019-04-05 17:37:24 +01:00
Andy Wilkinson c0a91478f1 Only start management server once main server is initialized
Closes gh-15378
2019-04-05 17:36:20 +01:00
Phillip Webb 8626a33bbb Polish "Migrate ApplicationContext to common hierarchy"
Users calling the methods will still face problems but at least they
will have some guidance.

Closes gh-16096
2019-04-05 14:17:49 +02:00
Stephane Nicoll c432288ed1 Migrate ApplicationContext to common hierarchy
This commit migrates `AnnotationConfigReactiveWebApplicationContext`
parent to the `GenericApplicationContext` abstraction. Any use of
`AnnotationConfigWebApplicationContext` is also removed as it also
inherits from the `AbstractRefreshableApplicationContext` outdated
hierarchy.

A new `AnnotationConfigServletWebApplicationContext` context is
introduced instead, extending from `GenericApplicationContext` and
providing the counter part of the reactive context for the Servlet-based
web app tests.

See gh-16096
2019-04-05 14:17:41 +02:00
Stephane Nicoll dbf8245c1d Polish "Polish embedded tomcat setup"
Closes gh-16446
2019-04-05 08:44:54 +02:00
Rudy Adams 06028f83b2 Polish embedded tomcat setup
See gh-16446
2019-04-05 08:44:54 +02:00
Madhura Bhave 7587af343d Merge pull request #16342 Pascal Zwick
* pr/16342:
  Polish "Simplify the configuration of the ProtocolHandler"
  Simplify the configuration of the ProtocolHandler
2019-04-04 12:41:15 -07:00
Madhura Bhave ad767ca4e1 Polish "Simplify the configuration of the ProtocolHandler"
Closes gh-16342
2019-04-04 12:41:05 -07:00
Pascal Zwick 2eaa64f82e Simplify the configuration of the ProtocolHandler
This commit introduces a new callback interface that can
be used to customize the ProtocolHandler on a Tomcat Connector.

See gh-16342
2019-04-04 12:24:47 -07:00
Stephane Nicoll 0972ef3422 Merge branch '2.1.x'
Closes gh-16451
2019-04-04 16:00:34 +02:00
Stephane Nicoll fbb5ffe0a4 Avoid infinite cycle resolving generic type that refers itself
This commit improves type resolution for a unresolved generic type that
uses itself in its upper bound declaration.

Closes gh-16451
2019-04-04 15:55:55 +02:00
Andy Wilkinson 537a97c1e5 Merge branch '2.1.x'
Closes gh-16461
2019-04-04 14:40:54 +01:00
Andy Wilkinson 8a04e2cc86 Honor custom change log tables in Liquibase endpoint
Closes gh-16442
2019-04-04 14:40:47 +01:00
Stephane Nicoll bb4e559724 Let Hibernate detect the dialect to use
Closes gh-16172
2019-04-04 14:10:01 +02:00
Stephane Nicoll 5f6d8e1ead Polish 2019-04-04 11:16:09 +02:00
Stephane Nicoll 763c1a99e0 Polish 2019-04-04 11:01:10 +02:00
Phillip Webb 8aec4de399 Merge branch '2.1.x' 2019-04-03 17:34:01 -07:00
Phillip Webb 617f97f788 Fix checkstyle violation 2019-04-03 17:33:34 -07:00
Phillip Webb ddbfb2530d Update copyright header of changed files 2019-04-03 17:01:00 -07:00
Phillip Webb ad7eebee9e Merge branch '2.1.x' 2019-04-03 17:00:25 -07:00
Phillip Webb f12ab1ff90 Update copyright header of changed files 2019-04-03 16:13:00 -07:00
Phillip Webb 34fee1adfa Polish 2019-04-03 16:12:37 -07:00
Andy Wilkinson c5c53849ce Merge branch '2.1.x' 2019-04-03 14:41:15 +01:00
Andy Wilkinson e404ac39bf Upgrade to Spring Integration 5.1.4
See gh-16350
2019-04-03 14:40:59 +01:00
Andy Wilkinson efd2f685d3 Upgrade to Spring Session Bean-SR4
See gh-16357
2019-04-03 14:40:59 +01:00
Andy Wilkinson c3b5d9c363 Upgrade to Sqlite Jdbc 3.27.2
Closes gh-16440
2019-04-03 14:40:59 +01:00
Andy Wilkinson 4cf273770c Upgrade to Mockito 2.25.1
Closes gh-16439
2019-04-03 14:40:59 +01:00
Andy Wilkinson 78a15c2234 Upgrade to Mariadb 2.4.1
Closes gh-16438
2019-04-03 14:40:59 +01:00
Andy Wilkinson 3fd0c26402 Upgrade to Junit Jupiter 5.4.1
Closes gh-16437
2019-04-03 14:40:28 +01:00
Andy Wilkinson 62462c9ced Upgrade to Hibernate 5.4.2.Final
Closes gh-16436
2019-04-03 14:40:28 +01:00
Andy Wilkinson fe4d96e60b Upgrade to Elasticsearch 6.6.2
Closes gh-16435
2019-04-03 14:40:28 +01:00
Andy Wilkinson 8b195940a6 Upgrade to Assertj 3.12.2
Closes gh-16434
2019-04-03 14:40:28 +01:00
Andy Wilkinson e7261f3d3f Upgrade to Artemis 2.7.0
Closes gh-16432
2019-04-03 14:40:28 +01:00
Andy Wilkinson 7661287760 Upgrade to Thymeleaf Layout Dialect 2.4.1
Closes gh-16431
2019-04-03 14:40:28 +01:00
Andy Wilkinson 674a96e369 Upgrade to Classmate 1.5.0
Closes gh-16430
2019-04-03 14:40:28 +01:00
Andy Wilkinson ca0119950f Align with new fail-fast behaviour in Micrometer 1.1.4
Closes gh-16425
2019-04-03 14:39:29 +01:00
Stephane Nicoll 5f4bd37eb1 Merge branch '2.1.x' 2019-04-03 13:56:58 +02:00
Stephane Nicoll 3c058585bf Upgrade to Micrometer 1.1.4
Close gh-16425
2019-04-03 13:54:41 +02:00
Andy Wilkinson e3f4d4a165 Merge branch '2.1.x' 2019-04-03 11:40:31 +01:00
Andy Wilkinson 961b0307d6 Upgrade to Netty Tcnative 2.0.24.Final
Closes gh-16429
2019-04-03 11:40:21 +01:00
Andy Wilkinson 1db848af0d Upgrade to Solr 6.6.6
Closes gh-16428
2019-04-03 11:38:16 +01:00
Stephane Nicoll c5d0ebccff Merge branch '2.1.x' 2019-04-03 12:09:42 +02:00
Brian Clozel f221061d81 Avoid bean method proxying in WebMVC and WebFlux config
This commit applies changes similar to what's been done in gh-9068, for
MVC and WebFlux configurations. This is now possible thanks to the
changes done in Spring Framework in
https://github.com/spring-projects/spring-framework/pull/22596

Fixes gh-16427
2019-04-03 12:08:29 +02:00
Stephane Nicoll a90d0a224f Upgrade to Spring Batch 4.1.2
Closes gh-16423
2019-04-03 12:07:09 +02:00
Stephane Nicoll 3fb8d504c5 Upgrade to Spring Batch 4.0.3
Closes gh-16422
2019-04-03 12:04:40 +02:00
Stephane Nicoll edb5937571 Merge branch '2.1.x' 2019-04-03 11:46:58 +02:00
Johnny Lim 9fae1e5d0e Check for Reactor Netty disconnected client errors
Closes gh-16046
2019-04-03 11:45:51 +02:00
Andy Wilkinson 5c4537add9 Merge branch '2.1.x' 2019-04-03 09:52:58 +01:00
Andy Wilkinson 52ebf20cbf Merge branch '2.0.x' into 2.1.x 2019-04-03 09:52:45 +01:00
Andy Wilkinson bfe65c8a5c Merge branch '1.5.x' into 2.0.x 2019-04-03 09:52:28 +01:00
Stephane Nicoll 445870941f Upgrade to Spring Session Bean-SR4
Closes gh-16357
2019-04-03 10:11:49 +02:00
Stephane Nicoll 03762d5a96 Upgrade to Spring Session Apple-SR9
Closes gh-16356
2019-04-03 10:10:27 +02:00
Stephane Nicoll c57b4fcb04 Upgrade to Spring Integration 5.1.4
Closes gh-16350
2019-04-03 10:08:48 +02:00
Stephane Nicoll 1acc3d7161 Upgrade to Spring Integration 5.0.13
Closes gh-16349
2019-04-03 10:07:29 +02:00
Andy Wilkinson bc00ad0fc5 Merge branch '2.1.x' 2019-04-03 08:32:34 +01:00
Andy Wilkinson 7b151f2a11 Merge branch '2.0.x' into 2.1.x 2019-04-03 08:32:22 +01:00
Andy Wilkinson 49423645f7 Merge branch '1.5.x' into 2.0.x 2019-04-03 08:32:11 +01:00
Andy Wilkinson 925850f267 Upgrade to Kafka 2.2.0
Closes gh-16420
2019-04-03 08:16:52 +01:00
Andy Wilkinson 967aafedec Start building against Spring Kafka 2.3.0 snapshots
See gh-16302
2019-04-03 08:16:52 +01:00
dreis2211 03a5bb7857 Avoid using deprecated @SolrDocument#solrCoreName
Closes gh-16419
2019-04-03 09:02:23 +02:00
Phillip Webb 52e635b823 Merge branch '2.1.x' 2019-04-02 20:50:22 -07:00
Phillip Webb 912e0a87a8 Merge branch '2.0.x' into 2.1.x 2019-04-02 20:49:44 -07:00
Phillip Webb 8c2e0a61ae Merge branch '1.5.x' into 2.0.x 2019-04-02 20:48:00 -07:00
Madhura Bhave 04517495af Merge branch '2.1.x' 2019-04-02 15:52:35 -07:00
Madhura Bhave ddc52502f5 Document @MockBean behavior during context refresh
Closes gh-16333
2019-04-02 15:50:51 -07:00
Phillip Webb 2376f973f4 Merge branch '2.1.x' 2019-04-02 13:46:36 -07:00
Phillip Webb 47c6bf741d Merge branch '2.0.x' into 2.1.x 2019-04-02 13:40:21 -07:00
Phillip Webb 07c000c5b7 Merge branch '1.5.x' into 2.0.x 2019-04-02 13:34:28 -07:00
Andy Wilkinson 4e337f7466 Merge branch '2.1.x' 2019-04-02 19:55:12 +01:00
Andy Wilkinson b969d55e05 Upgrade to Spring Kafka 2.2.5
Closes gh-16351
2019-04-02 19:51:08 +01:00
Andy Wilkinson 08673c0191 Upgrade to Spring Security 5.1.5
Closes gh-16354
2019-04-02 19:49:48 +01:00
Andy Wilkinson da4a7203c7 Upgrade to Spring Security 5.0.12
Closes gh-16353
2019-04-02 19:45:35 +01:00
mmitropolitsky deaf5fa433 Replace ${sys:PID} with %pid in log4j2 configuration
Replacing property sys:PID which was set in the code with the default
log4j2 Pattern in log4j2.xml and log4j2-file.xml files.

Closes gh-16174
2019-04-02 17:07:54 +02:00
Stephane Nicoll df79808d38 Polish 2019-04-02 16:52:02 +02:00
Stephane Nicoll c4b1a22e89 Polish "Add Spring-specific styling to Gradle Plugin's documentation"
Closes gh-16327
2019-04-02 16:49:11 +02:00
Hendrig Sellik 466b57cd44 Add Spring-specific styling to Gradle Plugin's documentation
This commit replaces the default Asciidoctor styling with
Spring specific styling.

First, we need to unzip the contents of the Spring Asciidoctor
documentation resources provided by the
`io.spring.docsresources:spring-docs-resources` distribution zip. This
is done in a `/target/refdocs` folder. We then copy all files from
`src/main/asciidoc` to the same location, and then launch the generation
process.

See gh-16327
2019-04-02 16:38:50 +02:00
Stephane Nicoll 8c8a088c20 Fix zip structure of Actuator documentation
Closes gh-16326
2019-04-02 16:38:11 +02:00
Andy Wilkinson 9e7d922555 Allow processor cache to be configured to be unlimited
Closes gh-16415
2019-04-02 15:26:40 +01:00
Andy Wilkinson ea80ca2ffc Do not assume HTTP protocol when customizing processor cache
Closes gh-16413
2019-04-02 15:10:55 +01:00
Andy Wilkinson c5024f21a4 Merge branch '2.1.x' 2019-04-02 14:40:35 +01:00
Andy Wilkinson 6aa4fe579a Polish
See gh-16068
2019-04-02 14:40:18 +01:00
Stephane Nicoll 57cad53ea9 Adapt to latest API change 2019-04-02 15:17:23 +02:00
Andy Wilkinson e1a6726d76 Polish "Update CORS handling according to Framework changes"
See gh-16410
2019-04-02 12:48:00 +01:00
Sebastien Deleuze 2f9db7eec6 Update CORS handling according to Framework changes
This commit updates CORS handling according to Framework changes
introduced via [1]. It also fixes tests according to the new behavior.

See gh-16410

[1] d27b5d0ab6.
2019-04-02 12:47:07 +01:00
Andy Wilkinson 8ebe5f9983 Merge branch '2.1.x' 2019-04-02 11:17:28 +01:00
Andy Wilkinson f20d9a62ae Polish "Ensure that MongoClient's EventLoopGroup is shut down during context close"
See gh-16087
2019-04-02 11:09:14 +01:00
Dmytro Nosan ee7bed1849 Ensure that MongoClient's EventLoopGroup is shut down during context close
See gh-16087
2019-04-02 11:04:42 +01:00
Andy Wilkinson 4f42597aca Merge branch '2.1.x' 2019-04-02 10:53:14 +01:00
Andy Wilkinson 02b24b6ed3 Specify that log file endpoint's response is UTF-8 encoded
Closes gh-16189
2019-04-02 10:52:18 +01:00
Andy Wilkinson 512fbae715 Merge branch '2.1.x' 2019-04-02 10:47:30 +01:00
Andy Wilkinson 22c9364237 Only use AprLifecycleListener when native library is available
Closes gh-16040
2019-04-02 10:47:24 +01:00
Andy Wilkinson ac4d6bb10f Merge branch '2.1.x' 2019-04-02 10:27:45 +01:00
Andy Wilkinson db4623c519 Merge branch '2.0.x' into 2.1.x 2019-04-02 10:27:34 +01:00
Andy Wilkinson 7b5f46d6e3 Add Spring-Boot-* manifest attributes to jars and wars built with Gradle
Closes gh-16068
2019-04-02 10:13:09 +01:00
Andy Wilkinson 76450ec7ea Merge branch '2.1.x' 2019-04-02 09:52:16 +01:00
Andy Wilkinson d2c059f25f Upgrade to Spring AMQP 2.1.5
Closes gh-16347
2019-04-02 09:51:13 +01:00
Andy Wilkinson 336af93c7e Update to Spring AMQP 2.0.12
Closes gh-16346
2019-04-02 09:44:22 +01:00
Andy Wilkinson d33050220d Upgrade to Spring Data Lovelace-SR6
Closes gh-16360
2019-04-02 09:35:27 +01:00
Andy Wilkinson f4942b76f0 Upgrade to Spring Data Kay-SR14
Closes gh-16359
2019-04-02 09:33:28 +01:00
Madhura Bhave 8daa8c48fb Merge branch '2.1.x' 2019-04-01 15:51:25 -07:00
Madhura Bhave 768aa5dfcc Ignore exception if ValidationAdapter can't get a MessageInterpolator
Fixes gh-16177
2019-04-01 15:48:32 -07:00
Madhura Bhave c592e71449 Override missing methods in FilteredClassLoader
Closes gh-16404
2019-04-01 15:42:02 -07:00
Andy Wilkinson e74582d263 Merge branch '2.1.x' 2019-04-01 14:08:18 +01:00
Andy Wilkinson 23d237928b Merge branch '2.0.x' into 2.1.x 2019-04-01 14:08:07 +01:00
Andy Wilkinson 922ab115ab Switch custom repository to one with JDK 9-friendly SSL certification chain 2019-04-01 14:07:01 +01:00
Andy Wilkinson 2adb6b1fa4 Override version of Maven Site Plugin for JDK 9+181 compatibility
See gh-16400
2019-04-01 11:53:31 +01:00
Stephane Nicoll bd72ff5d83 Switch to snapshots 2019-03-31 19:41:05 +02:00
Stephane Nicoll 695dc8e992 Switch to snapshots 2019-03-31 19:37:43 +02:00
Stephane Nicoll 085ca0f915 Upgrade to Spring Framework 5.1.6.RELEASE
Closes gh-16340
2019-03-31 15:28:04 +02:00
Stephane Nicoll 165b9d950a Upgrade to Spring Framework 5.0.13.RELEASE
Closes gh-16339
2019-03-31 15:26:57 +02:00
Stephane Nicoll 076e327481 Polish "Complete support for customizing Tomcat's access log"
Closes gh-16039
2019-03-29 17:47:53 +01:00
Andrew McGhie f823ae488d Complete support for customizing Tomcat's access log
See gh-16039
2019-03-29 17:47:53 +01:00
Andy Wilkinson 6615e11e65 Merge branch '2.1.x' 2019-03-29 16:12:40 +00:00
Andy Wilkinson 4e734669fe Merge branch '2.0.x' into 2.1.x 2019-03-29 16:12:27 +00:00
Andy Wilkinson 7990c8ba68 Merge branch '1.5.x' into 2.0.x 2019-03-29 16:06:47 +00:00
Stephane Nicoll f4c4b1d3f0 Polish "Permit use of https for configuring Prometheus push gateway"
Closes gh-16084
2019-03-29 17:03:28 +01:00
Dmytro Nosan eed4e9ea56 Permit use of https for configuring Prometheus push gateway
See gh-16084
2019-03-29 16:48:27 +01:00
Stephane Nicoll d7d2c345c1 Merge branch '2.1.x' 2019-03-29 15:58:00 +01:00
Stephane Nicoll b894696efb Polish "Automatically detect log4j2.properties"
Closes gh-16262
2019-03-29 15:57:06 +01:00
Mohamed Rifni 2cb4403cd0 Automatically detect log4j2.properties
See gh-16262
2019-03-29 15:55:49 +01:00
Stephane Nicoll 1bc47b7e74 Polish "Add Spring-specific styling to Actuator's API documentation"
Closes gh-16326
2019-03-29 15:36:35 +01:00
Stephane Nicoll 604b0891d0 Use asciidoctor 1.5.8
This commit uses asciidoctor 1.5.8 for the time being. Once a new
version of the plugin is released, this override will be unnecessary.
2019-03-29 15:35:45 +01:00
simionAndrei 26cfbe04b2 Add Spring-specific styling to Actuator's API documentation
This commit replaces the default Asciidoctor styling with
Spring specific styling.

First, we need to unzip the contents of the Spring Asciidoctor
documentation resources provided by the
`io.spring.docsresources:spring-docs-resources` distribution zip. This
is done in a `/target/refdocs` folder. We then copy all files from
`src/main/asciidoc` to the same location, and then launch the generation
process.

See gh-16326
2019-03-29 15:35:45 +01:00
Stephane Nicoll d1507497d8 Merge branch '2.1.x' 2019-03-29 14:16:58 +01:00
Stephane Nicoll 1261c3960d Merge branch '2.0.x' into 2.1.x 2019-03-29 14:16:38 +01:00
Stephane Nicoll 28b38ddc9a Upgrade to Reactor Bom Bismuth-SR17
Closes gh-16372
2019-03-29 14:15:40 +01:00
Stephane Nicoll 4c1186cbd8 Merge branch '1.5.x' into 2.0.x 2019-03-29 14:12:52 +01:00
Stephane Nicoll 241171fcfa Merge branch '2.1.x' 2019-03-29 14:09:01 +01:00
liucheng.zhang 4d1717f18e Disable nulls serialization when serialize-nulls property is false
Closes gh-16332
2019-03-29 13:57:08 +01:00
Stephane Nicoll e80b6cfc44 Merge branch '2.1.x' 2019-03-29 13:41:01 +01:00
Stephane Nicoll 877a47f22b Upgrade to Jooq 3.11.10
Closes gh-16386
2019-03-29 13:36:59 +01:00
Stephane Nicoll e03f9e2467 Upgrade to Infinispan 9.4.11.Final
Closes gh-16385
2019-03-29 13:36:58 +01:00
Stephane Nicoll 3ae7257171 Upgrade to Hibernate 5.3.9.Final
Closes gh-16384
2019-03-29 13:36:57 +01:00
Stephane Nicoll 2af72170c6 Upgrade to Byte Buddy 1.9.12
Closes gh-16383
2019-03-29 13:36:57 +01:00
Stephane Nicoll 8ea0ecd07c Upgrade to Rxjava2 2.2.8
Closes gh-16382
2019-03-29 13:36:55 +01:00
Stephane Nicoll ab110ee39a Upgrade to Reactor Bom Californium-SR6
Closes gh-16381
2019-03-29 13:36:54 +01:00
Stephane Nicoll 59d2bc9bc6 Upgrade to Netty Tcnative 2.0.23.Final
Closes gh-16380
2019-03-29 13:36:53 +01:00
Stephane Nicoll 1d69d81f13 Upgrade to Lettuce 5.1.6.RELEASE
Closes gh-16379
2019-03-29 13:36:53 +01:00
Stephane Nicoll b4bfc4dc14 Merge branch '2.0.x' into 2.1.x 2019-03-29 13:34:52 +01:00
Stephane Nicoll 1a89087a87 Upgrade to Thymeleaf Extras Java8time 3.0.4.RELEASE
Closes gh-16378
2019-03-29 13:27:15 +01:00
Stephane Nicoll 7cff82647d Upgrade to Spring Cloud Connectors 2.0.5.RELEASE
Closes gh-16377
2019-03-29 13:27:15 +01:00
Stephane Nicoll e3e290e959 Upgrade to Quartz 2.3.1
Closes gh-16376
2019-03-29 13:27:15 +01:00
Stephane Nicoll 9ab942c54c Upgrade to Hibernate Validator 6.0.16.Final
Closes gh-16375
2019-03-29 13:27:15 +01:00
Stephane Nicoll 8c85f1a141 Upgrade to Elasticsearch 5.6.16
Closes gh-16374
2019-03-29 13:27:15 +01:00
Stephane Nicoll f7d2cc6aa7 Upgrade to Activemq 5.15.9
Closes gh-16373
2019-03-29 13:27:15 +01:00
Stephane Nicoll 49f2d1bd3e Upgrade to Netty 4.1.34.Final
Closes gh-16371
2019-03-29 13:23:25 +01:00
Stephane Nicoll ca9afa7b55 Upgrade to Micrometer 1.0.10
Closes gh-16370
2019-03-29 13:23:24 +01:00
Stephane Nicoll c88bfed669 Upgrade to Unboundid Ldapsdk 4.0.10
Closes gh-16369
2019-03-29 13:23:23 +01:00
Andy Wilkinson 5e22b421c5 Merge branch '2.1.x' 2019-03-29 11:14:06 +00:00
Andy Wilkinson 6aa78801ff Merge branch '2.0.x' into 2.1.x 2019-03-29 11:13:53 +00:00
Andy Wilkinson 21adbdef49 Upgrade to Tomcat 9.0.17
Closes gh-16367
2019-03-29 11:11:47 +00:00
Andy Wilkinson 6507d1723d Merge branch '1.5.x' into 2.0.x 2019-03-29 11:02:56 +00:00
Stephane Nicoll 270554d3cd Merge branch '2.1.x' 2019-03-29 11:40:15 +01:00
Stephane Nicoll 090f5f5397 Polish "Add error rendering support with @WebFluxTest"
Closes gh-16266
2019-03-29 11:36:27 +01:00
Ali Dehghani 53e7484d87 Add error rendering support with @WebFluxTest
See gh-16266
2019-03-29 11:07:26 +01:00
Stephane Nicoll 17a800b577 Merge branch '2.1.x' 2019-03-29 10:51:44 +01:00
Stephane Nicoll 62d9c0a8b3 Test against Gradle 5.3.1 2019-03-29 10:51:31 +01:00
Stephane Nicoll 680e2b223b Remove deprecated finalName attribute
See gh-16202
2019-03-29 10:46:28 +01:00
Stephane Nicoll cba1e8ada0 Merge branch '2.1.x' 2019-03-29 10:41:30 +01:00
Stephane Nicoll 04aadcdf2e Make sure custom finalName is ignored
A read-only plugin parameter can still be set by the user which leads
to an invalid repackaged archive. This commit actually ignores the field
and uses the standard attribute instead.

Closes gh-16202
2019-03-29 10:40:41 +01:00
Stephane Nicoll 6ab942f295 Polish 2019-03-29 10:19:43 +01:00