Commit Graph

13900 Commits

Author SHA1 Message Date
Stephane Nicoll 573ca50333 Merge branch '2.5.x'
Closes gh-27117
2021-06-29 08:22:13 +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
Stephane Nicoll 53fe7b71f6 Merge branch '2.5.x'
Closes gh-27116
2021-06-29 08:17:30 +02:00
biergit 79638a8f63 Fix anchor rewrites containing a question mark
See gh-27107
2021-06-29 08:09:45 +02:00
Stephane Nicoll 0f20c236da Merge branch '2.5.x'
Closes gh-27112
2021-06-28 08:07:31 +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 f23fa2821c Merge branch '2.5.x'
Closes gh-27106
2021-06-25 19:38:39 +02:00
Brian Clozel 4db53601b5 Fix spring.netty.leak-detection metadata
Fixes gh-27104
2021-06-25 19:38:07 +02:00
Phillip Webb d00db60bab Merge branch '2.5.x' 2021-06-24 14:06:25 -07:00
Phillip Webb dfbd82b838 Fix Kotlin 1.5.20 classpath issues
See gh-27086
2021-06-24 14:05:36 -07:00
Phillip Webb 716e8ab717 Merge branch '2.5.x' 2021-06-24 11:31:33 -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 8b9991fcc7 Merge branch '2.5.x'
Closes gh-27076
2021-06-24 14:07:17 +01: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 d56ddb0f60 Merge branch '2.5.x'
See gh-27050
2021-06-24 11:21:30 +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 9b91c18163 Merge branch '2.5.x'
See gh-27073
2021-06-24 09:53:20 +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 6686a49b1f Merge branch '2.5.x'
Closes gh-27074
2021-06-24 00:04:44 -07: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 fe34bcdd52 Merge branch '2.5.x'
Closes gh-27073
2021-06-23 23:33:18 -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 7d8e7468bf Merge branch '2.5.x'
See gh-27065
2021-06-24 08:22:02 +02: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
Phillip Webb cb3a41c4db Merge branch '2.5.x'
Closes gh-27064
2021-06-23 21:36:28 -07:00
dreis2211 7a25e4edb8 Avoid illegal reflective access in CLI tests
See gh-26930
2021-06-23 21:34:54 -07:00
Phillip Webb 6b241d04c0 Merge branch '2.5.x'
Closes gh-27063
2021-06-23 21:13:18 -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 6102f10639 Merge branch '2.5.x' 2021-06-23 21:02:36 -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 b141fcf51d Merge branch '2.5.x'
Closes gh-27061
2021-06-23 21:01:05 -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 fe95c2a80c Merge branch '2.5.x'
Closes gh-27059
2021-06-23 17:47:19 -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 e85b0c7012 Merge branch '2.5.x' 2021-06-23 17:29:41 -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 5fc0e1ca81 Merge branch '2.5.x'
Closes gh-27057
2021-06-23 17:23:25 -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 7d720a63a5 Merge branch '2.5.x'
Closes gh-27050
2021-06-23 19:39:03 +02: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 c309f3428c Upgrade to Reactor 2020.0.8
Closes gh-27027
2021-06-22 14:54:30 +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 4290193a65 Merge branch '2.5.x'
Closes gh-27025
2021-06-22 13:20:11 +01: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 515072b2e1 Merge branch '2.5.x'
Closes gh-27018
2021-06-22 10:29:42 +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
Stephane Nicoll 49951e8be1 Merge branch '2.5.x'
Closes gh-27012
2021-06-22 08:26:33 +02:00
dreis2211 03cd6bec6e Avoid illegal reflective access in RabbitAutoConfigurationTests
See gh-26954
2021-06-22 08:22:48 +02:00
Stephane Nicoll 142a68292c Merge branch '2.5.x'
Closes gh-27011
2021-06-22 08:21:41 +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 abd5c76570 Merge branch '2.5.x'
Closes gh-27009
2021-06-22 07:57:18 +02:00
Stephane Nicoll 0b54424433 Revert "Avoid duplicate crypto classes when depending on spring-security-core"
Closes gh-26588
2021-06-22 07:56:00 +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