Commit Graph

38084 Commits

Author SHA1 Message Date
Phillip Webb
68bd9d6b6d Merge branch '2.7.x' 2022-05-19 18:09:29 -07: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
a029e7511c Merge pull request #31122 from hpoettker
* gh-31122:
  Use Spring Batch Bom

Closes gh-31122
2022-05-19 13:15:19 +01:00
Henning Poettker
102d9ff10a Use Spring Batch Bom
See gh-31122
2022-05-19 13:15:00 +01:00
Andy Wilkinson
b0536c1667 Merge branch '2.7.x' 2022-05-19 12:03:03 +01: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
e4fee76525 Merge branch '2.7.x' 2022-05-19 12:01:07 +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
1b1e6e6f73 Merge branch '2.7.x' 2022-05-19 09:21:09 +02:00
Stephane Nicoll
63fc60d354 Upgrade to SendGrid 4.9.2
Closes gh-31116
2022-05-19 09:19:56 +02:00
Stephane Nicoll
366e019842 Merge branch '2.7.x' 2022-05-19 09:13:32 +02:00
Stephane Nicoll
c06946c5f3 Upgrade CI to Docker 20.10.16
Closes gh-31109
2022-05-19 09:13:22 +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
8fc1f07901 Upgrade to Spring Batch 5.0.0-M3
Closes gh-30459
2022-05-19 09:05:05 +02:00
Stephane Nicoll
d013237d87 Upgrade to Spring Integration 6.0.0-M3
Closes gh-31063
2022-05-19 09:04:42 +02:00
Stephane Nicoll
6cbdc3d0ba Merge branch '2.7.x' 2022-05-19 09:03:36 +02:00
Stephane Nicoll
136a577cdc Upgrade to Spring Session 2022.0.0-M2
Closes gh-30639
2022-05-19 09:03:22 +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
5959c6eec8 Prohibit Jakarta JMS upgrade that exceeds Jakarta EE 9 baseline
See gh-31045
2022-05-18 21:09:27 +01:00
Andy Wilkinson
fd2459ccac Upgrade to Thymeleaf 3.1.0.M2
Closes gh-31110
2022-05-18 21:07:42 +01:00
Andy Wilkinson
abfb675d20 Upgrade to Spring Security 6.0.0-M5
Closes gh-31101
2022-05-18 19:22:16 +01:00
Andy Wilkinson
8f3c2c192e Merge branch '2.7.x' 2022-05-18 19:21:57 +01: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
d82bf235db Merge branch '2.7.x' 2022-05-18 17:39:31 +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
9f91a1f0df Merge branch '2.7.x' 2022-05-18 18:31:51 +02:00
Brian Clozel
e34187d05f Upgrade to Spring for GraphQL 1.0.0
Closes gh-30858
2022-05-18 18:31:18 +02:00
Stephane Nicoll
216d156968 Refine native profile to use a classifier for the repackaged jar
This commit refines 80470f0b26 so that the 'repackage' goal of the
Spring Boot maven plugin uses a classifier. Previously, a regular
package with the profile fails as the Native Build Tools is trying to
use the repackaged archive as a regular jar file.

This is temporary as we'd like to explore other solutions, including
suggesting an additional option in the NBT plugin itself that uses the
regular classpath, rather than the produced jar.

See gh-30830
2022-05-18 15:45:40 +02:00
Andy Wilkinson
723a7b2bff Upgrade to Spring Kafka 3.0.0-M4
Closes gh-30645
2022-05-18 14:07:58 +01:00
Andy Wilkinson
842cea2fc1 Merge branch '2.7.x' 2022-05-18 13:18:20 +01:00