319 Commits

Author SHA1 Message Date
Andy Wilkinson
32433e84f3 Merge branch '3.3.x'
Closes gh-43270
2024-11-22 15:46:38 +00:00
Andy Wilkinson
bb3651b7d1 Reduce warnings reported by Eclipse
Closes gh-43269
2024-11-22 15:39:35 +00:00
Phillip Webb
2f5f224559 Merge branch '3.3.x' 2024-10-18 10:49:15 -07:00
Phillip Webb
223886ff37 Merge branch '3.2.x' into 3.3.x 2024-10-18 10:48:51 -07:00
Phillip Webb
3481107ff7 Update copyright year of changed files 2024-10-18 10:48:29 -07:00
Moritz Halbritter
c018c43886 Merge branch '3.3.x'
Closes gh-42736
2024-10-17 13:44:25 +02:00
Moritz Halbritter
8efe6e02d9 Merge branch '3.2.x' into 3.3.x
Closes gh-42735
2024-10-17 13:38:03 +02:00
Moritz Halbritter
a3060652f8 Call String.toLowerCase and .toUppercase with explicit locale
Closes gh-42719
2024-10-17 13:20:39 +02:00
Johnny Lim
a0d1c10d8a Polish
See gh-42340
2024-09-18 11:19:59 +02:00
Phillip Webb
937dbff3f2 Merge branch '3.3.x'
Closes gh-42108
2024-09-03 12:10:04 -07:00
Phillip Webb
9f38f2b74f Merge branch '3.2.x' into 3.3.x
Closes gh-42107
2024-09-03 12:09:51 -07:00
Phillip Webb
aeafa20727 Prevent 'Recursive update' exceptions with Restarter
Update `Restarter` to prevent 'Recursive update' `IllegalStateException`
from being thrown. Calls to `objectFactory.getObject()` now happen
outside of `computeIfAbsent`.

Fixes gh-41571
2024-09-03 12:09:40 -07:00
Stéphane Nicoll
156237227c Migrate MockMvc tests to MockMvcTester
See gh-41198
2024-07-03 15:09:10 +02:00
Phillip Webb
bfa541a552 Merge branch '3.2.x'
Closes gh-41107
2024-06-14 10:41:21 -07:00
Phillip Webb
0c1c7e844c Don't detect main method from launcher classes
Update `MainMethod` discovery so that launcher classes from the
`org.springframework.boot.loader` code are not considered. This restores
the behavior of Spring Boot 2.7.11 and allows remote restart of uber
jars without pulling the loader classes into the `RestartClassLoader`.

Fixes gh-39733
2024-06-14 10:40:49 -07:00
Phillip Webb
147240aa0c Merge branch '3.2.x'
Closes gh-41080
2024-06-11 13:32:30 -07:00
Ahmed Ashour
207327d97c Use method references when possible in test code
See gh-40974
2024-06-11 12:58:00 -07:00
Stéphane Nicoll
49c97bf6ca Avoid use of bean overriding in tests
See gh-40111
2024-03-27 09:08:07 +01:00
Andy Wilkinson
7087897507 Merge branch '3.1.x' into 3.2.x
Closes gh-39091
2024-01-11 10:33:57 +00:00
Andy Wilkinson
45c32854a5 Fix Checkstyle upgrade
Closes gh-38746
2024-01-10 15:37:38 +00:00
Moritz Halbritter
20edbb402f Merge branch '3.1.x' 2023-10-31 10:23:13 +01:00
Moritz Halbritter
607ed86edb Merge branch '3.0.x' into 3.1.x 2023-10-31 10:23:01 +01:00
Moritz Halbritter
d095a5e47d Polish RestartApplicationListenerTests 2023-10-31 09:49:01 +01:00
Moritz Halbritter
9152217c96 Fix JUnit's @Nested usage 2023-10-31 09:49:01 +01:00
Phillip Webb
3eeb1b2849 Merge branch '3.1.x' 2023-10-19 23:21:42 -07:00
Phillip Webb
9f3afb3636 Merge branch '3.0.x' into 3.1.x 2023-10-19 23:21:20 -07:00
Phillip Webb
7c864804d5 Merge branch '2.7.x' into 3.0.x 2023-10-19 23:21:08 -07:00
Phillip Webb
d47f8bf945 Update copyright year of changed files 2023-10-19 23:20:43 -07:00
Andy Wilkinson
9460f301b4 Merge branch '3.1.x'
Closes gh-37921
2023-10-18 10:07:14 +01:00
Andy Wilkinson
60a0b7eedb Merge branch '3.0.x' into 3.1.x
Closes gh-37920
2023-10-18 10:07:01 +01:00
Andy Wilkinson
85c186a764 Merge branch '2.7.x' into 3.0.x
Closes gh-37919
2023-10-18 10:01:49 +01:00
Andy Wilkinson
1f0e311cb8 Completely disable restart when running tests
Fixes gh-37373
2023-10-18 09:52:47 +01:00
Andy Wilkinson
7d40a45b50 Merge branch '3.1.x'
Closes gh-37662
2023-10-03 11:21:29 +01:00
Andy Wilkinson
a4100e12ff Merge branch '3.0.x' into 3.1.x
Closes gh-37661
2023-10-03 11:05:51 +01:00
Andy Wilkinson
931584f8af Merge branch '2.7.x' into 3.0.x
Closes gh-37659
2023-10-03 10:28:51 +01:00
Johnny Lim
c9932bb73a Use AssertJ's fail, not JUnit's
This commit also updates Checkstyle to prevent use of JUnit's
assertions from being reintroduced.

See gh-37655
2023-10-03 10:11:12 +01:00
Moritz Halbritter
9e670b81ea Merge branch '3.1.x'
Closes gh-36820
2023-08-09 08:58:16 +02:00
Moritz Halbritter
1a8bd1cfe5 Merge branch '3.0.x' into 3.1.x
Closes gh-36819
2023-08-09 08:58:03 +02:00
Moritz Halbritter
95b0b62b0a Merge branch '2.7.x' into 3.0.x
Closes gh-36818
2023-08-09 08:52:28 +02:00
Moritz Halbritter
032d92a9fb Cleanup remote debug tunnel leftovers from devtools
Closes gh-36808
2023-08-09 08:45:17 +02:00
Moritz Halbritter
7bb337aeb1 Polish tests 2023-08-08 13:12:47 +02:00
Stefano Cordio
d802ca017b Small assertions improvements
See gh-34796
2023-05-10 08:38:07 +02:00
Marc Leroux
b61834c92d Replace Mockito argument captors with assertArg
See gh-35015
2023-05-05 11:34:55 +02:00
Phillip Webb
a890323758 Merge branch '3.0.x' 2023-05-02 14:52:42 -07:00
Phillip Webb
0f242ab3f7 Merge branch '2.7.x' into 3.0.x 2023-05-02 14:52:16 -07:00
Phillip Webb
6b646f6a8e Update copyright year of changed files 2023-05-02 14:52:12 -07:00
Phillip Webb
2c0edfd0b5 Merge branch '3.0.x'
Closes gh-35221
2023-05-01 15:35:23 -07:00
Phillip Webb
67abe3f88e Merge branch '2.7.x' into 3.0.x
Closes gh-35220
2023-05-01 15:34:59 -07:00
Phillip Webb
4e6148f47b Search for main methods from the bottom of the stack
Update `MainMethod` to search from the bottom of the stack rather than
the start. Prior to this commit, an incorrect `main` method would be
found if more than one `main` was in the stack.

Fixes gh-35214
2023-05-01 13:43:40 -07:00
Andy Wilkinson
9a0b5e0178 Merge branch '3.0.x'
Closes gh-35173
2023-04-26 12:48:50 +01:00