Commit Graph

44071 Commits

Author SHA1 Message Date
Phillip Webb
37e67058b7 Merge branch '3.0.x' into 3.1.x
Closes gh-37169
2023-08-31 22:24:14 -07:00
Phillip Webb
71ed31343c Merge branch '2.7.x' into 3.0.x
Closes gh-37168
2023-08-31 22:01:06 -07:00
Phillip Webb
fd8cb74b46 Load algorithm parameters from PEM encoded 'EC PRIVATE KEY' files
Update `PrivateKeyParser` implementations so that algorithm parameters
for PEM encoded 'EC PRIVATE KEY' files are loaded from the incoming
data.

Prior to this commit, the algorithm parameter was hard-coded to
'secp384r1' which could result in a mismatch to the actual file
content.

Fixes gh-34232
2023-08-31 21:40:11 -07:00
Andy Wilkinson
c7063af63a Merge branch '3.0.x' into 3.1.x
Closes gh-37158
2023-08-31 15:23:21 +01:00
Andy Wilkinson
67e1ee5dcf Fix ordering of Jetty's WebSocketUpgradeFilter
Closes gh-37115
2023-08-31 15:22:26 +01:00
Moritz Halbritter
b86937bb8e Merge branch '3.0.x' into 3.1.x
Closes gh-37156
2023-08-31 11:51:15 +02:00
Moritz Halbritter
61739bd917 Prevent propagation for local fields when using W3C propagation
Closes gh-37109
2023-08-31 11:50:05 +02:00
Andy Wilkinson
7f56fe8dfd Merge branch '3.0.x' into 3.1.x
Closes gh-37151
2023-08-31 10:40:07 +01:00
Andy Wilkinson
9d4e71fa2d Upgrade Java 17 image to .sdkmanrc to 17.0.8.1
Closes gh-37148
2023-08-31 10:38:02 +01:00
Andy Wilkinson
0d9a8a421e Merge branch '3.0.x' into 3.1.x 2023-08-31 10:35:32 +01:00
Andy Wilkinson
edf8cb6afe Merge branch '2.7.x' into 3.0.x 2023-08-31 10:35:18 +01:00
Andy Wilkinson
80cb21e800 Upgrade Java 17 CI image to 17.0.8.1+1
Closes gh-37149
2023-08-31 10:34:39 +01:00
Andy Wilkinson
934b18c2e4 Merge branch '3.0.x' into 3.1.x 2023-08-31 10:32:43 +01:00
Andy Wilkinson
e8be593df4 Merge branch '2.7.x' into 3.0.x 2023-08-31 10:31:51 +01:00
Andy Wilkinson
e3e578f78a Upgrade Java 11 CI image to 11.0.20.1+1
Closes gh-37150
2023-08-31 10:31:25 +01:00
Phillip Webb
3640491d5a Fix Timezone used for now in BuildRequestTests 2023-08-30 20:34:01 -07:00
Andy Wilkinson
e6fcde4af5 Merge branch '3.0.x' into 3.1.x
Closes gh-37143
2023-08-30 13:35:40 +01:00
Andy Wilkinson
a8e37b5cc5 Merge branch '2.7.x' into 3.0.x
Closes gh-37142
2023-08-30 13:34:12 +01:00
Andy Wilkinson
d071ec8243 Merge pull request #37112 from hakan-krgn
* gh-37112:
  Polish "Polish code and javadoc"
  Polish code and javadoc

Closes gh-37112
2023-08-30 13:32:06 +01:00
Andy Wilkinson
2de98a84bc Polish "Polish code and javadoc"
See gh-37112
2023-08-30 13:31:58 +01:00
hakan-krgn
6d9ce8a3b5 Polish code and javadoc
See gh-37112
2023-08-30 13:31:58 +01:00
Moritz Halbritter
4a88604a01 Merge branch '3.0.x' into 3.1.x
Closes gh-37140
2023-08-30 14:16:07 +02:00
Moritz Halbritter
c749fcb478 Merge branch '2.7.x' into 3.0.x
Closes gh-37139
2023-08-30 14:15:27 +02:00
Moritz Halbritter
0f6342a882 Make JarLaunchScript and SysVinit integration tests ARM64 compatible
Closes gh-36799
2023-08-30 14:01:32 +02:00
Andy Wilkinson
d56bc9e220 Merge branch '3.0.x' into 3.1.x
Closes gh-37134
2023-08-30 11:28:49 +01:00
Andy Wilkinson
6fcc9f4b21 Merge branch '2.7.x' into 3.0.x
Closes gh-37133
2023-08-30 11:28:37 +01:00
Andy Wilkinson
d1bf1b3e15 Merge pull request #37120 from dependabot[bot]
* gh-37120:
  Bump gradle/gradle-build-action from 2.7.1 to 2.8.0

Closes gh-37120
2023-08-30 11:28:23 +01:00
dependabot[bot]
7d18b0e01b Bump gradle/gradle-build-action from 2.7.1 to 2.8.0
Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](243af859f8...ef76a971e2)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

See gh-37120
2023-08-30 11:27:57 +01:00
Phillip Webb
81a03cf240 Merge branch '2.7.x' into 3.1.x 2023-08-24 10:32:37 -07:00
Phillip Webb
fbea788e0a Merge branch '2.7.x' into 3.0.x 2023-08-24 10:32:27 -07:00
Phillip Webb
727e22abac Restore Redis to NoSQL stores supported by Spring Data documentation
See gh-29694
2023-08-24 10:31:01 -07:00
Stephane Nicoll
41d2d1da60 Merge branch '3.0.x' into 3.1.x 2023-08-24 15:51:10 +02:00
Stephane Nicoll
d85c125368 Merge branch '2.7.x' into 3.0.x 2023-08-24 15:51:02 +02:00
Spring Builds
e2d673f465 Next development version (v3.1.4-SNAPSHOT) 2023-08-24 09:58:18 +00:00
Spring Builds
982de77885 Next development version (v3.0.11-SNAPSHOT) 2023-08-24 09:02:19 +00:00
Spring Builds
1cc2f3cbd2 Next development version (v2.7.16-SNAPSHOT) 2023-08-24 07:42:05 +00:00
Stephane Nicoll
5981252ffb Merge branch '3.0.x' into 3.1.x 2023-08-23 21:11:03 +02:00
Stephane Nicoll
75f1604f34 Merge branch '2.7.x' into 3.0.x 2023-08-23 21:10:53 +02:00
Stephane Nicoll
a1cd7e7638 Upgrade to Spring Batch 5.0.3
Closes gh-36844
2023-08-23 21:07:18 +02:00
Stephane Nicoll
4e6de6c927 Upgrade to RxJava3 3.1.7
Closes gh-37089
2023-08-23 21:07:17 +02:00
Stephane Nicoll
99a554346c Upgrade to Netty 4.1.97.Final
Closes gh-37088
2023-08-23 21:07:13 +02:00
Stephane Nicoll
df85c817a6 Upgrade to Spring Batch 5.0.3
Closes gh-36833
2023-08-23 21:04:15 +02:00
Stephane Nicoll
4c719c163b Upgrade to RxJava3 3.1.7
Closes gh-37087
2023-08-23 21:04:14 +02:00
Stephane Nicoll
48e3ebadef Upgrade to Netty 4.1.97.Final
Closes gh-37086
2023-08-23 21:04:09 +02:00
Stephane Nicoll
25897b25ab Upgrade to Spring Batch 4.3.9
Closes gh-36827
2023-08-23 21:02:51 +02:00
Stephane Nicoll
59e6c8f6f9 Upgrade to Netty 4.1.97.Final
Closes gh-37085
2023-08-23 21:02:50 +02:00
Stephane Nicoll
7bb35f1524 Merge branch '3.0.x' into 3.1.x 2023-08-23 09:46:49 +02:00
Stephane Nicoll
50d19fbd12 Upgrade to Spring Authorization Server 1.1.2
Closes gh-36843
2023-08-23 09:37:58 +02:00
Stephane Nicoll
57a65bc0dd Upgrade to Spring Integration 6.0.7
Closes gh-37061
2023-08-23 09:37:17 +02:00
Scott Frederick
23de8a1177 Merge branch '3.0.x' into 3.1.x
Closes gh-37071
2023-08-22 12:10:46 -05:00