Commit Graph

389 Commits

Author SHA1 Message Date
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
Phillip Webb
9dda006a18 Merge branch '3.2.x' 2024-06-19 22:55:00 -07:00
Phillip Webb
2a4582b084 Update copyright year of changed files 2024-06-19 22:54:40 -07: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
Phillip Webb
dcccb3b2b1 Polish "Use method references when possible"
See gh-40974
2024-06-11 12:57:59 -07:00
Ahmed Ashour
507229eef8 Use method references when possible
See gh-40974
2024-06-11 12:57:55 -07:00
Andy Wilkinson
f25dc86a3a Merge branch '3.2.x'
Closes gh-40441
2024-04-19 10:58:06 +01:00
Andy Wilkinson
c55f136c2a Merge branch '3.1.x' into 3.2.x
Closes gh-40440
2024-04-19 10:57:47 +01:00
Andy Wilkinson
5e9161f785 Make DevToolsDataSourceAutoConfiguration back off without DataSource class
Manually tested as an automated test is prohibitively difficult as it
requires hiding one of the JDK's own classes.

Closes gh-40434
2024-04-19 10:54:23 +01:00
Moritz Halbritter
3ab21ce146 Merge branch '3.2.x'
Closes gh-40118
2024-03-27 09:42:59 +01:00
Moritz Halbritter
957facf1cc Merge branch '3.1.x' into 3.2.x
Closes gh-40117
2024-03-27 09:35:44 +01:00
Moritz Halbritter
ff66036e90 Remove redundant Regex escapes
Closes gh-40116
2024-03-27 09:34:28 +01:00
Phillip Webb
8f1a330dd5 Update copyright header of cleaned up code
See gh-39259
2024-01-23 10:18:50 -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
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
Phillip Webb
246a0e6f21 Merge branch '3.1.x'
Closes gh-38878
2023-12-19 23:10:49 -08:00
Yanming Zhou
8cb8999772 Ban call of URLEncoder.encode/URLDecoder.decode(String,String)
Add ArchUnit rules to ban the use of `URLEncoder` calls with String
charsets and use `Charset` calls instead.

See gh-38740
2023-12-19 23:10:18 -08:00
Phillip Webb
5354ad15b3 Merge branch '3.1.x'
Closes gh-38877
2023-12-19 22:51:48 -08:00
Yanming Zhou
84f7c2dba9 Remove unnecessary final modifiers
See gh-38739
2023-12-19 22:38:14 -08: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
Phillip Webb
3d6859e80f Use the term "uber jar" in reference documentation and javadoc
Update reference documentation and javadoc to use the term "uber jar"
rather than "fat jar".

Closes gh-37653
2023-10-02 23:01:34 -07:00
Phillip Webb
8edec21a6f Update copyright year of changed files 2023-08-13 20:44:44 -07: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
62fb45f75f Replace contains/put/get pattern with computeIfAbsent 2023-08-08 13:12:47 +02:00
Moritz Halbritter
ed9169501e Polish 2023-08-08 13:12:47 +02:00
Moritz Halbritter
726d2e6678 Remove unnecessary synchronization
- on AtomicBoolean in SpringApplicationBuilder
- on SimpleFormatter
- in a private method in FileSystemWatcher which is always called in a
  synchronized block
- Replaced synchronized guarded HashMap with ConcurrentHashMap
2023-08-03 17:33:52 +02:00
Moritz Halbritter
1a8b8ce26e Revert "Revise synchronized blocks"
This reverts commit 497bbf9c2d.
2023-08-03 17:26:31 +02:00
Moritz Halbritter
497bbf9c2d Revise synchronized blocks
- Replace synchronized with Lock when guarding long-running operations
- Remove unnecessary synchronization in FileSystemWatcher
- Replace HashMap with ConcurrentHashMap in Restarter
- Remove unnecessary locking on AtomicBoolean in
  SpringApplicationBuilder
- Remove unnecessary locking in SimpleFormatter

Closes gh-36670
2023-08-03 09:23:46 +02:00
Andy Wilkinson
e12ae5add5 Merge branch '3.0.x' into 3.1.x
Closes gh-35865
2023-06-13 13:52:10 +01:00
Andy Wilkinson
bdbbbc6470 Merge branch '2.7.x' into 3.0.x
Closes gh-35864
2023-06-13 13:51:51 +01:00
Andy Wilkinson
984dc1d58f Allow package-private main classes to be used with Devtools
Fixes gh-35858
2023-06-13 13:50:27 +01:00
Phillip Webb
9bacf4218c Set 'spring.docker.compose.readiness.wait' property in devtools
Default 'spring.docker.compose.readiness.wait' to `ONLY_IF_STARTED`
when using devtools.

See gh-35435
2023-05-17 16:27:00 -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
Phillip Webb
00dc942e94 Migrate to Spring Security lambda config
Closes gh-35011
2023-04-14 17:39:48 -07:00
Phillip Webb
d442bfbeff Polish 2023-04-10 16:22:11 -07:00
Phillip Webb
0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00
Phillip Webb
c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00