Commit Graph

47171 Commits

Author SHA1 Message Date
Moritz Halbritter
9146ce5515 Merge branch '3.2.x' 2024-01-25 10:19:49 +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
7ac69be241 Merge branch '3.2.x'
Closes gh-39293
2024-01-24 14:20:52 -06: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
3d5cdb7715 Merge branch '3.2.x'
Closes gh-39289
2024-01-24 14:00:21 +00: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
8870834777 Merge pull request #39259 from tobias-lippert
* pr/39259:
  Update copyright header of cleaned up code
  Replace !Optional.isPresent with Optional.isEmpty
  Polish 'Simplify stream chain operations'
  Simplify stream chain operations
  Polish 'Remove redundant array creation'
  Remove redundant array creation
  Replace multiple ifs with switch
  Use try with resources instead of try-finally
  Replace explicit type with diamond operator
  Avoid redundant boxing
  Remove redundant boxing
  Polish 'Use pattern variables'
  Use pattern variables
  Use string.repeat()
  Polish 'Simplify conditionals'
  Simplify conditionals
  Inline redundant if statements
  Remove unnecessary semicolons
  Remove unnecessary toString calls

Closes gh-39259
2024-01-23 10:47:16 -08:00
Phillip Webb
8f1a330dd5 Update copyright header of cleaned up code
See gh-39259
2024-01-23 10:18:50 -08:00
Tobias Lippert
24e0864105 Replace !Optional.isPresent with Optional.isEmpty
See gh-39259
2024-01-23 10:18:50 -08:00
Phillip Webb
48343cc531 Polish 'Simplify stream chain operations'
See gh-39259
2024-01-23 10:18:50 -08:00
Tobias Lippert
7f4aaacf42 Simplify stream chain operations
See gh-39259
2024-01-23 10:18:49 -08:00
Phillip Webb
15f1e8536b Polish 'Remove redundant array creation'
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
d3c97adf79 Remove redundant array creation
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
0613034e19 Replace multiple ifs with switch
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
316b415e95 Use try with resources instead of try-finally
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
cb26c31dd6 Replace explicit type with diamond operator
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
ac5a08a49b Avoid redundant boxing
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
74a7fbea9d Remove redundant boxing
See gh-39259
2024-01-23 10:18:49 -08:00
Phillip Webb
e40f49d173 Polish 'Use pattern variables'
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
06265ee617 Use pattern variables
See gh-39259
2024-01-23 10:18:48 -08:00
Tobias Lippert
fe38cb3b4a Use string.repeat()
See gh-39259
2024-01-23 09:47:07 -08:00
Phillip Webb
ddb769bf7f Polish 'Simplify conditionals'
See gh-39259
2024-01-23 09:47:07 -08:00
Tobias Lippert
65a1ff84e6 Simplify conditionals
See gh-39259
2024-01-23 09:07:40 -08:00
Tobias Lippert
def7523398 Inline redundant if statements
See gh-39259
2024-01-23 09:07:35 -08:00
Tobias Lippert
9cdd0c3776 Remove unnecessary semicolons
See gh-39259
2024-01-23 09:07:29 -08:00
Tobias Lippert
17902c9cec Remove unnecessary toString calls
See gh-39259
2024-01-23 09:07:00 -08:00
Phillip Webb
a31319caaa Merge branch '3.2.x'
Closes gh-39281
2024-01-23 08:14:34 -08: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
e04ec3bd3d Merge branch '3.2.x' 2024-01-23 09:30:01 +01: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
43296d019e Merge branch '3.2.x'
Closes gh-39273
2024-01-23 09:27:25 +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
cf8e06a7a4 Merge pull request #38762 from MelleD
* pr/38762:
  Polish 'Add conditional bean for jOOQ translator'
  Add conditional bean for jOOQ translator

Closes gh-38762
2024-01-22 15:54:11 -08:00
Phillip Webb
4de91094cf Polish 'Add conditional bean for jOOQ translator'
See gh-38762
2024-01-22 15:52:41 -08:00
Dennis Melzer
c3aa95335a Add conditional bean for jOOQ translator
Introduce an jOOQ `ExecuteListener` sub-interface  specifically
for exception translation with the auto-configured
`DefaultExecuteListenerProvider` instance.

Users can now define a bean that implements the interface or
omit it and continue to use the existing exception translation
logic.

See gh-38762
2024-01-22 15:52:38 -08:00
Scott Frederick
83fd4fb4e8 Merge pull request #39258 from PhilKes
* pr/39258:
  Polish "Add Docker Compose service connection support for OpenLDAP"
  Add Docker Compose service connection support for OpenLDAP

Closes gh-39258
2024-01-22 17:05:23 -06:00
Scott Frederick
bee6fe899c Polish "Add Docker Compose service connection support for OpenLDAP"
See gh-39258
2024-01-22 16:51:45 -06:00
PhilKes
eb940c3907 Add Docker Compose service connection support for OpenLDAP
See gh-39258
2024-01-22 16:51:45 -06:00
Phillip Webb
a0a804cfdf Merge branch '3.2.x' 2024-01-22 12:20:41 -08: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
088b313ae5 Polish 2024-01-22 11:57:37 -08:00
Phillip Webb
72f8bb8d13 Merge branch '3.2.x'
Closes gh-39269
2024-01-22 11:50:57 -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