Commit Graph

8630 Commits

Author SHA1 Message Date
Scott Frederick 08e96427de Add command-line properties for Maven build-image options
This commit adds support for setting the image name and builder
parameters of the Maven spring-boot:build-image goal using command-line
properties as an alternative to plugin configuration in pom.xml. Per
Maven conventions, a value in pom.xml configuration will override a
command-line property when both are provided.

Fixes gh-20520
2020-03-17 18:40:37 -05:00
Stephane Nicoll f470f27666 Merge branch '2.2.x'
Closes gh-20549
2020-03-17 18:15:19 +01:00
dreis2211 d9171d0afe Use @Configuration(proxyBeanMethods=false) wherever possible
See gh-20541
2020-03-17 17:17:38 +01:00
Stephane Nicoll 58eb0ba4d3 Add additional timeout settings
This commit expands the `spring.couchbase.env.timeouts` configuration
namespace with timeouts for disconnect, key-value operations with a
durability level, search, analytics and management.

Closes gh-19893

Co-authored-by: Michael Nitschinger <michael@nitschinger.at>
2020-03-17 17:00:34 +01:00
Stephane Nicoll abe43b2e83 Upgrade to Couchbase SDK v3
This commit upgrades to the Couchbase SDK v3 which brings the following
breaking changes:

* Bootstrap hosts have been replaced by a connection string and the
authentication is now mandatory.
* A `Bucket` is no longer auto-configured. The
`spring.couchbase.bucket.*` properties have been removed
* `ClusterInfo` no longer exists and has been replaced by a dedicated
API on `Cluster`.
* `CouchbaseEnvironment` no longer exist in favour of
`ClusterEnvironment`, the customizer has been renamed accordingly.
* The bootstrap-related properties have been removed. Users requiring
custom ports should supply the seed nodes and initialize a Cluster
themselves.
* The endpoints-related configuration has been consolidated in a
single IO configuration.

The Spring Data Couchbase provides an integration with the new SDK. This
leads to the following changes:

* A convenient `CouchbaseClientFactory` is auto-configured.
* Repositories are configured against a bucket and a scope. Those can
be set via configuration in `spring.data.couchbase.*`.
* The default consistency property has been removed in favour of a more
flexible annotation on the repository query methods instead. You can now
specify different query consistency on a per method basis.
* The `CacheManager` implementation is provided, as do other stores for
consistency so a dependency on `couchbase-spring-cache` is no longer
required.

See gh-19893

Co-authored-by: Michael Nitschinger <michael@nitschinger.at>
2020-03-17 17:00:09 +01:00
Stephane Nicoll e3899df22c Configure Spring Data Couchbase explicitly
This commit configures Spring Data Couchbase explicitly rather than
relying on the abstract configuration class. This has the advantage of
simplifying the auto-configuration and let it us proxy-free
configuration classes.

Spring Boot no longer uses or interacts with CouchbaseConfigurer. Users
relying on that to teach Spring Boot which components to use should
rely on `@Primary` flag instead in case of multiple beans of the same
type.

`CouchbaseConfiguration` is no longer public as extending from it is
no longer necessary. If the `CouchbaseEnvironment` has to be
customized, a `CouchbaseEnvironmentBuilderCustomizer` bean can be
registered to tune the auto-configured environment.

Closes gh-20533
2020-03-17 16:20:21 +01:00
Andy Wilkinson 4544785a4f Merge branch '2.2.x'
Closes gh-20544
2020-03-17 12:52:52 +00:00
Andy Wilkinson 566f79b086 Merge branch '2.1.x' into 2.2.x
Closes gh-20543
2020-03-17 12:50:45 +00:00
Andy Wilkinson b51c7386aa Fix detection of application home for paths containing spaces
Fixes gh-20531
2020-03-17 12:41:26 +00:00
Madhura Bhave fb8b531bfd Polish 2020-03-16 17:45:56 -07:00
Madhura Bhave 3e8ee2a296 Add missing package-info.json
Closes gh-20516
2020-03-16 16:11:02 -07:00
Madhura Bhave 84b2e8c308 Rename classes package to application
Closes gh-20526
2020-03-16 16:03:29 -07:00
Scott Frederick 3dea2201c4 Use Gradle's configuration avoidance API
Register Boot Gradle tasks instead of creating them so they can be
loaded lazily.

Closes gh-18881
2020-03-16 17:49:34 -05:00
Scott Frederick f2dadf5a87 Add support for customizing layers in Gradle
This commit adds configuration to the Spring Boot Gradle plugin that
allows the names and contents of layers to be customized in the build
configuration.

Fixes gh-20296
2020-03-16 17:27:32 -05:00
Andy Wilkinson c4a55a5fb4 Fail fast when attempting to repackage a reproducible war
Maven's war plugin does not support reproducible builds, resulting in
the entries in the war file not being written in a consistent order
from build to build.

Closes gh-20176
2020-03-16 20:29:37 +00:00
Andy Wilkinson ca202ad59f Support Maven's outputTimestamp when repackaging jars and wars
Closes gh-20176
2020-03-16 17:19:52 +00:00
dreis2211 5975e7bd8d Fix some deprecation warnings
See gh-20527
2020-03-15 16:33:47 +01:00
dreis2211 3e24df3beb Fix method order checkstyle issue
See gh-20525
2020-03-13 15:53:42 +00:00
Andy Wilkinson 0315724126 Cache endpoint responses on a per-principal basis
Previously, any HTTP request to an endpoint that included a principal
would bypass the cache. This prevented authenticated requests from
making use of the cache and its configurable time-to-live.

This commit updates the caching operation invoker to include the
principal, if any, in its cache key. As a result, requests that
include a principal will make use of the cache, potentially returning
the result of a previous invocation of the same endpoint by the same
principal.

Closes gh-19538
2020-03-13 15:31:41 +00:00
Andy Wilkinson ef9960c69f Allow additional tags to be contributed to WebMvc and WebFlux defaults
Closes gh-20175
2020-03-13 09:38:29 +00:00
Andy Wilkinson e7ece77a7c Upgrade to Undertow 2.0.30.Final
Closes gh-20514
2020-03-12 14:09:33 +00:00
Andy Wilkinson e28697eed8 Upgrade to Sun Mail 1.6.5
Closes gh-20513
2020-03-12 14:09:33 +00:00
Andy Wilkinson 38763a4e48 Upgrade to Maven Dependency Plugin 3.1.2
Closes gh-20512
2020-03-12 14:09:32 +00:00
Andy Wilkinson 2d9bfb9bdf Upgrade to Kafka 2.4.1
Closes gh-20511
2020-03-12 14:09:32 +00:00
Andy Wilkinson 6216dfbe5c Upgrade to Jakarta Mail 1.6.5
Closes gh-20510
2020-03-12 14:09:32 +00:00
Madhura Bhave e49e62df5c Add support for customizing layers in Maven
This commit adds an additional 'layers/configuration' property that can
be used to refer to a separate layers configuration file. This separate
file defines:

* The layers and their order of precedence,
* How libraries are handled using filters that match against the
coordinates of each library, and
* How classes are handled using filters that match against the location
of the entry

An XSD to validate the XML configuration file is available.

Closes gh-20295

Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
2020-03-12 14:50:08 +01:00
Andy Wilkinson 896d2c8579 Upgrade to Spring Integration 5.3.0.M3
Closes gh-20489
2020-03-12 09:28:48 +00:00
Andy Wilkinson 5446858535 Upgrade to Spring Kafka 2.4.4.RELEASE
Closes gh-20469
2020-03-11 19:08:03 +00:00
Andy Wilkinson 77dbe999b9 Polish "Add clearChecksums to Liquibase auto-configuration"
See gh-20417
2020-03-11 17:14:38 +00:00
ferengra a2680efadb Add clearCheckSums to Liquibase auto configuration
Liquibase auto configuration is extended with clearCheckSums to allow
to clear all checksums in the current changelog, so they will be
recalculated upon the next update.

See gh-20417
2020-03-11 17:11:43 +00:00
Andy Wilkinson 4fd8f376dc Merge branch '2.2.x'
Closes gh-20503
2020-03-11 14:02:49 +00:00
Andy Wilkinson 9fbb664db6 Avoid eager init when evaluating DevToolsDataSourceCondition
Previously, DevToolsDataSourceCondition called
getBeanNamesForType(Class) which could trigger unwanted initialization
of lazy init singletons and objects created by FactoryBeans.

This commit updates DevToolsDataSourceCondition to prohibit eager
init when getting the names of the beans of a particular type.

Fixes gh-20430
2020-03-11 14:02:16 +00:00
Andy Wilkinson 2f92261f97 Merge branch '2.2.x'
Closes gh-20502
2020-03-11 13:17:12 +00:00
Andy Wilkinson e937b2e0cd Merge branch '2.1.x' into 2.2.x
Closes gh-20501
2020-03-11 13:12:27 +00:00
Andy Wilkinson f251772e17 Fix behaviour of DependencyCustomizer ifAllResourcesPresent
Previously, DependencyCustomizer's ifAllResourcesPresent method
would return a customizer that added modules if any of the resources
were present. This commit corrects this behaviours so that modules are
only added if all resources are present.

Fixes gh-20418
2020-03-11 13:00:49 +00:00
Johnny Lim 8526e66939 Polish
See gh-20498
2020-03-11 12:17:58 +01:00
Stephane Nicoll 9370f21221 Upgrade to Spring Data Neumann-M4
Closes gh-20241
2020-03-11 11:13:44 +01:00
Andy Wilkinson 899efc9eba Merge branch '2.2.x'
The fix was applied as part of 308e1d36. This commit merges forwards
the test that was added in 2.1.x and 2.2.x.

Fixes gh-20386 in 2.2.0.M3.
2020-03-11 09:39:02 +00:00
Andy Wilkinson e1ce21c3a5 Merge branch '2.1.x' into 2.2.x
Closes gh-20499
2020-03-11 09:34:11 +00:00
Andy Wilkinson 2b2113714d Use getTomcatWebServer to create TomcatWebServer instance
TomcatReactiveWebServerFactory's getTomcatWebServer is described as
being a hook point the can be overrideden to return a different
TomcatWebServer or to apply additional processing to the Tomcat
server. Previously, this did not work as the method was not called
to create the TomcatWebServer instance. Instead, TomcatWebServer was
instantiated and returned directly.

This commit updates TomcatReactiveWebServerFactory to call
getTomcatWebServer to create the TomcatWebServer instance. A test
has also been added to verify that the method is now used.

Fixes gh-20386
2020-03-11 09:24:27 +00:00
Andy Wilkinson 4d371f0d88 Merge branch '2.2.x'
Closes gh-20491
2020-03-10 21:27:41 +00:00
Florian Dreier 76451d47b7 Update versiion of git-properties plugin shown in the docs
See gh-20436
2020-03-10 21:26:48 +00:00
Andy Wilkinson c917b61484 Reinstate leading / in default value for spring.liquibase.change-log
Unfortunately, while redundant for new applications, removing the
leading slash adversely affected existing application upon upgrades as
it caused Liquibase to re-apply every change log.

Closes gh-20177
2020-03-10 21:22:27 +00:00
dreis2211 589213daab Improve unused exclusion detection and remove those that are unused
See gh-20472
2020-03-10 20:36:00 +00:00
Andy Wilkinson e2518917f4 Tolerate different connection failure exception thrown on Java 11+
See gh-4657
2020-03-10 20:31:33 +00:00
Andy Wilkinson 29c6b9da5c Upgrade to Postgresql 42.2.11
Closes gh-20488
2020-03-10 20:09:53 +00:00
Andy Wilkinson c5674d80d2 Upgrade to Maven Source Plugin 3.2.1
Closes gh-20487
2020-03-10 20:09:52 +00:00
Andy Wilkinson 5117a6ac6f Upgrade to Maven Shade Plugin 3.2.2
Closes gh-20486
2020-03-10 20:09:51 +00:00
Andy Wilkinson d29ca237b5 Upgrade to Flatten Maven Plugin 1.2.1
Closes gh-20485
2020-03-10 20:09:49 +00:00
Andy Wilkinson 3fa6f04701 Upgrade to Build Helper Maven Plugin 3.1.0
Closes gh-20484
2020-03-10 20:09:48 +00:00
Andy Wilkinson de59586170 Reinstate spring-boot-dependencies' exclusion of jcl-over-slf4j
Closes gh-20441
2020-03-10 20:07:23 +00:00
Andy Wilkinson 8282c1b897 Upgrade to Spring Security 5.3.0.RELEASE
Closes gh-20482
2020-03-10 20:07:23 +00:00
Andy Wilkinson d50ac8d086 Upgrade to Reactor Bom Dysprosium-SR5
Closes gh-20481
2020-03-10 20:07:23 +00:00
Andy Wilkinson 156a67c640 Upgrade to Netty 4.1.47.Final
Closes gh-20480
2020-03-10 20:07:23 +00:00
Andy Wilkinson 6f1218494a Upgrade to Kotlin Coroutines 1.3.4
Closes gh-20479
2020-03-10 20:07:22 +00:00
Andy Wilkinson 3dc5a4e38f Upgrade to Jetty 9.4.27.v20200227
Closes gh-20476
2020-03-10 20:07:22 +00:00
Andy Wilkinson 849b23f71d Upgrade to Jersey 2.30.1
Closes gh-20475
2020-03-10 20:07:22 +00:00
Andy Wilkinson 2ec99e7b1c Upgrade to Jackson Bom 2.10.3
Closes gh-20474
2020-03-10 20:07:22 +00:00
Andy Wilkinson fe4297086b Upgrade to Dropwizard Metrics 4.1.5
Closes gh-20473
2020-03-10 20:07:22 +00:00
Andy Wilkinson 4a0b8bb5ba Start using Cassandra Driver's bom
Fixes gh-20441
2020-03-10 16:03:51 +00:00
Andy Wilkinson b63a7c4631 Upgrade to XmlUnit2 2.6.4
Closes gh-20471
2020-03-10 15:38:47 +00:00
Andy Wilkinson d8ce02e667 Upgrade to WebJars Locator Core 0.44
Closes gh-20470
2020-03-10 15:38:47 +00:00
Andy Wilkinson 485498c5ac Upgrade to Spring Kafka 2.4.3.RELEASE
Closes gh-20469
2020-03-10 15:38:47 +00:00
Andy Wilkinson 22fa5d257a Upgrade to Spring AMQP 2.2.5.RELEASE
Closes gh-20468
2020-03-10 15:38:47 +00:00
Andy Wilkinson 6087fd6b51 Upgrade to SnakeYAML 1.26
Closes gh-20467
2020-03-10 15:38:47 +00:00
Andy Wilkinson 662c08acd5 Upgrade to SendGrid 4.4.5
Closes gh-20466
2020-03-10 15:38:47 +00:00
Andy Wilkinson 97dd978a91 Upgrade to Selenium HtmlUnit 2.38.0
Closes gh-20465
2020-03-10 15:38:47 +00:00
Andy Wilkinson 2620be1e0f Upgrade to RxJava2 2.2.18
Closes gh-20464
2020-03-10 15:38:47 +00:00
Andy Wilkinson 742f584d60 Upgrade to OkHttp3 3.14.7
Closes gh-20463
2020-03-10 15:38:47 +00:00
Andy Wilkinson 3d435df37b Upgrade to Netty tcNative 2.0.29.Final
Closes gh-20462
2020-03-10 15:38:47 +00:00
Andy Wilkinson 2fa35fbcbc Upgrade to Neo4j OGM 3.2.9
Closes gh-20461
2020-03-10 15:38:46 +00:00
Andy Wilkinson 77ad8d3a4f Upgrade to MongoDB 4.0.0
Closes gh-20460
2020-03-10 15:38:46 +00:00
Andy Wilkinson c399323ac4 Upgrade to Mockito 3.3.0
Closes gh-20459
2020-03-10 15:38:46 +00:00
Andy Wilkinson ad1ef31977 Upgrade to Log4j2 2.13.1
Closes gh-20458
2020-03-10 15:38:46 +00:00
Andy Wilkinson fa68cc4ee5 Upgrade to Liquibase 3.8.7
Closes gh-20457
2020-03-10 15:38:46 +00:00
Andy Wilkinson f31e589b07 Upgrade to jOOQ 3.13.1
Closes gh-20456
2020-03-10 15:38:46 +00:00
Andy Wilkinson 02ae6458f7 Upgrade to Jetty Reactive HTTPClient 1.1.2
Closes gh-20455
2020-03-10 15:38:46 +00:00
Andy Wilkinson 295f063463 Upgrade to Janino 3.1.1
Closes gh-20454
2020-03-10 15:38:46 +00:00
Andy Wilkinson a45cb3d712 Upgrade to Jakarta XML WS 2.3.3
Closes gh-20453
2020-03-10 15:38:46 +00:00
Andy Wilkinson f910fd8ac8 Upgrade to Jakarta XML Bind 2.3.3
Closes gh-20452
2020-03-10 15:38:46 +00:00
Andy Wilkinson e61dcc38d7 Upgrade to Jakarta Activation 1.2.2
Closes gh-20451
2020-03-10 15:38:46 +00:00
Andy Wilkinson 911a1912f6 Upgrade to Infinispan 10.1.3.Final
Closes gh-20450
2020-03-10 15:38:46 +00:00
Andy Wilkinson 8ac97d6d3e Upgrade to HttpClient 4.5.12
Closes gh-20449
2020-03-10 15:38:45 +00:00
Andy Wilkinson ee3ff3e094 Upgrade to HtmlUnit 2.38.0
Closes gh-20448
2020-03-10 15:38:45 +00:00
Andy Wilkinson 3251c9d2b0 Upgrade to Hibernate 5.4.12.Final
Closes gh-20447
2020-03-10 15:38:45 +00:00
Andy Wilkinson 2a8136b56f Upgrade to FreeMarker 2.3.30
Closes gh-20446
2020-03-10 15:38:45 +00:00
Andy Wilkinson d2ebd77861 Upgrade to Flyway 6.3.0
Closes gh-20445
2020-03-10 15:38:45 +00:00
Andy Wilkinson 0cd8197ebf Upgrade to Couchbase Client 2.7.13
Closes gh-20444
2020-03-10 14:23:46 +00:00
Andy Wilkinson 7971bd50ba Upgrade to Cassandra Driver 4.5.0
Closes gh-20443
2020-03-10 14:23:44 +00:00
Andy Wilkinson 707fb929a2 Upgrade to Byte Buddy 1.10.8
Closes gh-20442
2020-03-10 14:23:42 +00:00
Andy Wilkinson 19cc388861 Test Tomcat's handling of a request on an idle connection
See gh-4657
2020-03-10 12:51:32 +00:00
Andy Wilkinson b8cb61bbe0 Align embedded Jetty's graceful shutdown behaviour with standalone
Standalone Jetty will, by default, include a Connection: close header
in all responses once graceful shutdown has begun. Previously, the
way in which we were shutting Jetty down did not cause this to happen.

This commit updates JettyGracefulShutdown to shut down each connector.
This causes Jetty to send the Connection: close header, aligning its
behaviour more closely with what it does when used standalone. The
tests have also been updated to verify this behaviour and to ensure
that the correct port is used for requests even once the connector is
no longer bound and the web server no longer knows its ephemeral port.

See gh-4657
2020-03-10 12:30:25 +00:00
Andy Wilkinson 5bb66e1b85 Try to make reactive Jetty connect after shutdown test more robust
See gh-4657
2020-03-10 08:37:29 +00:00
Madhura Bhave fd50a6755f Merge branch '2.2.x'
Closes gh-20433
2020-03-09 16:08:08 -07:00
Madhura Bhave a27e145f03 Merge branch '2.1.x' into 2.2.x
Closes gh-20432
2020-03-09 16:06:47 -07:00
Madhura Bhave 06d870bdd0 Do not wrap CF JSON Keys containing special characters
This reverts commit 6828a15d31.
The commit has been reverted as it breaks backwards compatiblity.

Fixes gh-20343
2020-03-09 15:56:48 -07:00
Andy Wilkinson 6ec3865ed0 Polish spelling of elapsed
See gh-4657
2020-03-09 18:41:27 +00:00
Andy Wilkinson da06b38117 Polish
See gh-4657
2020-03-09 18:36:04 +00:00
Andy Wilkinson 308e1d3675 Add support for gracefully shutting down the web server
This commit adds support for gracefully shutting down the embedded
web server. When a grace period is configured
(server.shutdown.grace-period), upon shutdown, the web server will no
longer permit new requests and will wait for up to the grace period
for active requests to complete.

Closes gh-4657
2020-03-09 18:12:20 +00:00
dreis2211 9481f2c68d Remove hardcoded version from VersionOverridingElasticsearchContainer
See gh-20428
2020-03-09 18:33:47 +01:00
Stephane Nicoll f1f662e745 Revert Spring Data Couchbase version override 2020-03-09 18:32:09 +01:00
wycm 916a4743bb Polish
See gh-20419
2020-03-08 17:26:00 +01:00
Stephane Nicoll 278f769f80 Merge branch '2.2.x' 2020-03-08 17:23:56 +01:00
Stephane Nicoll 1fdb08300b Polish 2020-03-08 17:22:22 +01:00
dreis2211 6036df5f33 Upgrade to Elasticsearch 7.6.1
See gh-20423
2020-03-08 13:30:06 +01:00
dreis2211 361739ea3c Upgrade to Testcontainers 1.13.0
See gh-20416
2020-03-08 11:38:16 +01:00
dreis2211 53e8e49552 Fix JarFileTests for multi-release JARs on JDK14
See gh-20180
2020-03-07 16:55:02 +01:00
Stephane Nicoll e5394ceac2 Polish "Handle new Annotation.toString() behaviour in JDK 14"
See gh-20180
2020-03-07 16:55:02 +01:00
dreis2211 e22aca85e9 Handle new Annotation.toString() behaviour in JDK 14
See gh-20180
2020-03-07 16:34:40 +01:00
dreis2211 74ed37efbf Upgrade to Groovy 2.5.10
See gh-20411
2020-03-07 09:33:30 +01:00
Stephane Nicoll 5b92151dcb Update copyright of changed file
See gh-20407
2020-03-06 11:26:03 +01:00
wycm 67c2393a6a Polish
See gh-20407
2020-03-06 11:25:16 +01:00
Scott Frederick 185f644877 Remove the body from actuator 404 responses
When a request to the /actuator/env/{toMatch} endpoint does not match a
property, a response status 404 was being returned along with a body
containing the existing property sources. This commit removes the body
from the response to be more consistent with a typical 404 response.

Fixes gh-20314
2020-03-05 17:21:15 -06:00
Andy Wilkinson c668798923 Pin SD Couchbase to 4.0.0.M3 to avoid latest breaking changes 2020-03-05 17:19:15 +00:00
Stephane Nicoll fa8a09d46d Merge branch '2.2.x'
Closes gh-20395
2020-03-05 10:31:17 +01:00
dreis2211 f08a9db984 Fix some deprecations
See gh-20388
2020-03-05 10:24:49 +01:00
Stephane Nicoll 1333af4dcf Polish "Refine if statement logic"
See gh-20390
2020-03-05 10:15:52 +01:00
gir1yaphets 9480e2d605 Refine if statement logic
See gh-20390
2020-03-05 10:14:24 +01:00
Johnny Lim bd08b4d91c Polish DataSourceHealthIndicator
See gh-20367
2020-03-05 10:10:39 +01:00
Stephane Nicoll 51c29229d3 Polish "Improve details of neo4h health indicator"
See gh-20356
2020-03-04 15:48:00 +01:00
Said BOUDJELDA b09d5d27e0 Improve details of neo4h health indicator
This commit changes the neo4j health indicator to provide the version
and edition of the neo4j database.

See gh-20356
2020-03-04 15:46:38 +01:00
Stephane Nicoll 89e5c285e5 Merge branch '2.2.x'
Closes gh-20387
2020-03-04 15:44:01 +01:00
Johnny Lim 1721aeccb0 Use ServerHttpResponse.getRawStatusCode() in WebFluxTags
See gh-19987
2020-03-04 15:28:31 +01:00
Stephane Nicoll 89805fdb61 Fix checkstyle violations 2020-03-04 15:04:47 +01:00
dreis2211 daa3855fc8 Test the Gradle Plugin against Gradle 6.2.2
See gh-20385
2020-03-04 14:56:20 +01:00
Stephane Nicoll aa4dad1d73 Polish "Allow Embedded directory to be used without spring-data-ldap"
See gh-20223
2020-03-04 14:46:04 +01:00
Frank Schmager a92c57c07d Allow Embedded directory to be used without spring-data-ldap
See gh-20223
2020-03-04 10:09:34 +01:00
Stephane Nicoll 2d5a55fb0d Bind ConnectionPool beans that are exposed as ConnectionFactory
This commit relaxes the class condition to ConnectionFactory, checking
if the connection factory is a connection pool and bind its metrics to
the registry accordingly.

Closes gh-20349
2020-03-04 09:58:18 +01:00
dreis2211 9588188800 Use isEmpty() where possible
See gh-20370
2020-03-03 18:33:26 -05:00
Brian Clozel ea45d8ef25 Fix "spring.integration.rsocket" canonical name
See gh-18834
2020-03-03 15:50:43 +01:00
Artem Bilan 3967e76b9b Auto-Configure RSocket support for Spring Integration
This commit adds a new auto-configuration for RSocket support in Spring
Integration.

Given an application with `spring-messaging`, `spring-integration-rsocket`
and RSocket dependencies, developers are now able to leverage Spring
Integration features with RSocket.

It is now possible to configure an RSocket server with
`"spring.rsocket.server.*"` properties and let it use
`IntegrationRSocketEndpoint` or `RSocketOutboundGateway` components to
handle incoming RSocket messages. This infrastructure can handle Spring
Integration RSocket channel adapters and `@MessageMapping` handlers
(given `"spring.integration.rsocket.server.message-mapping-enabled"`is
configured.

If the `"spring.integration.rsocket.client.host"` and
`"spring.integration.rsocket.client.port"` (for TCP protocol), or
`"spring.integration.rsocket.client.uri"`  (for WebSocket) is configured
then a `ClientRSocketConnector` will be configured accordingly.

Closes gh-18834

Co-authored-by: Brian Clozel <bclozel@pivotal.io>
2020-03-03 15:15:24 +01:00
Stephane Nicoll 925756dae1 Polish "Add descriptions for data source pool metrics"
See gh-20354
2020-03-01 11:02:39 -05:00
Johnny Lim 21a0b0544a Add descriptions for data source pool metrics
See gh-20354
2020-03-01 10:58:52 -05:00
Johnny Lim 98738d22f4 Polish tests
See gh-20318
2020-02-28 09:36:19 -05:00
Scott Frederick 296a13a479 Fix unit test case formatting 2020-02-27 16:43:56 -06:00
Scott Frederick b00ed5b143 Remove unused imports 2020-02-27 16:17:19 -06:00
Scott Frederick ce03f501c4 Merge pull request #20297 from mikesmithson 2020-02-27 16:10:56 -06:00
Scott Frederick ada0741e10 Polish Docker client exception handling 2020-02-27 16:09:30 -06:00
Mike Smithson 6f095d6fec Improve error message from image building
Translate IOException to DockerException for a more meaningful error
message when the Docker daemon is not available.

Fixes gh-20151
2020-02-27 15:51:58 -06:00
Madhura Bhave 7634bfb179 Merge branch '2.2.x'
Closes gh-20340
2020-02-27 13:02:40 -08:00
dreis2211 4eaaf88b2d Remove redundant code
See gh-20339
2020-02-27 12:56:43 -08:00
Madhura Bhave 5bf1f7641b Merge branch '2.2.x' 2020-02-26 17:08:59 -08:00
Madhura Bhave ea8f2a7276 Fix tests following changes to EndpointRequest
See gh-20329
2020-02-26 17:05:16 -08:00
Madhura Bhave 250493d681 Merge branch '2.2.x'
Closes gh-20331
2020-02-26 15:00:49 -08:00
Madhura Bhave cdae79dad9 Cache management port type in EndpointRequestMatcher
Closes gh-20329
2020-02-26 14:59:54 -08:00
Scott Frederick e60a7ea8d6 Fix Maven plugins tests on Windows
This commit fixes problems with file path separators and command
line argument quoting in Maven plug integration tests when run on
Windows.

Fixes gh-20244
2020-02-26 16:50:15 -06:00
Stephane Nicoll 421fe77b04 Upgrade to Neo4j Ogm 3.2.9
Closes gh-20330
2020-02-26 17:06:54 -05:00
Stephane Nicoll ef67ad7a35 Upgrade to Liquibase 3.8.7
Closes gh-20328
2020-02-26 15:52:07 -05:00
Stephane Nicoll fa6f8f80b5 Upgrade to Rxjava2 2.2.18
Closes gh-20327
2020-02-26 15:52:06 -05:00
Stephane Nicoll a838537487 Upgrade to Dropwizard Metrics 4.1.3
Closes gh-20326
2020-02-26 15:52:05 -05:00
Stephane Nicoll 398e68393e Upgrade to Okhttp3 3.14.7
Closes gh-20325
2020-02-26 15:52:03 -05:00
Stephane Nicoll 560bf28e85 Upgrade to Spring Kafka 2.3.6.RELEASE
Closes gh-20203
2020-02-26 15:38:47 -05:00
Stephane Nicoll 080d549cb2 Upgrade to Spring Integration 5.2.4.RELEASE
Closes gh-20202
2020-02-26 15:38:12 -05:00
Stephane Nicoll 3c7ed819fa Upgrade to Spring AMQP 2.2.5.RELEASE
Closes gh-20106
2020-02-26 15:37:31 -05:00
Stephane Nicoll c0bac905e1 Revert "Start building against Spring HATEOAS 1.0.4 snapshots"
This reverts commit 34f33e8b0d.

See gh-20232
2020-02-26 11:33:12 -05:00
Stephane Nicoll 0c5973f688 Upgrade to Neo4j Ogm 3.1.17
Closes gh-20322
2020-02-26 08:52:42 -05:00
Stephane Nicoll eb33be8849 Upgrade to Rxjava2 2.2.18
Closes gh-20321
2020-02-26 08:52:40 -05:00
Stephane Nicoll 5db92e3d30 Upgrade to Jackson 2.9.10.20200223
Closes gh-20320
2020-02-26 08:52:39 -05:00
Stephane Nicoll cd456c2e41 Upgrade to Spring Data Moore-SR5
Closes gh-20201
2020-02-26 08:48:42 -05:00
Stephane Nicoll de3f72f25b Upgrade to Spring Data Lovelace-SR16
Closes gh-20198
2020-02-26 08:47:01 -05:00
Scott Frederick 509a1f1d41 Configure buildpack to use target Java version
With this commit, the Maven `spring-boot:build-image` goal and the
Gradle `bootBuildImage` task will configure the OpenJDK buildpack
to use the same JRE version as the project's target version,
provided the buildpack Java version is not explicitly set in the
build configuration.

Fixes gh-20172
2020-02-25 15:11:42 -06:00
Stephane Nicoll 7d7b1e13a2 Upgrade to Spring Framework 5.2.4.RELEASE
Closes gh-20240
2020-02-25 13:52:56 -05:00
Stephane Nicoll 4cd4e510e1 Upgrade to Spring Framework 5.2.4.RELEASE
Cloes gh-20199
2020-02-25 13:51:58 -05:00
Stephane Nicoll eaafe50880 Upgrade to Spring Framework 5.1.14
Closes gh-20197
2020-02-25 13:50:25 -05:00
Stephane Nicoll ea66940be1 Document R2DBC support
Closes gh-19988

Co-authored-by: Mark Paluch <mpaluch@pivotal.io>
2020-02-25 09:29:36 -05:00
Stephane Nicoll 45e6058761 Add R2BC connection pool metrics
This commit adds metrics support for `ConnectionPool` beans.

See gh-19988

Co-authored-by: Mark Paluch <mpaluch@pivotal.io>
Co-authored-by: Tadaya Tsuyukubo <tadaya@ttddyy.net>
2020-02-25 09:22:57 -05:00
Stephane Nicoll bee7302fc7 Add R2BC connection factory health check
This commit adds an health indicator for R2DBC. If a validation query is
provided, it is used to validate the state of the database. If not, a
check of the connection is issued.

See gh-19988

Co-authored-by: Mark Paluch <mpaluch@pivotal.io>
2020-02-25 09:22:31 -05:00
Stephane Nicoll 6817856e7d Add test slice for Spring Data R2DBC
This commit adds a test slice for Spring Data R2DBC. When
`DataR2dbcTest` is added on a test, only Spring Data R2DBC repositories
and the infrastructure that they need is auto-configured.

Contrary to the JDBC counterpart, the `ConnectionFactory` is not swapped
by an embedded database.

See gh-19988

Co-authored-by: Mark Paluch <mpaluch@pivotal.io>
2020-02-25 09:21:47 -05:00
Stephane Nicoll 19fbac7d59 Add auto-configuration for Spring Data R2DBC
This commit adds auto-configuration support for Spring Data R2DBC. If a
`ConnectionFactory` and Spring Data are available, scanning of reactive
repositories is enabled.

This commit also adds a starter to bring R2DBC and the necessary Spring
Data libraries.

See gh-19988

Co-authored-by: Mark Paluch <mpaluch@pivotal.io>
Co-authored-by: Oliver Drotbohm <odrotbohm@pivotal.io>
2020-02-25 09:14:08 -05:00
Stephane Nicoll 5c174feb65 Add auto-configuration for R2DBC's ConnectionFactory
This commit adds auto-configuration for R2DBC. If R2DBC is on the
classpath, a `ConnectionFactory` is created similarly to the algorithm
used to create a `DataSource`.

If an url is specified, it is used to determine the R2DBC driver and
database location. If not, an embedded database is started (with only
support of H2 via r2dbc-h2). If none of those succeed, an exception is
thrown that is handled by a dedicated FailureAnalyzer.

To clearly separate reactive from imperative access, a `DataSource` is
not auto-configured if a `ConnectionFactory` is present. This makes sure
that any auto-configuration that relies on the presence of a
`DataSource` backs off.

There is no dedicated database initialization at the moment but it is
possible to configure flyway or liquibase to create a local `DataSource`
for the duration of the migration. Alternatively, if Spring Data R2DBC
is on the classpath, a `ResourceDatabasePopulator` bean can be defined
with the scripts to execute on startup.

See gh-19988

Co-authored-by: Mark Paluch <mpaluch@pivotal.io>
2020-02-25 09:12:28 -05:00
Stephane Nicoll 4c2ff9c314 Merge branch '2.2.x'
Closes gh-20315
2020-02-25 09:00:30 -05:00
Yoo In Keun ec20246415 Fix typos in documentation
See gh-20313
2020-02-25 08:59:12 -05:00
dreis2211 442733600e Test the Gradle plugin against Gradle 6.2.1
See gh-20310
2020-02-25 05:52:00 -05:00
Andy Wilkinson 2059ff6c39 Upgrade to Reactor Dysprosium-SR5
Closes gh-20200
2020-02-25 09:23:13 +00:00
Andy Wilkinson cb2e3bd076 Upgrade to Reactor Californium-SR16
Closes gh-20196
2020-02-25 09:15:02 +00:00
Madhura Bhave db1d923ad8 Merge branch '2.2.x' 2020-02-24 15:04:35 -08:00
Madhura Bhave 42bb56c1ba Merge branch '2.1.x' into 2.2.x 2020-02-24 15:04:24 -08:00
Madhura Bhave 88ee50601d Update copyright of changed files 2020-02-24 15:03:38 -08:00
Madhura Bhave 65c6f32428 Merge branch '2.2.x'
Closes gh-20307
2020-02-24 15:02:14 -08:00
Madhura Bhave 368a77f355 Merge branch '2.1.x' into 2.2.x
Closes gh-20306
2020-02-24 15:01:38 -08:00
Madhura Bhave 0957168626 Binding to collection of custom objects should not fail with unbound error
Fixes gh-20134
2020-02-24 14:48:10 -08:00
dreis2211 e66758d3d0 Explicitly set java home in CommandLineInvoker
See gh-20242
2020-02-24 08:48:35 +01:00
Brian Clozel e73ee7b3fe Merge branch '2.2.x'
Closes gh-20293
2020-02-21 18:48:54 +01:00
Brian Clozel 11b9862064 Revert "Clear ProducesRequestCondition cache attribute"
Closes gh-20292
2020-02-21 17:38:43 +01:00
Brian Clozel ab72cc8fdb Revert "Add actuator specific ObjectMapper"
See gh-12951
See gh-20291
2020-02-21 17:16:24 +01:00
Stephane Nicoll 3f0a5a5482 Upgrade to Maven Shade Plugin 3.2.2
Closes gh-20288
2020-02-21 14:33:29 +01:00
Stephane Nicoll 4a64426218 Upgrade to Spring Session Bom Corn-SR1
Closes gh-20287
2020-02-21 14:33:29 +01:00
Stephane Nicoll a3d4367ccc Upgrade to Spring Security 5.2.2.RELEASE
Closes gh-20286
2020-02-21 14:33:29 +01:00
Stephane Nicoll 412aee65ea Upgrade to Lombok 1.18.12
Closes gh-20285
2020-02-21 14:33:29 +01:00
Stephane Nicoll fb0d14baa8 Upgrade to Postgresql 42.2.10
Closes gh-20284
2020-02-21 14:33:29 +01:00
Stephane Nicoll 6a3a32460f Upgrade to Neo4j Ogm 3.2.8
Closes gh-20283
2020-02-21 14:33:29 +01:00
Stephane Nicoll 85139c0321 Upgrade to Liquibase 3.8.6
Closes gh-20282
2020-02-21 14:33:29 +01:00
Stephane Nicoll 4b3273440f Upgrade to Jooq 3.12.4
Closes gh-20281
2020-02-21 14:33:29 +01:00
Stephane Nicoll e56a4dfc87 Upgrade to Infinispan 9.4.18.Final
Closes gh-20280
2020-02-21 14:33:29 +01:00
Stephane Nicoll 7b389f04ad Upgrade to Hibernate 5.4.12.Final
Closes gh-20279
2020-02-21 14:33:29 +01:00
Stephane Nicoll a99f7910bc Upgrade to Jetty 9.4.26.v20200117
Closes gh-20278
2020-02-21 14:33:29 +01:00
Stephane Nicoll 402eb87847 Upgrade to Tomcat 9.0.31
Closes gh-20277
2020-02-21 14:33:22 +01:00
Stephane Nicoll 1909bac5c8 Upgrade to Johnzon Jsonb 1.2.3
Closes gh-20276
2020-02-21 14:33:21 +01:00
Stephane Nicoll 3447936823 Upgrade to Httpclient 4.5.11
Closes gh-20275
2020-02-21 14:33:21 +01:00
Stephane Nicoll 15134d92f5 Upgrade to Byte Buddy 1.10.8
Closes gh-20274
2020-02-21 14:33:21 +01:00