root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 18 Packages Projects Releases Wiki Activity
33,123 Commits 23 Branches 348 Tags 279 MiB
Commit Graph

33123 Commits

Author SHA1 Message Date
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 40a24bd537 Merge pull request #26937 from quaff 
* gh-26937:
  Polish "Update docs to use @SpringBootConfiguration not @Configuration"
  Update docs to use @SpringBootConfiguration not @Configuration

Closes gh-26937
 2021-06-22 12:55:42 +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 f20dc84898 Merge branch '2.5.x' 2021-06-22 09:56:45 +02: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 bc1c520e83 Merge branch '2.4.x' into 2.5.x 2021-06-22 09:53:29 +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
Stephane Nicoll a2a69ad710 Merge pull request #26954 from dreis2211 
* pr/26954:
  Avoid illegal reflective access in RabbitAutoConfigurationTests

Closes gh-26954
 2021-06-22 08:26:25 +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
Stephane Nicoll e5665c815d Merge pull request #26975 from hrybs 
* pr/26975:
  Document uuid support in RandomValuePropertySource

Closes gh-26975
 2021-06-22 08:21:18 +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 dbaf40c953 Merge branch '2.4.x' into 2.5.x 2021-06-22 07:53:47 +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 3f8a8d3e6f Merge branch '2.5.x' 2021-06-21 16:59:23 +02:00
Stephane Nicoll 6357e4fffa Merge branch '2.4.x' into 2.5.x 2021-06-21 16:59:06 +02: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 b09cb91118 Upgrade to Tomcat 9.0.48 
Closes gh-26996
 2021-06-21 16:40: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 fb37198024 Merge branch '2.5.x' 2021-06-21 13:26:23 +02: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