root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity
37,125 Commits 26 Branches 365 Tags 290 MiB
Commit Graph

37125 Commits

Author SHA1 Message Date
Andy Wilkinson 16f49745ef Merge branch '2.6.x' into 2.7.x 
Closes gh-31147
 2022-05-23 11:15:06 +01:00
Andy Wilkinson 6183532cc1 Merge pull request #31139 from eddumelendez 
* gh-31139:
  Use Bellsoft JDK in CI

Closes gh-31139
 2022-05-23 11:14:51 +01:00
Eddú Meléndez 5fb96076bd Use Bellsoft JDK in CI 
See gh-31139
 2022-05-23 11:12:22 +01:00
Phillip Webb 06679a4c46 Merge branch '2.6.x' into 2.7.x 
Closes gh-31128
 2022-05-19 18:07:17 -07:00
Phillip Webb 9fa33e5645 Merge branch '2.5.x' into 2.6.x 
Closes gh-31127
 2022-05-19 18:04:54 -07:00
Phillip Webb f185b0767a Merge pull request #31126 from abel533 
* pr/31126:
  Polish "Resolve errors in layers.xsd"
  Resolve errors in layers.xsd

Closes gh-31126
 2022-05-19 18:03:20 -07:00
Phillip Webb 05a6447a8d Polish "Resolve errors in layers.xsd" 
Validate loaded `layer.xml` files against the XSD and additionally
update `<layers>` sub elements to have a 'minOccurs' of 0.

See gh-31126
 2022-05-19 18:01:55 -07:00
Liuzh 0d78323b60 Resolve errors in layers.xsd 
Update `layer-*.xsd` files with following fixes:

- Rename <includeProjectDependencies> to <includeModuleDependencies>
- Rename <excludeProjectDependencies> to <excludeModuleDependencies>

See gh-31126
 2022-05-19 18:00:25 -07:00
Spring Builds 1006b386e4 Next development version (v2.7.1-SNAPSHOT) 2022-05-19 12:42:28 +00:00
Andy Wilkinson 516d9dbc6b Update CI pipeline in preparation for 2.7.0 
Closes gh-31119
 2022-05-19 12:02:00 +01:00
Andy Wilkinson 97613f1385 Merge branch '2.6.x' into 2.7.x 2022-05-19 12:00:54 +01:00
Andy Wilkinson f95fa63ae4 Merge branch '2.5.x' into 2.6.x 2022-05-19 12:00:34 +01:00
Spring Builds 98d91ba35e Next development version (v2.6.9-SNAPSHOT) 2022-05-19 10:06:29 +00:00
Spring Builds bf3c6dfdba Next development version (v2.5.15-SNAPSHOT) 2022-05-19 08:47:35 +00:00
Stephane Nicoll 63fc60d354 Upgrade to SendGrid 4.9.2 
Closes gh-31116
 2022-05-19 09:19:56 +02:00
Stephane Nicoll 7011119b9f Merge branch '2.6.x' into 2.7.x 2022-05-19 09:12:57 +02:00
Stephane Nicoll d1ec5d4ecf Upgrade CI to Docker 20.10.16 
Closes gh-31108
 2022-05-19 09:12:49 +02:00
Stephane Nicoll d8bcdde1bc Merge branch '2.5.x' into 2.6.x 2022-05-19 09:12:24 +02:00
Stephane Nicoll b0a867bd4f Upgrade CI to Docker 20.10.16 
Closes gh-31106
 2022-05-19 09:12:14 +02:00
Stephane Nicoll d20f94e67b Upgrade CI to Docker 20.10.16 
Closes gh-31107
 2022-05-19 09:11:33 +02:00
Stephane Nicoll 4a310ff7b9 Upgrade to Spring Session Bom 2021.2.0 
Closes gh-31021
 2022-05-19 09:02:49 +02:00
Andy Wilkinson c81b324446 Merge branch '2.6.x' into 2.7.x 2022-05-18 19:21:17 +01:00
Andy Wilkinson a712b1e6b0 Upgrade to Spring Security 5.6.5 
Closes gh-31102
 2022-05-18 19:19:47 +01:00
Andy Wilkinson 62963d77c9 Merge branch '2.5.x' into 2.6.x 2022-05-18 19:19:13 +01:00
Andy Wilkinson e82def03ca Upgrade to Spring Security 5.5.8 
Closes gh-31096
 2022-05-18 19:18:24 +01:00
Andy Wilkinson d46c09cda3 Upgrade to Spring Security 5.7.1 
Closes gh-31100
 2022-05-18 17:38:59 +01:00
Andy Wilkinson cc93a0a30e Upgrade to Spring Batch 4.3.6 
Closes gh-31020
 2022-05-18 17:38:09 +01:00
Andy Wilkinson 99ecfe1739 Merge branch '2.6.x' into 2.7.x 2022-05-18 17:37:44 +01:00
Andy Wilkinson 69edce0629 Upgrade to Spring Batch 4.3.6 
Closes gh-31011
 2022-05-18 17:37:11 +01:00
Andy Wilkinson b695496165 Merge branch '2.5.x' into 2.6.x 2022-05-18 17:36:40 +01:00
Andy Wilkinson 7f60c67074 Upgrade to Spring Batch 4.3.6 
Closes gh-31003
 2022-05-18 17:35:55 +01:00
Brian Clozel e34187d05f Upgrade to Spring for GraphQL 1.0.0 
Closes gh-30858
 2022-05-18 18:31:18 +02:00
Andy Wilkinson 646d582393 Merge branch '2.6.x' into 2.7.x 
Closes gh-31099
 2022-05-18 13:14:46 +01:00
Andy Wilkinson e407bae8c8 Merge branch '2.5.x' into 2.6.x 
Closes gh-31098
 2022-05-18 13:14:15 +01:00
Andy Wilkinson 5e78bef9f8 Test security dialect auto-config without Spring Security 
Closes gh-31097
 2022-05-18 13:06:09 +01:00
Stephane Nicoll 8b611df160 Merge branch '2.6.x' into 2.7.x 2022-05-18 09:00:03 +02:00
Stephane Nicoll e26c58baaf Merge branch '2.5.x' into 2.6.x 2022-05-18 08:59:54 +02:00
Stephane Nicoll 2f46928f84 Upgrade to Spring Integration 5.5.12 
Closes gh-31062
 2022-05-18 08:58:50 +02:00
Stephane Nicoll 01288b61af Upgrade to Spring Integration 5.5.12 
Closes gh-31061
 2022-05-18 08:54:57 +02:00
Stephane Nicoll 4eb778df43 Upgrade to Spring Integration 5.5.12 
Closes gh-31060
 2022-05-18 08:54:24 +02:00
Phillip Webb 23eceb0d8a Merge branch '2.6.x' into 2.7.x 2022-05-17 22:21:41 -07:00
Phillip Webb ea41e89c6c Merge branch '2.5.x' into 2.6.x 2022-05-17 22:21:10 -07:00
Phillip Webb 7d2f1bafc0 Update copyright year of changed files 2022-05-17 22:20:05 -07:00
Phillip Webb 13670e556b Merge branch '2.6.x' into 2.7.x 
Closes gh-31095
 2022-05-17 22:18:53 -07:00
Phillip Webb 0beccde6ee Merge branch '2.5.x' into 2.6.x 
Closes gh-31094
 2022-05-17 22:18:38 -07:00
Phillip Webb 7da42d7139 Allow tests to pass when a NAME environment variable exists 
Update `ConfigurationPropertiesTests` so that it will pass even if a
local `NAME` environment variable is declared.

Closes gh-31076
 2022-05-17 22:16:24 -07:00
Phillip Webb fbde59d635 Merge branch '2.6.x' into 2.7.x 
Closes gh-31093
 2022-05-17 22:14:40 -07:00
Phillip Webb 6bce0c5044 Merge branch '2.5.x' into 2.6.x 
Closes gh-31092
 2022-05-17 22:14:21 -07:00
Phillip Webb 44c979beb0 Reorder default property sources after @PropertySource processing 
Update `SpringApplication` so that the `DefaultPropertiesPropertySource`
is moved to the end after `@PropertySource` annotations have been
processed. This restores functionality that used to be handled by
the `ConfigFileApplicationListener` and was inadvertently dropped
when the `ConfigDataEnvironmentPostProcessor` was developed.

Fixes gh-31068
 2022-05-17 22:13:49 -07:00
Phillip Webb d5d5997be7 Merge branch '2.6.x' into 2.7.x 2022-05-17 21:49:20 -07:00