Commit Graph

13761 Commits

Author SHA1 Message Date
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
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
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
038617e97f Merge branch '2.5.x'
Closes gh-27007
2021-06-22 07:54:23 +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
86dc156162 Merge branch '2.5.x'
Closes gh-27006
2021-06-21 18:37:43 -07: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
752a92960c Merge branch '2.5.x'
Closes gh-27001
2021-06-21 18:20:18 +01: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
Stephane Nicoll
2a190f3589 Upgrade to Cassandra Driver 4.11.2
Closes gh-26990
2021-06-21 16:40:33 +02:00
Andy Wilkinson
9025529dcf Merge branch '2.5.x'
Closes gh-26998
2021-06-21 14:34:24 +01:00
Andy Wilkinson
8405df10b8 Merge branch '2.4.x' into 2.5.x
Closes gh-26997
2021-06-21 14:34:11 +01:00
Andy Wilkinson
e18eb08222 Fix additional metadata locations with config cache
Previously, a project with a dependency on Spring Boot's configuration
processor would fail to build when the configuration cache is enabled
due to it accessing the Project during task execution.

Instead of accessing the project during task execution, this commit
updates the code to retrieve the resource locations from the matching
source set in advance. The locations are then stored in the action
that configures the compile task when needed.

Closes gh-26880
2021-06-21 14:31:04 +01:00
Stephane Nicoll
c99d1dae08 Start building against Spring Integration 5.5.1 snapshots
See gh-26974
2021-06-21 13:26:01 +02:00
Stephane Nicoll
d015464a7e Start building against Spring Kafka 2.7.3 snapshots
See gh-26973
2021-06-21 13:26:01 +02:00
Stephane Nicoll
516228730f Start building against Spring Session 2021.0.1 snapshots
See gh-26971
2021-06-21 13:26:01 +02:00
Stephane Nicoll
1aa99b1549 Start building against Spring Data 2021.0.2 snapshots
See gh-26970
2021-06-21 13:26:00 +02:00
Stephane Nicoll
a487bd6423 Start building against Spring HATEOAS 1.3.2 snapshots
See gh-26969
2021-06-21 13:26:00 +02:00
Andy Wilkinson
a983a4ae07 Merge branch '2.5.x'
Closes gh-26989
2021-06-21 12:07:06 +01:00
Andy Wilkinson
580b1b81ab Fix HTTP/2 over TLS with Jetty 10
Fixes gh-26988
2021-06-21 12:06:10 +01:00
Stephane Nicoll
1374491305 Upgrade to SLF4J 1.7.31
Closes gh-26986
2021-06-21 08:46:27 +02:00
Stephane Nicoll
799f6b0bdd Upgrade to Postgresql 42.2.22
Closes gh-26985
2021-06-21 08:46:26 +02:00
Stephane Nicoll
c9a787c7ac Upgrade to Jetty EL 8.5.68
Closes gh-26984
2021-06-21 08:46:25 +02:00
Stephane Nicoll
ce24270271 Upgrade to Dropwizard Metrics 4.1.23
Closes gh-26983
2021-06-21 08:46:24 +02:00
Stephane Nicoll
cc6c53f040 Start building against Spring Integration 5.4.8 snapshots
See gh-26967
2021-06-18 18:22:42 +02:00
Stephane Nicoll
9477231c51 Start building against Spring AMQP 2.3.9 snapshots
See gh-26966
2021-06-18 18:21:36 +02:00
Stephane Nicoll
fa37fb0a69 Start building against Spring Security 5.4.7 snapshots
See gh-26965
2021-06-18 18:21:08 +02:00
Stephane Nicoll
2f30449d11 Start building against Spring Session 2020.0.5 snapshots
See gh-26964
2021-06-18 18:20:41 +02:00
Stephane Nicoll
b462feaa58 Start building against Spring Data 2020.0.10 snapshots
See gh-26963
2021-06-18 18:20:02 +02:00
Stephane Nicoll
22c4c6ea80 Start building against Reactor 2020.0.8 snapshots
See gh-26962
2021-06-18 18:19:01 +02:00
Stephane Nicoll
63fe89f641 Merge branch '2.5.x'
Closes gh-26957
2021-06-18 08:29:36 +02:00
Yanming Zhou
12a6e4c231 Add missing space for asciidoc ordered list
See gh-26955
2021-06-18 08:27:45 +02:00
Scott Frederick
fffe2e4f97 Include caller info in NoSuchMethodError failure analysis
Fixes gh-26895
2021-06-17 13:46:51 -05:00
Andy Wilkinson
b1c04e91d7 Merge branch '2.5.x'
Closes gh-26951
2021-06-17 19:43:57 +01:00