Andy Wilkinson
003f747e77
Merge branch '2.7.x'
...
Closes gh-31170
2022-05-26 13:52:41 +01:00
Andy Wilkinson
e617035dba
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31167
2022-05-26 13:45:52 +01:00
Andy Wilkinson
3e7bd582a3
Upgrade to Spring Java Format 0.0.33
...
Closes gh-31166
2022-05-26 13:22:23 +01:00
Andy Wilkinson
2d9dfe9bc5
Merge branch '2.7.x'
2022-05-25 13:33:25 +01:00
Andy Wilkinson
d6046f23dc
Merge pull request #31140 from eddumelendez
...
* gh-31140:
Add package-info for o.s.b.a.a.metrics.graphql
Closes gh-31140
2022-05-25 13:33:06 +01:00
Eddú Meléndez
154c84ffe2
Add package-info for o.s.b.a.a.metrics.graphql
...
See gh-31140
2022-05-25 13:30:29 +01:00
Andy Wilkinson
e13f187c37
Upgrade to REST Assured 5.1.0
...
Closes gh-31158
2022-05-24 13:41:12 +01:00
Andy Wilkinson
c45d3e50ef
Merge branch '2.7.x'
...
Closes gh-31154
2022-05-23 13:00:38 +01:00
Andy Wilkinson
f805f768ca
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31153
2022-05-23 12:55:17 +01:00
Andy Wilkinson
6ea3704baf
Merge pull request #31141 from eddumelendez
...
* gh-31141:
Add .sdkmanrc with latest java version
Closes gh-31141
2022-05-23 12:55:09 +01:00
Eddú Meléndez
07047e7e85
Add .sdkmanrc with latest java version
...
See gh-31141
2022-05-23 12:54:30 +01:00
Andy Wilkinson
f9db6ad237
Merge branch '2.7.x'
...
Closes gh-31152
2022-05-23 12:51:13 +01:00
Andy Wilkinson
24dc525127
Fix conditions on auto-configured WebMvcMetricsFilter
...
Closes gh-31150
2022-05-23 12:50:49 +01:00
Andy Wilkinson
966d775a86
Merge branch '2.7.x'
...
Closes gh-31149
2022-05-23 11:20:35 +01:00
Andy Wilkinson
430f033381
Create forward port issues for merges into main
...
This reverts commit 4e884b27f8
.
Closes gh-31148
2022-05-23 11:17:47 +01:00
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
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