Commit Graph

600 Commits

Author SHA1 Message Date
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
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
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
Andy Wilkinson
ed5d16de84 Upgrade to Jetty 12
Closes gh-36073
2023-09-07 13:59:15 +01: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
7bb337aeb1 Polish tests 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
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
Andy Wilkinson
7ee1622995 Merge branch '2.7.x' into 3.0.x
Closes gh-35172
2023-04-26 12:48:16 +01:00