Commit Graph

8432 Commits

Author SHA1 Message Date
Scott Frederick 8f84dbe3cf Harmonize MongoDB client factories
This commit brings MongoClientFactory and ReactiveMongoClientFactory
into functional alignment and reduces duplication in the classes
and their tests.

There are no behavior changes to ReactiveMongoClientFactory.
MongoClientFactory now throws an exception when a URI is configured
along with a host, port, or credentials, where it previousy ignored
host, port, and credentials silently. MongClientFactory now also
supports MongoClientSettingsBuilderCustomizers.

Fixes gh-20019
2020-02-19 10:15:40 -06:00
Stephane Nicoll d65e06081f Update copyright year of changed files
See gh-20226
2020-02-19 09:35:28 +01:00
Johnny Lim 8be8a8421d Polish
See gh-20226
2020-02-19 09:34:46 +01:00
dreis2211 d55bc5f850 Test the Gradle Plugin against Gradle 6.2
See gh-20222
2020-02-19 09:26:54 +01:00
Mustafa Ulu 2760426db0 Polish log4j2 configuration
See gh-20225
2020-02-19 09:18:41 +01:00
Madhura Bhave aa09058d8c Remove implicit layers support from the layer tools
Closes gh-20187
2020-02-18 16:23:25 -08:00
Stephane Nicoll 363edfa00c Merge branch '2.2.x'
Closes gh-20221
2020-02-18 17:38:39 +01:00
hbellahc d890f1f6d8 Document missing reference to DataSourceHealthIndicator
See gh-20216
2020-02-18 17:29:16 +01:00
Stephane Nicoll 4ec30e1145 Add support for SimpleDriverDataSource
This commit makes sure that DataSourceBuilder can configure
SimpleDriverDataSource by adding an alias for the driver's class name.

Closes gh-20220

Co-authored-by: Dmytro Nosan <dimanosan@gmail.com>
2020-02-18 17:23:14 +01:00
Stephane Nicoll 287d577aea Merge branch '2.2.x'
Closes gh-20218
2020-02-18 16:59:52 +01:00
Stephane Nicoll 1d60184075 Merge branch '2.1.x' into 2.2.x
Closes gh-20217
2020-02-18 16:58:46 +01:00
Stephane Nicoll 2147976c17 Do not fallback to embedded configuration if a datasource url is set
This commit makes sure that a fallback embedded datasource is not
created if no suitable connection pool is found and an url has been
explicitly registered.

This is consistent with EmbeddedDataSourceConfiguration as it is using
EmbeddedDatabaseBuilder behind the scenes and the latter does not
honour the configured URL anyway.

Closes gh-19192
2020-02-18 16:27:31 +01:00
dreis2211 866c441d70 Upgrade to Gradle 6.2
See gh-20213
2020-02-18 14:39:10 +00:00
Stephane Nicoll 16111f126e Use query-less datasource validation by default
This commit changes DataSourceHealthIndicator to validate the connection
rather than issuing a query to the database. If a custom validation
query is specified, it uses that as before.

Closes gh-17582
2020-02-18 14:59:06 +01:00
dreis2211 4f824bf9ad Fix duplicate words
See gh-20210
2020-02-18 13:34:56 +01:00
dreis2211 76d2bc27eb Explicitly set java home in Maven Plugin integration tests
See gh-20193
2020-02-18 12:05:43 +00:00
Brian Clozel e59d3fbb86 Clear ProducesRequestCondition cache attribute
As of spring-projects/spring-framework#22644, Spring Framework caches
the "produces" condition when matching for endpoints in the
`HandlerMapping` infrastructure. This has been improved in
spring-projects/spring-framework#23091 to prevent side-effects in other
implementations.

Prior to this commit, the Spring Boot actuator infrastructure for
`EndpointHandlerMapping` would not clear the cached attribute,
presenting the same issue as Spring Framework's infrastructure. This
means that a custom arrangement with custom `HandlerMapping` or
`ContentTypeResolver` would not work properly and reuse the cached
produced conditions for other, unintented, parts of the handler mapping
process.

This commit clears the cached data and ensures that other handler
mapping implementations are free of that side-effect.

Fixes gh-20150
2020-02-17 11:33:45 +01:00
Stephane Nicoll 4bcf4245d1 Polish "Add support for configuring Liquibase tag property"
See gh-19316
2020-02-17 09:53:59 +01:00
Eddú Meléndez 407e237f10 Add support for configuring Liquibase tag property
See gh-19316
2020-02-17 09:46:42 +01:00
dreis2211 a9dabe13bb Remove redundant useJUnitPlatform declarations
See gh-20206
2020-02-17 09:15:57 +01:00
Stephane Nicoll 03bee83991 Update copyright date
See gh-20192
2020-02-16 17:20:48 +01:00
zhangt2333 e2d87a89d0 Polish
See gh-20192
2020-02-16 17:19:18 +01:00
Andy Wilkinson bf8ed44453 Upgrade to Spring AMQP 2.2.4.RELEASE
Closes gh-20106
2020-02-15 13:14:04 +00:00
Andy Wilkinson e065ee7be2 Merge branch '2.1.x' into 2.2.x
Closes gh-20183
2020-02-14 14:47:03 +00:00
Andy Wilkinson b9c2d775a9 Merge branch '2.2.x'
Closes gh-20185
2020-02-14 14:43:46 +00:00
Stephane Nicoll ddeac66ca2 Merge branch '2.2.x'
Closes gh-20186
2020-02-14 15:30:26 +01:00
Stephane Nicoll 40d1727cc5 Polish "Document sanitized keys and uri sanitization behavior"
See gh-20169
2020-02-14 15:29:47 +01:00
Juzer Ali 30f7f9c9c4 Document sanitized keys and uri sanitization behavior
See gh-20169
2020-02-14 15:28:36 +01:00
Stephane Nicoll b56c4f1a4d Polish "Add support for configuring Jetty's backing queue"
See gh-19494
2020-02-14 14:54:28 +01:00
Andy Wilkinson d61b035640 Merge branch '2.1.x' into 2.2.x
Closes gh-20183
2020-02-14 13:54:23 +00:00
cbono 852734b129 Add support for configuring Jetty's backing queue
See gh-19494
2020-02-14 14:01:06 +01:00
Andy Wilkinson c8907d46b4 Fix up-to-date checking of build info properties
Closes gh-20135
2020-02-14 11:56:19 +00:00
Stephane Nicoll a6fdbdcd80 Merge branch '2.2.x'
Closes gh-20178
2020-02-14 10:26:39 +01:00
Dave Syer dcaaf9785f Remove duplicate auto-configuration class
See gh-20168
2020-02-14 10:25:19 +01:00
Stephane Nicoll 2ede9e63b9 Merge branch '2.1.x' into 2.2.x
Closes gh-20117
2020-02-14 10:20:33 +01:00
Stephane Nicoll 32c1dd45a9 Revert "Merge pull request #19926 from xak2000"
Closes gh-19926
2020-02-14 10:18:02 +01:00
Andy Wilkinson 18576373d0 Upgrade to Spring Session Dragonfruit-M2
Closes gh-20045
2020-02-13 20:18:04 +00:00
Andy Wilkinson 09fa8255cd Upgrade to Tomcat 9.0.31
Closes gh-20167
2020-02-13 20:17:18 +00:00
Stephane Nicoll db9f2734fe Upgrade to Micrometer 1.3.5
Closes gh-20166
2020-02-13 14:02:33 +01:00
Stephane Nicoll 4d51a16b11 Upgrade to Liquibase 3.8.6
Closes gh-20165
2020-02-13 14:02:32 +01:00
Stephane Nicoll 8212ee49b3 Upgrade to Lettuce 5.2.2.RELEASE
Closes gh-20164
2020-02-13 14:02:30 +01:00
Stephane Nicoll be58d1a310 Upgrade to Infinispan 10.1.2.Final
Closes gh-20163
2020-02-13 14:02:28 +01:00
Stephane Nicoll 5f826cdbd2 Upgrade to Hibernate 5.4.11.Final
Closes gh-20162
2020-02-13 14:02:26 +01:00
Stephane Nicoll ca4d5b1333 Upgrade to Flyway 6.2.3
Closes gh-20161
2020-02-13 14:02:24 +01:00
Stephane Nicoll faaf9a7e0c Upgrade to SendGrid 4.4.4
Closes gh-20092
2020-02-13 13:49:56 +01:00
Andy Wilkinson 68f59a0d40 Move dependency management for JNA into spring-boot-parent
Previously, dependency management for JNA was provided by
spring-boot-dependencies so it affected users' applications. It was
original added for Elasticsearch but is no longer needed for that
purpose. We use JNA in spring-boot-buildpack-platform which is used
by our Gradle and Maven plugins and should not affect an application's
use of JNA.

This commit moves management of JNA from spring-boot-dependencies into
spring-boot-parent. This means that users' applications will now be
free to use whatever version of JNA meets their needs while still
controlling the version used for image building via Gradle or Maven.

Closes gh-20156
2020-02-13 12:26:40 +00:00
Andy Wilkinson 903a4a48e8 Fix configuration property references in the reference docs
Previously, the configprop macro was being used in the source but the
extension that implements the macro was not available to Asciidoctor.
This led to the references not being checked at build time and the
macro being left as-is in the rendered documentation.

This commit updates the dependencies that are available to Asciidoctor
to include the extension and the projects which define the
configuration properties referenced in the documentation.

Closes gh-20149
2020-02-13 11:51:43 +00:00
Andy Wilkinson 8577a39a96 Upgrade to Spring Asciidoctor Extensions 0.4.1.RELEASE
Closes gh-20158
2020-02-13 11:45:29 +00:00
dreis2211 23bf948101 Upgrade to Asciidoctor Gradle JVM 3.0.0
See gh-19953
2020-02-13 09:42:17 +00:00
Stephane Nicoll db1c9f4058 Remove plugin management for infinispan-protocol-parser-generator
Closes gh-20155
2020-02-13 09:59:23 +01:00
Stephane Nicoll cd11b74db7 Remove usage of Infinispan BOM
Closes gh-20154
2020-02-13 09:58:36 +01:00
Russell Scheerer d61029a37a Fix Spring Boot version reference in spring-boot-starter-parent
See gh-20143
2020-02-13 08:30:21 +01:00
Andy Wilkinson 7970bf2437 Upgrade to Spring Integration 5.3.0.M2
Closes gh-20104
2020-02-12 20:04:05 +00:00
Andy Wilkinson 9860f9705c Upgrade to Spring AMQP 2.2.4.RELEASE
Closes gh-20105
2020-02-12 20:03:16 +00:00
Andy Wilkinson f22aeda0ce Upgrade to Spring Kafka 2.4.2.RELEASE
Closes gh-20107
2020-02-12 20:02:33 +00:00
Scott Frederick e294d26458 Set ephemeral builder container creation to a fixed date
This commit fixes the `Created` date and time of the ephemeral builder
container image at the Windows epoch plus one second
(1980-01-01T00:00:01Z). This date matches the created date of the builder
image and influences the created date of the resulting image. Using
a fixed date for images ensures that the digest is consistent for all
images with the same version.

Fixes gh-20126
2020-02-12 13:55:54 -06:00
Scott Frederick 191dce3f5e Set Spring Boot version in ephemeral builder
This commit adds a `createdBy` structure to the metadata of the ephemeral
builder container image that identifies Spring Boot as the creator of the
image, along with the Spring Boot version.

See gh-20126
2020-02-12 13:31:21 -06:00
Brian Clozel 97af0b2f3a Add actuator specific ObjectMapper
Prior to this commit, Actuator endpoints would use the application
ObjectMapper instance for serializing payloads as JSON. This was
problematic in several cases:

* application-specific configuration would change the actuator endpoint
output.
* choosing a different JSON mapper implementation in the application
would break completely some endpoints.

Spring Boot Actuator already has a hard dependency on Jackson, and this
commit uses that fact to configure a shared `ObjectMapper` instance that
will be used by the Actuator infrastructure consistently, without
polluting the application context.

This `ObjectMapper` is used in Actuator for:

* JMX endpoints
* Spring MVC endpoints with an HTTP message converter
* Spring WebFlux endpoints with an `Encoder`
* Jersey endpoints with a `ContextResolver<ObjectMapper>`

For all web endpoints, this configuration is limited to the
actuator-specific media types such as
`"application/vnd.spring-boot.actuator.v3+json"`.

Fixes gh-12951
2020-02-12 20:10:25 +01:00
Andy Wilkinson 420af17570 Merge branch '2.2.x'
Closes gh-20148
2020-02-12 18:05:50 +00:00
dreis2211 92b4ba6367 Fix structuring your code link in multi-page HTML documentation
Closes gh-19953
2020-02-12 17:43:08 +00:00
Andy Wilkinson 2f16898c5f Upgrade to Spring Data Neumann-M3
Closes gh-20103
2020-02-12 14:26:41 +00:00
Andy Wilkinson 5fed25bb43 Upgrade to Spring HATEOAS 1.1.0.M2
Closes gh-20142
2020-02-12 14:09:07 +00:00
dreis2211 450ef36c72 Exclude jcl-over-slf4j also on Reactive Cassandra starter
See gh-20141
2020-02-12 14:57:39 +01:00
Stephane Nicoll d19920ae39 Upgrade to Cassandra Driver 4.4.0
Closes gh-20064
2020-02-12 12:54:02 +01:00
Madhura Bhave fe325c06c2 Merge branch '2.2.x' 2020-02-11 19:43:42 -08:00
Madhura Bhave 4eb71fc424 Merge branch '2.1.x' into 2.2.x 2020-02-11 19:43:19 -08:00
Madhura Bhave 97ac6c9de7 Polish 2020-02-11 19:41:54 -08:00
Madhura Bhave 8d9b1d2988 Merge branch '2.2.x'
Closes gh-20133
2020-02-11 19:04:12 -08:00
Madhura Bhave 98a657fedb Merge branch '2.1.x' into 2.2.x
Closes gh-20132
2020-02-11 19:02:19 -08:00
Madhura Bhave ac91f14f05 Polish "Verify ssl key alias on server startup"
See gh-19202
2020-02-11 17:08:59 -08:00
cbono e351605962 Verify ssl key alias on server startup
See gh-19202
2020-02-11 17:04:31 -08:00
Madhura Bhave a5a2d52ee3 Merge branch '2.2.x' 2020-02-11 14:58:06 -08:00
Madhura Bhave 3bdd91a119 Merge branch '2.1.x' into 2.2.x 2020-02-11 14:57:49 -08:00
Madhura Bhave 747eab020d Update copyright of changed files 2020-02-11 14:57:17 -08:00
Madhura Bhave c5ffe198af Merge branch '2.2.x'
Closes gh-20130
2020-02-11 14:54:27 -08:00
Madhura Bhave d1c7699539 Merge branch '2.1.x' into 2.2.x
Closes gh-20129
2020-02-11 14:53:30 -08:00
Madhura Bhave 544dca7f1b Polish contribution
Along with surrounding map keys with dot from VCAP_SERVICES with `[ ]`,
this commit also does that for non-alphanumeric and `-` characters so that
they are not stripped off later.

See gh-18915
2020-02-11 14:50:55 -08:00
Hans Schulz 6828a15d31 Handle JSON keys containing a dot from CF environment as a single path segment
See gh-18915
2020-02-11 14:50:04 -08:00
Stephane Nicoll 00b10e655e Merge branch '2.2.x'
Closes gh-20125
2020-02-11 16:27:33 +01:00
Stephane Nicoll 8f06d819e4 Harmonize JMS connection factory bean names
This commit restores consistent naming for the auto-configured
connection factory.

Closes gh-19565
2020-02-11 16:23:56 +01:00
Stephane Nicoll b21a41cde1 Merge branch '2.2.x'
Closes gh-20124
2020-02-11 14:27:33 +01:00
Stephane Nicoll d1f4a1821c Merge branch '2.1.x' into 2.2.x
Closes gh-20123
2020-02-11 14:26:57 +01:00
Stephane Nicoll b0aba9ed67 Document how to register a blocking health contributor with reactive
Closes gh-19707
2020-02-11 14:22:16 +01:00
dreis2211 cfc16c2589 Remove redundant jar task configuration
See gh-20113
2020-02-11 13:54:57 +01:00
Stephane Nicoll 3229142188 Merge branch '2.2.x'
Closes gh-20121
2020-02-11 13:50:54 +01:00
Stephane Nicoll 765b2178d1 Document spring-boot.run.arguments behaviour with multiple arguments
Closes gh-19998
2020-02-11 13:39:10 +01:00
Stephane Nicoll 466c1ba251 Merge branch '2.2.x'
Closes gh-20118
2020-02-11 10:31:03 +01:00
Stephane Nicoll a425cc1b46 Merge branch '2.1.x' into 2.2.x
Closes gh-20117
2020-02-11 10:30:19 +01:00
Ruslan Stelmachenko 5f7e1ac4f2 Remove unnecessary leading slash in changelog locations
See gh-19926
2020-02-11 10:14:49 +01:00
Stephane Nicoll 32bd845a7d Merge branch '2.2.x'
Closes gh-20116
2020-02-11 09:31:03 +01:00
Stephane Nicoll 66809c6c1e Polish "Fix condition source in OnBeanCondition"
See gh-19948
2020-02-11 09:27:59 +01:00
Jorge Cordoba 547fc30ead Fix condition source in OnBeanCondition
See gh-19948
2020-02-11 09:10:07 +01:00
Madhura Bhave 19b7dc8e4f Merge branch '2.2.x'
Closes gh-20114
2020-02-10 17:11:33 -08:00
Madhura Bhave d485708f68 Fix 404 when composite contributor is added to a group
Fixes gh-19974
2020-02-10 17:09:01 -08:00
Madhura Bhave ec42dcd173 Fix typo 2020-02-10 15:22:13 -08:00
dreis2211 aa0360e1ba Fix some deprecation warnings
See gh-20108
2020-02-10 15:28:30 +01:00
Stephane Nicoll ddcf5966bb Disable Spring Data Neo4j's open session in view by default
Closes gh-20012
2020-02-10 12:28:25 +01:00
Stephane Nicoll 77bdf992ec Polish "Create HazelCastClient if necessary"
See gh-20109
2020-02-10 11:41:10 +01:00
Dmytro Nosan 67dd9ad537 Create HazelCastClient if necessary
This commit makes sure to create a HazelcastClient if an instance name
is provided in configuration and if no such client already exists. This
harmonizes the behaviour with of the server counter-part.

See gh-20109
2020-02-10 11:39:55 +01:00
Stephane Nicoll e8b97dbc75 Start building against Spring Kafka 2.4.2 snapshots
See gh-20107
2020-02-09 08:58:00 +01:00
Stephane Nicoll cf06eec174 Start building against Spring AMQP 2.2.4 snapshots
See gh-20105
2020-02-09 08:57:25 +01:00
Stephane Nicoll a053d207d6 Start building against Spring Integration 5.3 M2 snapshots
See gh-20104
2020-02-09 08:56:44 +01:00
Stephane Nicoll 9d60afdbc4 Merge branch '2.2.x'
Closes gh-20100
2020-02-08 09:12:24 +01:00
Stephane Nicoll 76c21571b4 Remove unnecessary dependency on sendgrid
Closes gh-20099
2020-02-08 09:11:03 +01:00
Stephane Nicoll 2af93b5297 Upgrade to Undertow 2.0.29.Final
Closes gh-20096
2020-02-08 08:04:08 +01:00
Stephane Nicoll 5e02227b02 Upgrade to UnboundID LDAPSDK 4.0.14
Closes gh-20095
2020-02-08 08:04:08 +01:00
Stephane Nicoll 577c8812c5 Upgrade to Spring Retry 1.2.5.RELEASE
Closes gh-20094
2020-02-08 08:04:08 +01:00
Stephane Nicoll cba97d5f3a Upgrade to SLF4J 1.7.30
Closes gh-20093
2020-02-08 08:04:08 +01:00
Stephane Nicoll 9cf448b754 Upgrade to Selenium HtmlUnit 2.37.0
Closes gh-20091
2020-02-08 07:44:15 +01:00
Stephane Nicoll 4c1a1b0e0c Upgrade to RxJava2 2.2.17
Closes gh-20090
2020-02-08 07:44:15 +01:00
Stephane Nicoll 4296dbb792 Upgrade to Prometheus PushGateway 0.8.1
Closes gh-20089
2020-02-08 07:44:15 +01:00
Stephane Nicoll 31973ce43d Upgrade to Postgresql 42.2.10
Closes gh-20088
2020-02-08 07:44:15 +01:00
Stephane Nicoll e63d90b791 Upgrade to Pooled JMS 1.1.1
Closes gh-20087
2020-02-08 07:44:15 +01:00
Stephane Nicoll e3f18a09e4 Upgrade to OkHttp3 3.14.6
Closes gh-20086
2020-02-08 07:44:15 +01:00
Stephane Nicoll 42e082c2e2 Upgrade to Neo4j OGM 3.2.8
Closes gh-20085
2020-02-08 07:44:15 +01:00
Stephane Nicoll 475cbf39e4 Upgrade to MySQL 8.0.19
Closes gh-20084
2020-02-08 07:44:15 +01:00
Stephane Nicoll d32b9afdd9 Upgrade to Mockito 3.2.4
Closes gh-20083
2020-02-08 07:44:15 +01:00
Stephane Nicoll c50d600bd8 Upgrade to MariaDB 2.5.4
Closes gh-20082
2020-02-08 07:44:15 +01:00
Stephane Nicoll 4efdea5fb8 Upgrade to Lombok 1.18.12
Closes gh-20081
2020-02-08 07:44:15 +01:00
Stephane Nicoll 7c46b3dd52 Upgrade to Liquibase 3.8.5
Closes gh-20080
2020-02-08 07:44:15 +01:00
Stephane Nicoll 7dccc10803 Upgrade to jOOQ 3.12.4
Closes gh-20079
2020-02-08 07:44:14 +01:00
Stephane Nicoll 2b99345733 Upgrade to Johnzon 1.2.3
Closes gh-20078
2020-02-08 07:44:14 +01:00
Stephane Nicoll 3e0515da2f Upgrade to Jetty Reactive HTTPClient 1.1.1
Closes gh-20077
2020-02-08 07:44:14 +01:00
Stephane Nicoll acbdf0cd2f Upgrade to Jetty EL 8.5.49
Closes gh-20076
2020-02-08 07:44:14 +01:00
Stephane Nicoll e0cd00e0d3 Upgrade to HttpCore 4.4.13
Closes gh-20075
2020-02-08 07:44:14 +01:00
Stephane Nicoll 7996a32129 Upgrade to HttpClient 4.5.11
Closes gh-20074
2020-02-08 07:44:14 +01:00
Stephane Nicoll 616a33367f Upgrade to HtmlUnit 2.37.0
Closes gh-20073
2020-02-08 07:44:14 +01:00
Stephane Nicoll 95c4f1b0c0 Upgrade to HikariCP 3.4.2
Closes gh-20072
2020-02-08 07:44:14 +01:00
Stephane Nicoll f0d2d320c2 Upgrade to Hibernate Validator 6.1.2.Final
Closes gh-20071
2020-02-08 07:44:14 +01:00
Stephane Nicoll da7dbf085e Upgrade to Hibernate 5.4.10.Final
Closes gh-20070
2020-02-08 07:44:14 +01:00
Stephane Nicoll 466dd66c8f Upgrade to Hazelcast 3.12.6
Closes gh-20069
2020-02-08 07:44:14 +01:00
Stephane Nicoll 93d34781fc Upgrade to Groovy 2.5.9
Closes gh-20068
2020-02-08 07:44:14 +01:00
Stephane Nicoll a7249d20d2 Upgrade to Flyway 6.2.2
Closes gh-20067
2020-02-08 07:44:14 +01:00
Stephane Nicoll ad8fa8f6a0 Upgrade to Elasticsearch 7.5.2
Closes gh-20066
2020-02-08 07:44:14 +01:00
Stephane Nicoll f8087a6f29 Upgrade to Couchbase Client 2.7.12
Closes gh-20065
2020-02-08 07:44:14 +01:00
Stephane Nicoll f0ac9e1389 Upgrade to Caffeine 2.8.1
Closes gh-20063
2020-02-07 16:49:24 +01:00
Stephane Nicoll f883a6cf26 Upgrade to Byte Buddy 1.10.7
Closes gh-20062
2020-02-07 16:49:24 +01:00
Stephane Nicoll 730683ce26 Upgrade to Awaitility 4.0.2
Closes gh-20061
2020-02-07 16:49:24 +01:00
Stephane Nicoll c5d38e0b5f Upgrade to AppEngine SDK 1.9.78
Closes gh-20060
2020-02-07 16:49:24 +01:00
Stephane Nicoll aa56a6f647 Add missing mockito dependency
Closes gh-20097
2020-02-07 16:48:44 +01:00
Stephane Nicoll 6e3636d5ff Merge branch '2.2.x'
Closes gh-20059
2020-02-07 14:29:27 +01:00
Stephane Nicoll ddb5cc3f99 Polish "Make Kubernetes detection slightly more efficient"
See gh-19002
2020-02-07 14:24:39 +01:00
med-amine.dahmen aee22bfb51 Make Kubernetes detection slightly more efficient
See gh-19002
2020-02-07 13:45:50 +01:00
Madhura Bhave eeab9233cc Merge branch '2.2.x'
Closes gh-20056
2020-02-06 17:45:19 -08:00
Madhura Bhave acc453db4a Polish contribution
See gh-19999
2020-02-06 17:36:05 -08:00
cbono badc83d368 Add 'uris', 'address' and 'addresses' to keys to sanitize.
See gh-19999
2020-02-06 17:23:23 -08:00
Scott Frederick 12c640e133 Upgrade default image builder version
This commit upgrades the default CNB builder image from
cloudfoundry/cnb:0.0.43-bionic to cloudfoundry/cnb:0.0.53-bionic.
It also adds integration tests for the Maven and Gradle plugins
to verify both versions are supported.
2020-02-06 17:24:29 -06:00
Scott Frederick d07062652e Add support for CNB platform API v0.2
Cloud Native Buildpacks platform API version 0.2 introduced
two breaking changes: the order of invoking the restore and analyze
phases was reversed, and the cache phase was removed in favor of
distributing caching across other phases.

This commit adds support for Cloud Native Buildpacks builders that
implement platform API version 0.2, while maintaining compatibility
with builders that implement Lifecycle version platform API
version 0.1.

Closes gh-19829
2020-02-06 17:24:29 -06:00
Stephane Nicoll f5d7e77550 Polish "Use Dropwizard metrics BOM to manage dependencies"
See gh-20032
2020-02-06 16:59:34 +01:00
dreis2211 68bff6705e Use Dropwizard metrics BOM to manage dependencies
See gh-20032
2020-02-06 16:58:39 +01:00
dreis2211 20251ccae4 Remove superfluous useJUnit()
See gh-20035
2020-02-06 16:54:51 +01:00
Johnny Lim 6818279751 Fix typo
See gh-20049
2020-02-06 16:39:25 +01:00
Russell Scheerer 7f23b9dc16 Fix variable reference in maven-shade-plugin configuration
See gh-20052
2020-02-06 16:37:08 +01:00
dreis2211 268f696d19 Add missing deployed plugin to modules
This commit registers 'org.springframework.boot.deployed' to
spring-boot-configuration-metadata and spring-boot-properties-migrator
to make sure they are deployed as expected.

See gh-20051
2020-02-06 16:29:20 +01:00
Andy Wilkinson 7a9462bd37 Upgrade to Spring Security 5.3.0.RC1
Closes gh-20046
2020-02-05 20:54:31 +00:00
Andy Wilkinson bc3ee5b232 Upgrade to RSocket 1.0.0-RC6
Closes gh-20048
2020-02-05 20:54:15 +00:00
Andy Wilkinson ab512edb96 Upgrade to Spring Session Dragonfruit-M1
Closes gh-20045
2020-02-05 18:04:23 +00:00
Andy Wilkinson 5c2b28cb57 Merge branch '2.2.x'
Closes gh-20043
2020-02-05 14:10:04 +00:00
Andy Wilkinson 45fd60337d Merge branch '2.1.x' into 2.2.x
Closes gh-20042
2020-02-05 14:07:05 +00:00
Andy Wilkinson b6a408ae77 Upgrade to Spring Asciidoctor Extensions 0.4.0.RELEASE
Closes gh-20041
2020-02-05 14:04:14 +00:00
Madhura Bhave 9382cd4db1 Polish wildcard location documentation 2020-02-04 19:44:56 -08:00
Madhura Bhave 3f9d0058ad Document new Docker-related features
Closes gh-19868
2020-02-04 18:36:39 -08:00
Scott Frederick 56c5a3de6d Disambiguate a class in RabbitMQ CLI sample
Fixes gh-20003
2020-02-04 14:23:42 -06:00
Stephane Nicoll 1c87325420 Merge branch '2.2.x' 2020-02-04 10:19:22 +01:00
Stephane Nicoll d85bdfb23c Fix checkstyle violation 2020-02-04 10:19:01 +01:00
Stephane Nicoll 9aef2bde77 Merge branch '2.2.x'
Closes gh-20030
2020-02-04 10:09:11 +01:00
Stephane Nicoll 10643b7702 Polish "Stop time web metrics when autotime is disabled"
See gh-19981
2020-02-04 10:03:08 +01:00
babjo e323e05eea Stop time web metrics when autotime is disabled
See gh-19981
2020-02-04 09:50:49 +01:00
Stephane Nicoll 6213ff6aab Merge branch '2.2.x'
Closes gh-20029
2020-02-04 09:20:16 +01:00
Stephane Nicoll fa239a0628 Merge branch '2.1.x' into 2.2.x
Closes gh-20028
2020-02-04 09:18:22 +01:00
Stephane Nicoll 12b644d73c Polish contribution
See gh-19901
2020-02-04 09:03:55 +01:00
Dmytro Nosan aead3a7c44 Handle message of @ResponseStatus-annotated exception with WebFlux
See gh-19901
2020-02-04 09:03:45 +01:00
Madhura Bhave 0a377647ca Import OAuth2 auto-configurations in web slice tests
Fixes gh-19823
2020-02-03 18:03:52 -08:00
Scott Frederick 60f5bb1636 Remove health actuator code deprecated in 2.2
This partially re-applies the deprecation removal from commit
df1837a16b,
without removing CompositeHealthIndicator, HealthAggregator, and related
configuration that is required by Spring Cloud.
2020-02-03 17:07:56 -06:00
Madhura Bhave e64a145ef0 Add support for wildcard locations for properties and YAML files
Closes gh-19909
2020-02-03 13:01:01 -08:00
Scott Frederick de1a26cf35 Revert "Remove deprecated HealthIndicator and HealthAggregator 2.2 code"
This reverts commit df1837a16b.
2020-02-03 14:02:39 -06:00
Stephane Nicoll b5e23e7405 Update copyright year of changed files
See gh-20020
2020-02-03 17:39:40 +01:00
Johnny Lim b67ece48e4 Polish
See gh-20020
2020-02-03 17:37:01 +01:00
dreis2211 e4a95a8047 Upgrade to Ivy 2.5.0
See gh-20022
2020-02-03 17:35:33 +01:00
dreis2211 2d9902f10e Fix link to Spring Integration Graph documentation
See gh-19992
2020-02-03 17:32:02 +01:00
Stephane Nicoll 90e3d88793 Fix link to Spring Integration Graph documentation
Closes gh-20023
2020-02-03 17:30:37 +01:00
Stephane Nicoll 5833d2c5e8 Fix Embedded Mongo classpath check
This commit changes the classpath check condition to verify that the
core module of the MongoDB driver is present. Previously, we were only
checking for the presence of the sync driver, making embedded support
unavailable with the reactive variant.

Closes gh-19960
2020-02-03 16:06:30 +01:00
Stephane Nicoll c4daff7225 Polish "Upgrade to MongoDB Java Driver 4.0 beta1"
See gh-19960
2020-02-03 14:12:46 +01:00
Christoph Strobl d2d6dbdc00 Upgrade to MongoDB Java Driver 4.0 beta1
See gh-19960
2020-02-03 10:59:30 +01:00
dreis2211 326092b69e Upgrade to Ant 1.10.7
See gh-20002
2020-02-03 10:29:24 +01:00
Stephane Nicoll 52659b1df4 Merge branch '2.2.x'
Closes gh-20013
2020-02-03 09:44:40 +01:00
Johnny Lim 6ef288f45b Polish samples in doc
See gh-20004
2020-02-03 09:37:06 +01:00
dreis2211 56df70b0e7 Use Spring 5 module of Jersey
See gh-20009
2020-02-03 09:34:57 +01:00
Andy Wilkinson bca98c5126 Use a RegularFileProperty to configure BootBuildImage's input jar
Closes gh-20010
2020-02-02 14:39:50 +00:00
Johnny Lim 0ddf8be151 Polish
See gh-20001
2020-02-01 16:13:51 +01:00
Stephane Nicoll 9b79208b60 Upgrade copyright date
See gh-19995
2020-02-01 09:26:50 +01:00
Johnny Lim e6d5f5a271 Polish
See gh-19995
2020-02-01 09:24:20 +01:00
Scott Frederick afb67887da Restore deprecated class required by Spring Cloud
See gh-19860
2020-01-31 17:13:09 -06:00
Phillip Webb cbacab5e26 Polish 2020-01-30 17:14:36 -08:00
Phillip Webb 1eee83a07e Update copyright year of changed files 2020-01-30 17:09:49 -08:00
Phillip Webb 234c5033d4 Polish whitespace 2020-01-30 17:09:49 -08:00
Scott Frederick 653cabe2ce Add documentation for gradle bootBuildImage task 2020-01-30 17:54:15 -06:00
Madhura Bhave bceed1305f Jar files added after build time should be added to classpath
Fixes gh-19973
2020-01-30 15:38:49 -08:00
Scott Frederick b281af0b9b Remove adding of existing layers to EphemeralBuilder
Layers were being added to the EphemeralBuilder each time one was
created, but those layers already existed in the base builder image.

Closes gh-19832
2020-01-30 16:34:02 -06:00
Andy Wilkinson 7b0d1eaffc Test the Gradle Plugin against Gradle 6.1.1
Closes gh-19912
2020-01-30 15:12:30 +00:00
Andy Wilkinson 886e7ba38c Merge branch '2.2.x'
Closes gh-19989
2020-01-30 15:10:35 +00:00
Andy Wilkinson a37c170376 Try to make CouchbaseAutoConfigurationIntegrationTests less flakey
Closes gh-19932
2020-01-30 15:10:13 +00:00
Andy Wilkinson 2725264be1 Polishing formatting of DockerApi 2020-01-30 14:08:45 +00:00
Andy Wilkinson 6db5ca97d3 Sort names alphabetically in metrics list response
Closes gh-19934
2020-01-30 14:05:53 +00:00
Andy Wilkinson 28442b5ca5 Lower the minimum required Docker API version to 1.24
Closes gh-19945
2020-01-30 13:57:18 +00:00
Andy Wilkinson 54b3f480b4 Use posix long names when creating tar archive for image building
Fixes gh-19964
2020-01-30 13:31:27 +00:00
Stephane Nicoll bae1d8d780 Polish "Use new AssertJ duration assertions"
See gh-19985
2020-01-30 08:20:49 +01:00
dreis2211 fac6f08ca3 Use new AssertJ duration assertions
See gh-19985
2020-01-30 08:14:49 +01:00
dreis2211 7de3712e56 Upgrade to AssertJ 3.15.0
See gh-19985
2020-01-30 08:14:47 +01:00
Scott Frederick c6a6024062 Stop image building on error from builder
Previously, the image builder used by the build tool plugins ignored
errors from lifecycle phases and continued with subsequent phases.

This commit inspects the status of the builder container after each
lifecycle phase and aborts the image building process if the exit
status of the container after any phase is non-zero.

Fixes #19949
2020-01-29 17:51:32 -06:00
Madhura Bhave dc542b29d8 Merge branch '2.2.x'
Closes gh-19977
2020-01-28 17:00:55 -08:00
Johnny Lim f3aed11714 Update test name in WebFluxTagsTests
See gh-19976
2020-01-28 16:59:43 -08:00
Stephane Nicoll b6c5c3a113 Polish
See gh-19802
2020-01-28 18:22:28 +01:00
Andy Wilkinson 9882e749e9 Merge branch '2.2.x'
Closes gh-19971
2020-01-28 17:17:01 +00:00
Andy Wilkinson 553311c690 Merge branch '2.1.x' into 2.2.x
Closes gh-19970
2020-01-28 17:15:57 +00:00
Andy Wilkinson 140f5e7baf Unwraper handler to find ContextHandler when logging context path
Previously, only the top-level handlers were examined to find the
ContextHandlers and log the context path. If those handlers had
been wrapped, this prevented the ContextHandlers from being found
and an empty string was always logged.

When finding the context path, this commit unwraps the handler held
by a HandlerWrapper until the ContextHandler is found.

Fixes gh-19969
2020-01-28 17:01:11 +00:00
Stephane Nicoll eb852f1ad6 Disable bean overriding by default in ApplicationContextRunner
For consistency with SpringApplication, this commit disables bean
overriding by default in ApplicationContextRunner. Bean overriding can
be enabled again using withAllowBeanDefinitionOverriding.

Closes gh-18019
2020-01-28 15:57:28 +01:00
dreis2211 d8e2349e47 Use Supplier variants of Assert
See gh-19864
2020-01-28 15:04:11 +01:00
Stephane Nicoll 9fbaf7611b Merge branch '2.2.x'
Closes gh-19966
2020-01-28 14:43:54 +01:00
Stephane Nicoll b420bdb3ac Merge branch '2.1.x' into 2.2.x
Closes gh-19965
2020-01-28 14:43:30 +01:00
dreis2211 db2bacc62a Fix Gradle plugin documentation links
See gh-19961
2020-01-28 14:41:05 +01:00
Stephane Nicoll 0516520b7e Polish "Fix scope of CqlSessionBuilder bean"
See gh-19899
2020-01-28 14:12:31 +01:00
Dmytro Nosan c8105413b9 Fix scope of CqlSessionBuilder bean
See gh-19899
2020-01-28 13:49:20 +01:00
Stephane Nicoll 2a01c0262b Merge branch '2.2.x'
Closes gh-19958
2020-01-28 11:13:30 +01:00
Stephane Nicoll 9d0918bb2e Merge branch '2.1.x' into 2.2.x
Closes gh-19957
2020-01-28 11:13:06 +01:00
Pascal Verdage 930ec51968 Fix typo
See gh-19956
2020-01-28 11:12:21 +01:00
dreis2211 741a4f4b2b Fix links in Maven Plugin documentation
See gh-19952
2020-01-28 10:50:36 +01:00
wonwoo 8703c04475 Register Stackdriver auto-config in `META-INF/spring.factories`
See gh-19955
2020-01-28 10:49:59 +01:00
Stephane Nicoll 83b38599b1 Apply consistent timeout for Cassandra integration tests
Closes gh-19802
2020-01-28 10:46:47 +01:00
Madhura Bhave 84ea3d359b Increase timeout for Cassandra tests
Closes gh-19802
2020-01-27 16:37:50 -08:00
Stephane Nicoll 5410148f79 Improve documentation of 'image' parameter of Maven Plugin
Closes gh-19950
2020-01-27 20:56:42 +01:00
Stephane Nicoll 11c5fba355 Remove unnecessary execution-specific configuration in documentation
This documentation moves the specific `build-image` execution
configuration example of the Maven plugin documentation to the general
plugin configuration. This makes sure that it works in most cases and
an execution-specific configuration is not required here anyway.

Closes gh-19946
2020-01-27 20:12:00 +01:00
Stephane Nicoll ed14173865 Polish "Upgrade to Flyway 6.2.0"
See gh-19894
2020-01-27 15:20:08 +01:00
Kedar Joshi 0ae075efd5 Upgrade to Flyway 6.2.0
See gh-19894
2020-01-27 14:56:04 +01:00
Stephane Nicoll 07a1783572 Polish "Introduce appendix section with version properties"
See gh-19898
2020-01-27 14:53:52 +01:00
dreis2211 65394582f6 Introduce appendix section with version properties
With the introduction of Gradle we lost the list of version properties
that were previously in the spring-boot-dependencies POM and were also
linked inside the documentation. This commit introduces an appendix
section in the docs and links the appropriate places to the new section
to restore discoverability.

See gh-19898
2020-01-27 14:53:32 +01:00
dreis2211 b49e01f67a Fix broken documentation links
See gh-19936
2020-01-27 14:14:30 +01:00
Stephane Nicoll 51f6256035 Merge branch '2.2.x' 2020-01-27 14:14:07 +01:00
Stephane Nicoll 9ca15ee00d Fix broken documentation links
See gh-19936
2020-01-27 14:13:25 +01:00
Stephane Nicoll f0e93f0e1d Migrate Couchbase tests to ApplicationContextRunner 2020-01-27 13:52:49 +01:00
Stephane Nicoll a1e6a20915 Simplify default value for Spring Data Couchbase's typeKey
This commit hard codes the default value so that the annotation
processor picks it up. The default value is tested for consistency so
this is acceptable as providing the default value in the metadata
requires to hard code it anyway.
2020-01-27 13:52:49 +01:00
Andy Wilkinson 63b736d1f0 Fix NPE when waiting for named socket path to become available
Fixes gh-19941
2020-01-27 11:38:19 +00:00
Stephane Nicoll af4fdf0d6d Polish "Add support for Spring Data Couchbase custom type key"
See gh-19789
2020-01-27 11:09:41 +01:00
Grudi Radev d1a44dfacd Add support for Spring Data Couchbase custom type key
See gh-19789
2020-01-27 11:08:40 +01:00
Stephane Nicoll 3290313eb7 Fix Docker socket creation on Windows
Closes gh-19908
2020-01-27 07:29:16 +01:00
Andy Wilkinson 66d4319abd Deprecate refresh(ApplicationContext) and add refresh(ConfigurableAC)
refresh can only ever be called with a ConfigurableApplicationContext
and we want to evolve the refresh API to reflect that. This commit
takes the first step by overloading refresh(ApplicationContext) with
a new refresh(ConfigurationApplicationContext) method and deprecating
refresh(ApplicationContext). Where the call to refresh is made, the
argument is cast to ApplicationContext to ensure that
refresh(ApplicationContext) is called. This ensures that any existing
override of the method is still effective.

Closes gh-18519
2020-01-26 11:39:58 +00:00
Stephane Nicoll d1867c1b8b Merge branch '2.2.x'
Closes gh-19930
2020-01-26 08:44:01 +01:00
dreis2211 56ab129077 Upgrade to Testcontainers 1.12.5
See gh-19902
2020-01-26 08:42:28 +01:00
dreis2211 d75de39456 Upgrade to JUnit Jupiter 5.6.0
See gh-19907
2020-01-26 08:39:12 +01:00
Andy Wilkinson 4130638702 Upgrade to SQLite JDBC 3.30.1
Closes gh-19925
2020-01-25 13:23:40 +00:00