Commit Graph

834 Commits

Author SHA1 Message Date
Andy Wilkinson
7b6b3a581e Merge branch '3.1.x' into 3.2.x 2024-01-15 17:07:14 +00:00
Andy Wilkinson
9874363fbe Don't offer aligned version when it's already the current version
See gh-34114
2024-01-15 17:06:53 +00:00
Andy Wilkinson
c0fedc8f74 Merge branch '3.1.x' into 3.2.x
Closes gh-39133
2024-01-15 15:21:31 +00:00
Andy Wilkinson
c8e9a2a32c Add support to Bomr for aligning dependency versions
Closes gh-34114
2024-01-15 15:20:29 +00:00
Brian Clozel
46b7bd2f23 Add configuration property to enable micrometer annotations
Prior to this commit, the Micrometer annotations support (`@Timed`,
`@Counted`...) was guarded by the presence of both Micrometer and
AspectJ on the classpath.

This signal is too weak, considering the startup performance impact and
the fact that the AspectJ dependency can be brought transitively in many
cases.

This commit adds a new `micrometer.observations.annotations.enabled`
property that is set to `false` by default to only process the
annotations support when this property is enabled.

Fixes gh-39128
2024-01-15 13:51:15 +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
Andy Wilkinson
d3b93f5d70 Merge branch '3.1.x' into 3.2.x
Closes gh-39084
2024-01-10 15:33:44 +00:00
Andy Wilkinson
4699923b68 Upgrade to Spring Java Format 0.0.41
Closes gh-39082
2024-01-10 13:56:25 +00:00
Moritz Halbritter
8504b6e0a7 Merge branch '3.1.x' into 3.2.x
Closes gh-39073
2024-01-10 09:11:53 +01:00
Christoph Dreis
68b9f0c643 Update copyright year to 2024
See gh-38946
2024-01-10 09:11:29 +01:00
Andy Wilkinson
433f8a6fd9 Prepare 3.2.x branch 2024-01-04 10:50:34 +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
8599e5a986 Remove unnecessary toString() calls
See gh-38739
2023-12-19 22:38:34 -08:00
Yanming Zhou
d3a51e56b7 Remove unnecessary static modifiers
See gh-38739
2023-12-19 22:38:08 -08:00
Yanming Zhou
ac18e3015c Use .isEmpty() where feasible
See gh-38739
2023-12-19 22:38:05 -08:00
Andy Wilkinson
47cac96dfe Merge branch '3.1.x'
Closes gh-38253
2023-11-07 11:25:09 +00:00
Andy Wilkinson
b2c5976920 Merge branch '3.0.x' into 3.1.x
Closes gh-38252
2023-11-07 11:23:06 +00:00
Andy Wilkinson
36161719e3 Merge branch '2.7.x' into 3.0.x
Closes gh-38251
2023-11-07 11:22:49 +00:00
Andy Wilkinson
8fc59e3367 Improve bom checking and address reported problems
Closes gh-38250
2023-11-07 11:18:19 +00:00
Andy Wilkinson
dcab94363f Merge branch '3.1.x'
Closes gh-38093
2023-10-27 17:09:50 +01:00
Andy Wilkinson
f91cdf02bc Merge branch '3.0.x' into 3.1.x
Closes gh-38092
2023-10-27 17:09:39 +01:00
Andy Wilkinson
66ae086a15 Merge branch '2.7.x' into 3.0.x
Closes gh-38091
2023-10-27 17:09:24 +01:00
Victor Georgescu
b9c2c6b820 Polish unit tests from buildSrc
* remove redundant "public" access modifiers
* remove a never thrown defined Exception
* assert the emptiness instead of length of files

See gh-38086
2023-10-27 17:06:24 +01:00
Andy Wilkinson
d5cf588a98 Merge branch '3.1.x'
Closes gh-37978
2023-10-20 15:59:00 +01:00
Andy Wilkinson
9d64a11418 Merge branch '3.0.x' into 3.1.x
Closes gh-37977
2023-10-20 15:58:48 +01:00
Andy Wilkinson
f081a0e9be Upgrade to Checkstyle 10.12.4
Closes gh-37976
2023-10-20 15:58:24 +01:00
Phillip Webb
3eeb1b2849 Merge branch '3.1.x' 2023-10-19 23:21:42 -07:00
Phillip Webb
d638bbb0ba Merge branch '3.1.x'
Closes gh-37967
2023-10-19 21:25:44 -07:00
Phillip Webb
1d456e09d2 Merge branch '3.0.x' into 3.1.x
Closes gh-37966
2023-10-19 21:12:52 -07:00
Phillip Webb
a0b999c8b4 Merge branch '2.7.x' into 3.0.x
Closes gh-37965
2023-10-19 20:55:51 -07:00
Phillip Webb
abdad1cabe Constently use assertThatExceptionOf... assertions
Closes gh-37964
2023-10-19 20:17:26 -07:00
Phillip Webb
4c3a0f09d7 Support parallel initialization of Testcontainers
Add support for a `spring.testcontainers.startup` property that can
be set to "sequential" or "parallel" to change how containers are
started.

Closes gh-37073
2023-10-14 23:58:25 -07:00
Phillip Webb
1edd1d5078 Protect against NPE when groups property is missing
Closes gh-37888
2023-10-14 23:43:07 -07:00
Andy Wilkinson
a05cef60bc Merge branch '3.1.x' 2023-10-11 11:45:16 +01:00
Andy Wilkinson
6c5374597a Merge branch '3.0.x' into 3.1.x 2023-10-11 11:45:04 +01:00
Andy Wilkinson
02c79ca7e6 Merge branch '2.7.x' into 3.0.x 2023-10-11 11:44:53 +01:00
Andy Wilkinson
952ce1234a Reinstate Download Plugin dependency 2023-10-11 11:44:26 +01:00
Andy Wilkinson
7fd4458811 Merge branch '3.1.x'
Closes gh-37820
2023-10-11 11:29:36 +01:00
Andy Wilkinson
4384631025 Merge branch '3.0.x' into 3.1.x
Closes gh-37818
2023-10-11 11:16:04 +01:00
Andy Wilkinson
6c44809488 Merge branch '2.7.x' into 3.0.x
Closes gh-37817
2023-10-11 11:13:19 +01:00
Andy Wilkinson
254b8fe3cb Closes gh-37815 2023-10-11 10:50:01 +01:00
Phillip Webb
b0b3adb1b7 Merge branch '3.1.x'
Closes gh-37741
2023-10-05 21:30:43 -07:00
Phillip Webb
2a35667295 Merge branch '3.0.x' into 3.1.x
Closes gh-37740
2023-10-05 21:30:10 -07:00
Phillip Webb
30af19acc2 Merge branch '2.7.x' into 3.0.x
Closes gh-37739
2023-10-05 20:54:09 -07:00
Phillip Webb
a33ce9d405 Cache JDK downloads for tests that use ImageFromDockerfile
Update `spring-boot-launch-script-tests` and `spring-boot-loader-tests`
so that JDK archives are now downloaded by Gradle and cached across
builds.

Closes gh-37450
2023-10-05 20:49:02 -07:00
Phillip Webb
2075f6c685 Merge branch '3.1.x' 2023-09-20 17:16:13 -07:00
Phillip Webb
78eb8f90d1 Merge branch '3.0.x' into 3.1.x 2023-09-20 17:12:27 -07:00