Commit Graph

13930 Commits

Author SHA1 Message Date
dreis2211 01b0156fed Allow additional JVM args when running tests via toolchain
See gh-27089
2021-07-13 15:24:45 +01:00
Andy Wilkinson 685b78f504 Merge branch '2.4.x' into 2.5.x
Closes gh-27304
2021-07-13 14:56:26 +01:00
Andy Wilkinson 49baacbc1c Polish "Mark Redis as down when cluster_state is fail"
See gh-27300
2021-07-13 14:56:01 +01:00
Hoan Vu Hong f31141de09 Mark Redis as down when cluster_state is fail
See gh-27300
2021-07-13 14:35:59 +01:00
Andy Wilkinson 7332b43a9e Merge branch '2.4.x' into 2.5.x
Closes gh-27162
2021-07-13 13:53:45 +01:00
Andy Wilkinson 96e58d815d Upgrade to Reactor 2020.0.9
Closes gh-27159
2021-07-13 13:52:00 +01:00
Andy Wilkinson 6ed7e692a9 Merge branch '2.4.x' into 2.5.x
See gh-27163
2021-07-13 13:13:36 +01:00
Andy Wilkinson 1341ca99db Align with Framework's deprecation of getLastModified
See gh-27160
2021-07-13 13:12:45 +01:00
Andy Wilkinson d9e525c326 Merge branch '2.4.x' into 2.5.x
Closes gh-27301
2021-07-13 12:18:07 +01:00
Andy Wilkinson 2354dd5ccb Include Jetty metrics in list of supported metrics
Closes gh-27299
2021-07-13 12:06:28 +01:00
Stephane Nicoll 895a2ed013 Upgrade to Postgresql 42.2.23
Closes gh-27244
2021-07-11 08:12:08 +02:00
Stephane Nicoll bed528f203 Upgrade to jOOQ 3.14.12
Closes gh-27243
2021-07-11 08:12:07 +02:00
Stephane Nicoll 5811b22554 Upgrade to Johnzon 1.2.14
Closes gh-27242
2021-07-11 08:12:07 +02:00
Stephane Nicoll 3c6db2bc28 Upgrade to Jetty 9.4.43.v20210629
Closes gh-27241
2021-07-11 08:12:06 +02:00
Stephane Nicoll 58b03ac56f Upgrade to Jetty Reactive HTTPClient 1.1.10
Closes gh-27240
2021-07-11 08:12:05 +02:00
Stephane Nicoll 88e0916ad6 Upgrade to DB2 JDBC 11.5.6.0
Closes gh-27239
2021-07-11 08:12:04 +02:00
Stephane Nicoll 2d671021d9 Upgrade to AspectJ 1.9.7
Closes gh-27238
2021-07-11 08:12:02 +02:00
dreis2211 dacfe27350 Fix tests for multi-release JARs on JDK 17
See gh-27229
2021-07-10 17:38:16 +02:00
Andy Wilkinson 1cd3a54e88 Rework Quartz DB init dependencies to use a detector
Closes gh-27222
2021-07-09 15:02:15 +01:00
Andy Wilkinson 3de58c2340 Detect JdbcIndexedSessionRepository as depending on DB init
Fixes gh-27220
2021-07-09 14:17:23 +01:00
Andy Wilkinson f008228f1a Polish "Detect JobRepository as depending on DB init"
See gh-27221
2021-07-09 12:36:30 +01:00
Henning Pöttker cf69785393 Detect JobRepository as depending on DB init
See gh-27221
2021-07-09 12:36:19 +01:00
Andy Wilkinson 94f94f30f5 Polish "Detect AbstractDataSourceInitializers as DB initializers"
See gh-27215
2021-07-09 12:05:56 +01:00
Henning Pöttker 433f3d6bc4 Detect AbstractDataSourceInitializers as DB initializers
See gh-27215
2021-07-09 12:04:17 +01:00
Andy Wilkinson 7b94b40a19 Ensure that Session JDBC schema is in place before DB is accessed
Fixes gh-27208
2021-07-09 11:12:52 +01:00
Andy Wilkinson 4b1b2d6603 Consider Flyway and Liquibase as possible Batch DB initializers
This is a follow-on from 3fec4110 which only considered
BatchDataSourceInitializer as a possible initializer of Batch's
database schema. Flyway and Liquibase are now also considered.

Closes gh-27193
2021-07-09 10:29:50 +01:00
Andy Wilkinson 3fec41104e Ensure that Batch schema is in place before DB is accessed
Fixes gh-27193
2021-07-09 09:47:48 +01:00
Stephane Nicoll 25fe6a107a Fix visibility of a type exposed as a bean
Closes gh-27189
2021-07-09 10:40:00 +02:00
Madhura Bhave 0f70c46746 Merge branch '2.4.x' into 2.5.x
Closes gh-27210
Closes gh-27211
2021-07-08 13:04:48 -07:00
Madhura Bhave 42e556dd73 Handle file with name matching an optional wildcard location
Previously, the presence of a file with the same name
as an optional wildcard location would cause a failure. With
this change the pattern is resolved only if the resource is a
directory.

Additionally, if an optional wildcard search location that was a file
would also fail with an exception. This commit fixes that so that those
locations are not resolved.

Fixes gh-27120
Fixes gh-27209
2021-07-08 13:01:15 -07:00
Phillip Webb f32f4a2e3d Merge branch '2.4.x' into 2.5.x
Closes gh-27204
2021-07-08 11:36:25 -07:00
Phillip Webb 84110a22bc Don't change case of 'Sec-WebSocket-Key'
Polish commit 5ca687c9a6 had an accidental side-effect of changing
the 'Sec-WebSocket-Key' header value to lowercase. This breaks
connections since the value needs to be echoed unchanged in the
"Sec-WebSocket-Accept" header.

Fixes gh-27147
2021-07-08 11:29:29 -07:00
Andy Wilkinson b50cefbf8b Upgrade to Postgresql 42.2.23
Closes gh-27202
2021-07-08 18:44:11 +01:00
Andy Wilkinson bce7b9c711 Upgrade to jOOQ 3.14.12
Closes gh-27201
2021-07-08 18:44:09 +01:00
Andy Wilkinson 2c7105965d Upgrade to Johnzon 1.2.14
Closes gh-27200
2021-07-08 18:44:08 +01:00
Andy Wilkinson 81a68651dc Upgrade to Jetty 9.4.43.v20210629
Closes gh-27199
2021-07-08 18:44:07 +01:00
Andy Wilkinson d52117014f Upgrade to Jackson Bom 2.12.4
Closes gh-27198
2021-07-08 18:44:06 +01:00
Andy Wilkinson c96ee0d448 Upgrade to Infinispan 12.1.6.Final
Closes gh-27197
2021-07-08 18:44:04 +01:00
Andy Wilkinson 958c6649f4 Upgrade to DB2 JDBC 11.5.6.0
Closes gh-27196
2021-07-08 18:44:03 +01:00
Andy Wilkinson 4b965ac1ef Upgrade to Caffeine 2.9.2
Closes gh-27195
2021-07-08 18:44:02 +01:00
Andy Wilkinson bcbc742a0e Upgrade to AspectJ 1.9.7
Closes gh-27194
2021-07-08 18:44:00 +01:00
dreis2211 00d3330c9a Avoid illegal reflective access on ZipEntry.xdostime
See gh-27100
2021-07-08 18:05:16 +01:00
Andy Wilkinson ff79787def Avoid using deprecated API to get Kotlin Plugin's version
Closes gh-27090
2021-07-08 10:45:09 +01:00
Andy Wilkinson 283b4a6ed2 Improve error message for non-options-capable ConnectionFactory
Fixes gh-26977
2021-07-08 09:17:55 +01:00
Stephane Nicoll 7eb6cf71f6 Start building against Spring Integration 5.5.2 snapshots
See gh-27166
2021-07-08 08:52:18 +02:00
Stephane Nicoll e426ff6196 Start building against Spring Kafka 2.7.4 snapshots
See gh-27165
2021-07-08 08:51:55 +02:00
Stephane Nicoll 745b79714f Start building against Spring Data 2021.0.3 snapshots
See gh-27164
2021-07-08 08:51:29 +02:00
Stephane Nicoll 36f5d6762b Start building against Spring HATEOAS 1.3.3 snapshots
See gh-27184
2021-07-08 08:51:04 +02:00
Stephane Nicoll 3119179c62 Start building against Spring Framework 5.3.9 snapshots
See gh-27163
2021-07-08 08:50:32 +02:00
Stephane Nicoll 74a0354bf1 Start building against Reactor 2020.0.9 snapshots
See gh-27162
2021-07-08 08:50:06 +02:00
Stephane Nicoll 815ccd14b5 Start building against Spring Data 2020.0.11 snapshots
See gh-27161
2021-07-08 08:45:17 +02:00
Stephane Nicoll 434d4a6f76 Start building against Spring HATEOAS 1.2.8 snapshots
See gh-27183
2021-07-08 08:44:52 +02:00
Stephane Nicoll 861f87911c Start building against Spring Framework 5.3.9 snapshots
See gh-27160
2021-07-08 08:44:23 +02:00
Stephane Nicoll 74d5fdbcd0 Start building against Reactor 2020.0.9 snapshots
See gh-27159
2021-07-08 08:43:53 +02:00
Andy Wilkinson c21791e671 Test our Gradle plugin against Gradle 7.1.1
Closes gh-27142
2021-07-07 17:57:14 +01:00
Stephane Nicoll 888393d63b Merge branch '2.4.x' into 2.5.x
Closes gh-27154
2021-07-06 09:10:03 +02:00
Stephane Nicoll 5ec0c7ed12 Polish "Fix duration to microseconds conversion"
See gh-27149
2021-07-06 09:07:48 +02:00
marckchr a406a46fa1 Fix duration to microseconds conversion
See gh-27149
2021-07-06 09:07:47 +02:00
Madhura Bhave c6acce569f Merge branch '2.4.x' into 2.5.x
See gh-27139
2021-07-02 15:43:15 -07:00
Madhura Bhave 877f618a69 Clarify that HATEOAS can be used with Webflux without starter
Closes gh-26897
2021-07-02 15:36:39 -07:00
Madhura Bhave 503d50f39e Merge branch '2.4.x' into 2.5.x
Closes gh-27139
2021-07-01 15:59:12 -07:00
Madhura Bhave 6c4273b5c9 Document spring hateoas is spring mvc specific
Closes gh-26897
2021-07-01 15:54:01 -07:00
Madhura Bhave 55593a7ac1 Merge branch '2.4.x' into 2.5.x
Closes gh-27137
2021-07-01 15:46:00 -07:00
Madhura Bhave eb4144eb97 Add clarification on when @DevaultValue is used during binding
Closes gh-26742
2021-07-01 15:39:16 -07:00
Stephane Nicoll ddf76c32c6 Update copyright year of updated file
See gh-27085
2021-06-29 08:28:08 +02:00
dreis2211 c852961011 Avoid reflection in tests
See gh-27085
2021-06-29 08:25:45 +02:00
Nurlan Tembayev e57970393c Remove unnecessary unit for spring.datasource.tomcat.max-active
See gh-27103
2021-06-29 08:21:50 +02:00
biergit 79638a8f63 Fix anchor rewrites containing a question mark
See gh-27107
2021-06-29 08:09:45 +02:00
Cèsar Ordiñana 0c38449851 Fix typo in section title
See gh-27102
2021-06-28 08:06:57 +02:00
Brian Clozel 4db53601b5 Fix spring.netty.leak-detection metadata
Fixes gh-27104
2021-06-25 19:38:07 +02:00
Phillip Webb dfbd82b838 Fix Kotlin 1.5.20 classpath issues
See gh-27086
2021-06-24 14:05:36 -07:00
Phillip Webb d44207161f Suppress Kotlin 1.5.20 deprecation warning
See gh-27086
2021-06-24 11:30:58 -07:00
Andy Wilkinson 5a9fa3c8f1 Only close context that is active
Previously, SpringApplicationShutdownHook would call close() on any
registered application context even if it wasn't active as it had
already been closed. This could lead to deadlock if the context was
closed and System.exit was called during application context refresh.

This commit updates SpringApplicationShutdownHook so that it only
calls close() on active contexts. This prevents deadlock as it avoids
trying to sychronize on the context's startupShutdownMonitor on
the shutdown hook thread while it's still held on the main thread
which called System.exit and is waiting for all of the shutdown hooks
to complete.

Fixes gh-27049
2021-06-24 14:07:02 +01:00
Andy Wilkinson 4572ae5430 Use reflection to extract Netty's default level
See gh-27046
2021-06-24 11:20:56 +01:00
Andy Wilkinson e2d68aa8b2 Merge branch '2.4.x' into 2.5.x
See gh-27072
2021-06-24 09:53:04 +01:00
Andy Wilkinson a7872f47da Minimize Instantiator's public API
See gh-27043
2021-06-24 09:27:08 +01:00
Phillip Webb b093db104c Pass ResourceLoader.getClassLoader() to Instantiator
Update calls to `Instantiator` to that they also include
`ResourceLoader.getClassLoader()`.

Closes gh-27071
2021-06-24 00:03:16 -07:00
Phillip Webb 641dfbdf98 Merge branch '2.4.x' into 2.5.x
Fixes gh-27072
2021-06-23 23:32:50 -07:00
Phillip Webb 5088927f80 Pass ClassLoader to Instantiator
Update `Instantiator` so that it can accept a `ClassLoader` when
creating instances and rework `EnvironmentPostProcessorsFactory` to
use the new methods.

Prior to this commit we would use the `ClassLoader` to get the class
names from `SpringFactories` but not when actually creating the
instances.

Fixes gh-27043
2021-06-23 23:30:53 -07:00
Stephane Nicoll d079db1dce Polish
See gh-26978
2021-06-24 08:20:11 +02:00
Stephane Nicoll 57f5030397 Upgrade to Netty tcNative 2.0.40.Final
Closes gh-27070
2021-06-24 07:49:33 +02:00
Stephane Nicoll 43f6393e9a Upgrade to Hazelcast 4.1.4
Closes gh-27069
2021-06-24 07:49:32 +02:00
Stephane Nicoll 6889d2adda Upgrade to Nimbus JOSE JWT 8.22
Closes gh-27068
2021-06-24 07:27:08 +02:00
Stephane Nicoll d4039648c7 Upgrade to OAuth2 OIDC SDK 8.36.2
Closes gh-27067
2021-06-24 07:27:06 +02:00
Stephane Nicoll 1f53e93b8d Upgrade to Netty tcNative 2.0.40.Final
Closes gh-27066
2021-06-24 07:27:05 +02:00
Stephane Nicoll d4fa46f1b9 Polish startup endpoint description in reference doc
Closes gh-26978
2021-06-24 07:19:58 +02:00
Stephane Nicoll 32d6b52980 Upgrade to Spring Integration 5.5.1
Closes gh-26974
2021-06-24 06:40:59 +02:00
Stephane Nicoll dd63f98fcf Upgrade to Spring Kafka 2.7.3
Closes gh-26973
2021-06-24 06:40:34 +02:00
Stephane Nicoll b5cdc84273 Upgrade to Spring AMQP 2.3.9
Closes gh-26972
2021-06-24 06:40:03 +02:00
Stephane Nicoll 006995fef7 Upgrade to Spring Integration 5.4.8
Closes gh-26967
2021-06-24 06:39:11 +02:00
Stephane Nicoll 6804ae849d Upgrade to Spring AMQP 2.3.9
Closes gh-26966
2021-06-24 06:38:42 +02:00
dreis2211 7a25e4edb8 Avoid illegal reflective access in CLI tests
See gh-26930
2021-06-23 21:34:54 -07:00
Phillip Webb 093e7f7e3b Merge branch '2.4.x' into 2.5.x
Closes gh-27062
2021-06-23 21:13:08 -07:00
Phillip Webb 1a7569056b Fix 'spring.datasource.name' property description
Closes gh-27026
2021-06-23 21:12:59 -07:00
Phillip Webb 2c518f1dff Merge branch '2.4.x' into 2.5.x 2021-06-23 21:02:05 -07:00
Phillip Webb a76e5c043e Update copyright year of changed files 2021-06-23 21:01:45 -07:00
Phillip Webb 84fab65b9a Merge branch '2.4.x' into 2.5.x
Closes gh-27060
2021-06-23 21:00:46 -07:00
Phillip Webb ea62967ef4 Improve "reason" message in BindFailureAnalyzer
Update `BindFailureAnalyzer` so that the "Reason" message includes
the root cause exception type and message.

Closes gh-27028
2021-06-23 20:54:01 -07:00
Phillip Webb 0e28e24123 Rethrow ConverterNotFoundException when possible
Update `BindConverter` to throw the first `ConversionFailedException`
rather than always throwing `ConverterNotFoundException`.

See gh-27028
2021-06-23 20:53:35 -07:00
Phillip Webb a77e116c03 Merge branch '2.4.x' into 2.5.x
Closes gh-27058
2021-06-23 17:47:08 -07:00
Phillip Webb 93d316ddd1 Add additional ConfigDataProperties tests
Add more `isActive` tests to cover negative cases.

See gh-27017
2021-06-23 17:46:23 -07:00
fengyuanwei b91c66b823 Fix typo in ConfigDataPropertiesTests
See gh-27017
2021-06-23 17:38:46 -07:00
Phillip Webb fd83158fa5 Merge branch '2.4.x' into 2.5.x 2021-06-23 17:28:31 -07:00
Phillip Webb 63ed921554 Restore simple Library constructor
See gh-15808
2021-06-23 17:27:26 -07:00
Phillip Webb af37f59136 Merge branch '2.4.x' into 2.5.x
Closes gh-27056
2021-06-23 17:13:13 -07:00
Madhura Bhave b790c82732 Apply exclusions to existing war entries
Update `RepackageMojo` and supporting classes so that `exclusions`
on the repackage goal apply to both the contributed libraries and any
existing jar entries already contained in the original war.

Prior to this commit, exclusions would apply to contributed jars (for
example, those in `WEB-INF/lib-provided`) but not jars that were
packaged directly into `WEB-INF/lib` by the war plugin

Fixes gh-15808

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-06-23 15:08:31 -07:00
Brian Clozel bf17f50a1f Align NettyProperties with Netty's defaults
Prior to this commit, `NettyProperties` would use `DISABLED` as the
default level for leak detection in Netty. This is not the default value
enforced by Netty, which is `SIMPLE`.

This commit changes the default configuration property value and ensures
that both stay in sync.

Fixes gh-27046
2021-06-23 19:36:40 +02:00
Andy Wilkinson 01f8cb7639 Merge branch '2.4.x' into 2.5.x
Closes gh-27048
2021-06-23 18:07:33 +01:00
Andy Wilkinson 3746155916 Align Nimbus dependency versions with Spring Security
Closes gh-26820
2021-06-23 17:53:09 +01:00
Stephane Nicoll e0e64e69c0 Upgrade to Micrometer 1.7.1
Closes gh-27015
2021-06-23 17:45:25 +02:00
Stephane Nicoll d0f12392ab Upgrade to Micrometer 1.6.8
Closes gh-27014
2021-06-23 17:41:25 +02:00
Stephane Nicoll 6c2fc8471a Upgrade to Spring Session 2021.0.1
Closes gh-26971
2021-06-23 15:56:28 +02:00
Stephane Nicoll fb2ed6076f Upgrade to Spring Session 2020.0.5
Closes gh-26964
2021-06-23 15:55:57 +02:00
Stephane Nicoll 254a29f9be Upgrade to Nimbus JOSE JWT 9.10
Closes gh-27039
2021-06-23 10:40:06 +02:00
Stephane Nicoll 4a28e21047 Upgrade to OAuth2 OIDC SDK 9.9
Closes gh-27038
2021-06-23 10:39:48 +02:00
Stephane Nicoll f89675a3f1 Upgrade to Neo4j Java Driver 4.2.7
Closes gh-27037
2021-06-23 08:22:15 +02:00
Stephane Nicoll 1a9e3bcbd6 Upgrade to Lettuce 6.1.3.RELEASE
Closes gh-27036
2021-06-23 08:22:14 +02:00
Stephane Nicoll 763870bd45 Upgrade to Dropwizard Metrics 4.1.24
Closes gh-27035
2021-06-23 08:22:12 +02:00
Stephane Nicoll fb1cd82061 Upgrade to OAuth2 OIDC SDK 8.36.2
Closes gh-27034
2021-06-23 07:58:19 +02:00
Stephane Nicoll ded6b26ea5 Upgrade to Neo4j Java Driver 4.1.4
Closes gh-27033
2021-06-23 07:58:18 +02:00
Stephane Nicoll 6db9fe2e36 Upgrade to Lettuce 6.0.6.RELEASE
Closes gh-27032
2021-06-23 07:58:17 +02:00
Stephane Nicoll 9bc1c4dff2 Upgrade to Dropwizard Metrics 4.1.24
Closes gh-27031
2021-06-23 07:58:16 +02:00
Stephane Nicoll 9281dcf751 Upgrade to Spring Data 2021.0.2
Closes gh-26970
2021-06-22 19:22:51 +02:00
Stephane Nicoll 47a9a94376 Upgrade to Spring HATEOAS 1.3.2
Closes gh-26969
2021-06-22 19:22:28 +02:00
Stephane Nicoll 7e09c1d8dc Upgrade to Spring Data 2020.0.10
Closes gh-26963
2021-06-22 19:21:42 +02:00
Stephane Nicoll 58320c6af9 Upgrade to Spring HATEOAS 1.2.7
Closes gh-27013
2021-06-22 19:21:12 +02:00
Stephane Nicoll 7ca9794f3c Upgrade to Reactor 2020.0.8
Closes gh-26968
2021-06-22 14:53:10 +02:00
Stephane Nicoll c21099b142 Upgrade to Reactor 2020.0.8
Closes gh-26962
2021-06-22 14:52:39 +02:00
Andy Wilkinson 051638631b Merge branch '2.4.x' into 2.5.x
Closes gh-27024
2021-06-22 13:02:06 +01:00
Andy Wilkinson ba9244b2d4 Polish "Update docs to use @SpringBootConfiguration not @Configuration"
See gh-26937
2021-06-22 12:55:25 +01:00
Yanming Zhou a5f077cf79 Update docs to use @SpringBootConfiguration not @Configuration
See gh-26937
2021-06-22 12:55:25 +01:00
Andy Wilkinson cf940fd374 Disable Log4j2's shutdown hook by default
Previously, Log4j2's own shutdown hook was only disabled when Log4j2
detected javax.servlet.Servlet on the classpath and, therefore,
determined that it was running in a web application. In an application
without Servlet on the classpath, this could lead to both Log4j2's shut
down hook and and logging system's shutdown handler both stopping
Log4j2. This could result in a failure as the second attempt at stopping
would result in reinitialization which would fail as the JVM is already
shutting down.

This commit introduces a new Log4j2 PropertySource implementation,
registered via META-INF/services, that sets the
log4j.shutdownHookEnabled property to false. This will ensure that
Log4j2's own shutdown hook is disabled by default whenever Spring Boot
is on the classpath and not just in Servlet-based web applications.

Fixes gh-26953
2021-06-22 10:17:25 +01:00
Stephane Nicoll 0a2fe3562d Start building against Micrometer 1.7.1 snapshots
See gh-27015
2021-06-22 09:53:48 +02:00
Stephane Nicoll b8a5d9b882 Start building against Micrometer 1.6.8 snapshots
See gh-27014
2021-06-22 09:35:36 +02:00
Stephane Nicoll 9ab8c625e5 Start building against Spring HATEOAS 1.2.7 snapshots
See gh-27013
2021-06-22 08:31:44 +02:00
dreis2211 03cd6bec6e Avoid illegal reflective access in RabbitAutoConfigurationTests
See gh-26954
2021-06-22 08:22:48 +02:00
Stephane Nicoll 168478f68c Merge branch '2.4.x' into 2.5.x
Closes gh-27010
2021-06-22 08:21:31 +02:00
Sviatoslav Hryb 2252deb69b Document uuid support in RandomValuePropertySource
See gh-26975
2021-06-22 08:16:55 +02:00
Stephane Nicoll 8668e55631 Revert "Avoid dependency on Kotlin when depending on spring-security-config"
Closes gh-26728
2021-06-22 07:55:47 +02:00
Stephane Nicoll 5044137658 Revert "Avoid duplicate crypto classes when depending on spring-security-core"
Closes gh-26588
2021-06-22 07:55:11 +02:00
Stephane Nicoll c67c09df32 Upgrade to Spring Security 5.5.1
Closes gh-26945
2021-06-22 07:54:00 +02:00
Stephane Nicoll 333c7a7cd8 Upgrade to Spring Security 5.4.7
Closes gh-26965
2021-06-22 07:39:35 +02:00
Phillip Webb f914dc15fc Merge branch '2.4.x' into 2.5.x
Closes gh-27005
2021-06-21 18:37:08 -07:00
Phillip Webb 8189e82c02 Allow nested profile-specific resolution
Effectively revert commit 0da0d2d46 so that the `resolveProfileSpecific`
method of `ConfigDataLocationResolver` is again called when resolving
imports declared in a profile-specific file.

Fixes gh-26960
2021-06-21 18:30:03 -07:00
Andy Wilkinson 07e7398d10 Include 6.9.x in version requirements message
Fixes gh-26952
2021-06-21 18:20:08 +01:00
Stephane Nicoll 5dc1065876 Revert "Upgrade to Dropwizard Metrics 4.1.23"
This reverts commit ce24270271.

See gh-26983
2021-06-21 16:53:34 +02:00
Stephane Nicoll 3ef7ba7f9b Upgrade to SLF4J 1.7.31
Closes gh-26995
2021-06-21 16:40:34 +02:00
Stephane Nicoll 68cd28a481 Upgrade to Postgresql 42.2.22
Closes gh-26994
2021-06-21 16:40:34 +02:00
Stephane Nicoll b3b2d9a095 Upgrade to Jetty EL 9.0.48
Closes gh-26993
2021-06-21 16:40:33 +02:00
Stephane Nicoll fc5d781cfc Upgrade to Jedis 3.6.1
Closes gh-26992
2021-06-21 16:40:33 +02:00