Commit Graph

46934 Commits

Author SHA1 Message Date
Moritz Halbritter
c47430d842 Merge branch '3.1.x' into 3.2.x 2024-01-25 11:06:25 +01:00
Moritz Halbritter
df755db1f3 Ensure that remaining mocks are closed before initializing a test
Closes gh-39271
2024-01-25 10:57:45 +01:00
Moritz Halbritter
36b70d7b16 Merge branch '3.1.x' into 3.2.x 2024-01-25 10:19:37 +01:00
Moritz Halbritter
930669888a Add more integration tests for MockitoTestExecutionListener 2024-01-25 10:18:59 +01:00
Scott Frederick
6b1b661f2e Merge branch '3.1.x' into 3.2.x
Closes gh-39291
2024-01-24 14:20:31 -06:00
Scott Frederick
ac0d95beb4 Upgrade CI to Docker 25.0.1
Closes gh-39292
2024-01-24 14:19:27 -06:00
Andy Wilkinson
d702c2f860 Permit upgrades to Jetty Reactive HTTPClient 4.0.2
Closes gh-39288
2024-01-24 13:59:43 +00:00
Phillip Webb
3fb25f4d4b Merge branch '3.1.x' into 3.2.x
Closes gh-39280
2024-01-23 08:14:26 -08:00
Phillip Webb
72587e08a7 Merge pull request #39279 from smurf667
* pr/39279:
  Fix typo 'Unuthorized'

Closes gh-39279
2024-01-23 08:13:57 -08:00
Jan Engehausen
c99daf5de4 Fix typo 'Unuthorized'
See gh-39279
2024-01-23 08:13:13 -08:00
Moritz Halbritter
965e62b40d Merge branch '3.1.x' into 3.2.x 2024-01-23 09:29:48 +01:00
Moritz Halbritter
b245283b29 Add .git-hooks to the git ignore list
When following https://github.com/spring-projects/spring-boot/wiki/Working-with-Git-branches,
a new directory named .git-hooks is created when using git worktree support.
This directory should be on the ignore list.
2024-01-23 09:29:37 +01:00
Moritz Halbritter
46304a7821 Merge branch '3.1.x' into 3.2.x
Closes gh-39272
2024-01-23 09:24:29 +01:00
Moritz Halbritter
c87d5eeb28 Ensure that remaining mocks are closed before initializing a test
Closes gh-39271
2024-01-23 09:17:17 +01:00
Phillip Webb
cff8cb98c7 Merge branch '3.1.x' into 3.2.x 2024-01-22 12:20:24 -08:00
Phillip Webb
e1986ea11e Update copyright year of changed files 2024-01-22 12:20:06 -08:00
Phillip Webb
9ddf15d97a Merge branch '3.1.x' into 3.2.x
Closes gh-39268
2024-01-22 11:50:40 -08:00
Phillip Webb
bc75751172 Merge pull request #39265 from vj-atlassian
* pr/39265:
  Polish 'Make PropagationType a public type'
  Make PropagationType a public type

Closes gh-39265
2024-01-22 11:50:28 -08:00
Phillip Webb
87ea2b75fb Polish 'Make PropagationType a public type'
See gh-39265
2024-01-22 11:49:45 -08:00
Vaibhav Jaiswal
16c0f035a9 Make PropagationType a public type
The PropagationType enum is returned from public methods so
should be public itself.

See gh-39265
2024-01-22 11:48:10 -08:00
Andy Wilkinson
65bafdc3f3 Merge branch '3.1.x' into 3.2.x
Closes gh-39263
2024-01-22 11:49:34 +00:00
Andy Wilkinson
d7afdf446b Merge pull request #39242 from erichaagdev
* gh-39242:
  Update Revved up by Develocity badge

Closes gh-39242
2024-01-22 11:47:05 +00:00
Eric Haag
9c87a7e4ed Update Revved up by Develocity badge
See gh-39242
2024-01-22 11:46:34 +00:00
Scott Frederick
eafd48df0c Merge branch '3.1.x' into 3.2.x
Closes gh-39221
2024-01-19 17:29:24 -06:00
Scott Frederick
302087176a Upgrade to Java 17.0.10+13
Closes gh-39216
2024-01-19 17:29:12 -06:00
Spring Builds
bf010b6532 Next development version (v3.2.3-SNAPSHOT) 2024-01-19 07:01:14 +00:00
Phillip Webb
f2362d3f8c Merge branch '3.1.x' into 3.2.x 2024-01-18 21:45:12 -08:00
Phillip Webb
663a0e6623 Add missing harbor vars 2024-01-18 21:44:57 -08:00
Phillip Webb
1a427767bf Merge branch '3.1.x' into 3.2.x 2024-01-18 21:34:19 -08:00
Spring Builds
580865bdb9 Next development version (v3.1.9-SNAPSHOT) 2024-01-19 05:06:58 +00:00
Phillip Webb
3fad814692 Merge branch '3.1.x' into 3.2.x 2024-01-18 20:33:48 -08:00
Phillip Webb
7f9bd1cd6c Switch harbor push location 2024-01-18 20:28:18 -08:00
Phillip Webb
5a900377ef Merge branch '3.1.x' into 3.2.x 2024-01-18 19:46:28 -08:00
Phillip Webb
9e2a312224 Update CI to use harbor 2024-01-18 19:41:19 -08:00
Andy Wilkinson
961da4e428 Make user details only back off without custom username or password
Closes gh-38864
2024-01-18 14:14:39 +00:00
Phillip Webb
0f53415451 Merge branch '3.1.x' into 3.2.x
Closes gh-39231
2024-01-17 15:58:14 -08:00
Phillip Webb
8147b7a288 Merge pull request #39162 from Wzy19930507
* pr/39162:
  Polish 'Reactor PemPrivateKeyParser to use DerElement'
  Reactor PemPrivateKeyParser to use DerElement

Closes gh-39162
2024-01-17 15:57:48 -08:00
Phillip Webb
bc52ac6459 Polish 'Reactor PemPrivateKeyParser to use DerElement'
See gh-39162
2024-01-17 15:51:29 -08:00
Wzy19930507
cc6303f574 Reactor PemPrivateKeyParser to use DerElement
Update `PemPrivateKeyParser` so that the algorithm is read using
DerElement whenever possible.

See gh-39162
2024-01-17 15:49:19 -08:00
Scott Frederick
f173416825 Merge branch '3.1.x' into 3.2.x
Closes gh-39229
2024-01-17 17:35:17 -06:00
Scott Frederick
c2ca6bfaf1 Upgrade RedHat UBI to 9.3-1476
Closes gh-39228
2024-01-17 17:34:55 -06:00
Scott Frederick
c0a820bc57 Merge branch '3.1.x' into 3.2.x 2024-01-17 17:18:14 -06:00
Scott Frederick
35b45450f8 Upgrade test images to ubuntu:jammy-20240111
See gh-39217
2024-01-17 17:18:01 -06:00
Scott Frederick
7d3823a7e3 Merge branch '3.1.x' into 3.2.x
Closes gh-39219
2024-01-17 16:48:02 -06:00
Scott Frederick
a8c17823cb Upgrade to Java 21 to 21.0.2+14
Closes gh-39215
2024-01-17 16:47:51 -06:00
Scott Frederick
8d16a53452 Merge branch '3.1.x' into 3.2.x
Closes gh-39222
2024-01-17 16:36:49 -06:00
Scott Frederick
31394473fa Upgrade CI images to ubuntu:jammy-20240111
Closes gh-39217
2024-01-17 16:36:35 -06:00
Phillip Webb
eb0040c225 Fix ZipCentralDirectoryFileHeaderRecord entry comment read offset
Update `ZipCentralDirectoryFileHeaderRecord.copyTo` comment read offset
to account for the record position.

Fixes gh-39166
2024-01-17 13:16:43 -08:00
Andy Wilkinson
fee359ff5e Downgrade to production-ready version of Oracle Database
This reverts commit d2325d1110.

Closes gh-38943
2024-01-17 20:14:09 +00:00
Phillip Webb
b890515ce1 Merge branch '3.1.x' into 3.2.x
Closes gh-39199
2024-01-17 10:20:30 -08:00