Commit Graph

936 Commits

Author SHA1 Message Date
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
teacmity
c6c7fbc15f Change log messages to use singular or plural instead of "noun(s)"
See gh-37017
2024-01-11 14:35:49 +00:00
Andy Wilkinson
17e9f0cb8e Merge branch '3.2.x'
Closes gh-39093
2024-01-11 11:36:38 +00: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
5b6e3fab2c Merge branch '3.2.x'
Closes gh-39085
2024-01-10 15:34:14 +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
eda2261665 Merge branch '3.2.x'
Closes gh-39074
2024-01-10 09:12:04 +01: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
Christoph Dreis
b7c9c82180 Fix typos
See gh-38983
2024-01-10 09:06:45 +01:00
Andy Wilkinson
be4ed3ffc0 Upgrade to Jackson Bom 2.16.1
Closes gh-39009
2024-01-04 17:32:11 +00: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
Phillip Webb
9b5062e5bb Merge branch '2.7.x' into 3.0.x 2023-09-20 17:06:55 -07:00
Phillip Webb
b83e7b42bb Update copyright year of changed files 2023-09-20 16:05:44 -07:00
Phillip Webb
e10ac76761 Polish 2023-09-20 16:05:30 -07:00
Andy Wilkinson
827471bca4 Merge branch '3.1.x'
Closes gh-37399
2023-09-15 08:37:22 +01:00
Andy Wilkinson
d9207fcaaf Merge branch '3.0.x' into 3.1.x
Closes gh-37398
2023-09-15 08:36:56 +01:00
Andy Wilkinson
8adc739b85 Merge branch '2.7.x' into 3.0.x
Closes gh-37397
2023-09-15 08:35:04 +01:00
Andy Wilkinson
e8e5146beb Stop failing the build when tests pass after retry
Closes gh-37392
2023-09-15 08:34:08 +01:00
Andy Wilkinson
e8c2bb0222 Merge branch '3.1.x'
Closes gh-37358
2023-09-13 10:22:45 +01:00
Andy Wilkinson
e128eb5025 Merge branch '3.0.x' into 3.1.x
Closes gh-37357
2023-09-13 10:22:35 +01:00
Andy Wilkinson
93ea05edc3 Merge branch '2.7.x' into 3.0.x
Closes gh-37356
2023-09-13 10:22:25 +01:00
Andy Wilkinson
0b3a5f2489 Ensure that check for unnecessary exclusions runs on classpath change
Closes gh-37307
2023-09-13 10:19:52 +01:00
Andy Wilkinson
96368a4e61 Merge branch '3.1.x'
Closes gh-37225
2023-09-07 10:10:17 +01:00
Andy Wilkinson
7b59d2fce2 Merge branch '3.0.x' into 3.1.x
Closes gh-37224
2023-09-07 10:07:52 +01:00
Andy Wilkinson
cce3c9d40f Merge branch '2.7.x' into 3.0.x
Closes gh-37223
2023-09-07 10:02:06 +01:00
Andy Wilkinson
38e9ede17d Only suggest snapshots for which a release is planned
Closes gh-37212
2023-09-07 09:55:36 +01:00
Andy Wilkinson
f2112459c2 Merge branch '3.1.x'
Closes gh-37202
2023-09-06 12:10:55 +01:00
Andy Wilkinson
2d395355ee Merge branch '3.0.x' into 3.1.x
Closes gh-37201
2023-09-06 12:09:11 +01:00
Andy Wilkinson
7486d9da72 Merge branch '2.7.x' into 3.0.x
Closes gh-37200
2023-09-06 12:07:42 +01:00
Andy Wilkinson
2d6f436893 Improve handling and comparison of snapshot versions
Closes gh-36197
2023-09-06 12:04:58 +01:00
Chris Bono
6e7b845bdf Add support for Apache Pulsar
Add support for Apache Pulsar using the Spring for Apache Pulsar
project.

See gh-34763

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2023-09-05 17:01:51 -07:00
Andy Wilkinson
809990bc86 Merge branch '3.1.x'
Closes gh-37193
2023-09-05 11:06:46 +01:00
Andy Wilkinson
dc4d647437 Merge branch '3.0.x' into 3.1.x
Closes gh-37192
2023-09-05 10:58:49 +01:00
Andy Wilkinson
4611c54aef Merge branch '2.7.x' into 3.0.x
Closes gh-37191
2023-09-05 10:53:16 +01:00
Andy Wilkinson
ced32f0751 Require libraries to opt in to moving to snapshots
Closes gh-37190
2023-09-05 10:40:31 +01:00
Andy Wilkinson
018c188ceb Merge branch '3.1.x' 2023-09-04 15:52:48 +01:00
Andy Wilkinson
701ce0058d Merge branch '3.0.x' into 3.1.x 2023-09-04 15:52:38 +01:00
Andy Wilkinson
878e74378f Merge branch '2.7.x' into 3.0.x 2023-09-04 15:52:26 +01:00
Andy Wilkinson
b858801a07 Use decorator pattern to multi-thread update resolution 2023-09-04 15:44:23 +01:00
Phillip Webb
d73d8f8e4f Merge branch '3.1.x' 2023-08-13 19:15:56 -07:00
Phillip Webb
848a61a3a8 Merge branch '3.0.x' into 3.1.x 2023-08-13 18:50:33 -07:00
Phillip Webb
a0089c5c76 Merge branch '2.7.x' into 3.0.x 2023-08-13 18:44:36 -07:00
Phillip Webb
527b2f2cac Polish 2023-08-13 18:18:48 -07:00
Andy Wilkinson
5e3bc0085a Merge branch '3.1.x' 2023-08-09 16:57:13 +01:00
Andy Wilkinson
7fea7e15c6 Merge branch '3.0.x' into 3.1.x 2023-08-09 16:57:02 +01:00
Andy Wilkinson
7b4c371c1d Merge branch '2.7.x' into 3.0.x 2023-08-09 16:56:52 +01:00
Andy Wilkinson
573f01e991 Polish Bomr's output
See gh-35296
2023-08-09 16:56:30 +01:00
Andy Wilkinson
b0d74c46f5 Merge branch '3.1.x'
Closes gh-36874
2023-08-09 14:05:24 +01:00
Andy Wilkinson
79f0ee4bd1 Merge branch '3.0.x' into 3.1.x
Closes gh-36873
2023-08-09 14:05:12 +01:00
Andy Wilkinson
63fc5a9d71 Merge branch '2.7.x' into 3.0.x
Closes gh-36872
2023-08-09 14:04:48 +01:00
Andy Wilkinson
4d75f2cb08 Improve log output when applying upgrades
Closes gh-35296
2023-08-09 14:02:40 +01:00
Andy Wilkinson
1e28ebd8aa Merge branch '3.1.x'
Closes gh-36823
2023-08-09 09:25:38 +01:00
Andy Wilkinson
9f2e592b9b Merge branch '3.0.x' into 3.1.x
Closes gh-36822
2023-08-09 09:21:02 +01:00
Andy Wilkinson
4062ba6d28 Merge branch '2.7.x' into 3.0.x
Closes gh-36821
2023-08-09 08:25:41 +01:00
Andy Wilkinson
68baa6e7df Make section IDs consistent in Maven Plugin docs and enforce it
Closes gh-26619
2023-08-09 08:06:38 +01:00
Andy Wilkinson
8ae8fdca57 Merge branch '3.1.x' 2023-08-04 09:14:35 +01:00
Andy Wilkinson
4a47b366e9 Merge branch '3.0.x' into 3.1.x 2023-08-04 09:14:27 +01:00
Andy Wilkinson
6adecf4cb2 Fix handling of potential ugrade issues with no space in title 2023-08-04 09:14:17 +01:00
Andy Wilkinson
00e46192e4 Fix handling of potential ugrade issues with no space in title 2023-08-03 14:52:14 +01:00
Yanming Zhou
b1ac64c7e2 Harmonize Stream.collect() usage
use Stream.toList() or collect(Collectors.toSet()) where possible.

See gh-36509
2023-07-26 11:15:08 +02:00
Andy Wilkinson
7088d0e04a Merge branch '3.1.x'
Closes gh-36256
2023-07-06 11:33:42 +01:00
Andy Wilkinson
64eaca4db3 Merge branch '3.0.x' into 3.1.x
Closes gh-36255
2023-07-06 11:32:33 +01:00
Andy Wilkinson
81510441aa Merge branch '2.7.x' into 3.0.x
Closes gh-36254
2023-07-06 11:25:52 +01:00
Andy Wilkinson
142a3983a0 Check that AutoConfiguration classes are listed in imports file
Closes gh-36253
2023-07-06 11:19:03 +01:00
Andy Wilkinson
ce8253ea95 Merge branch '3.1.x'
Closes gh-36238
2023-07-05 09:51:35 +01:00
Andy Wilkinson
c9f8d92656 Merge branch '3.0.x' into 3.1.x
Closes gh-36237
2023-07-05 09:47:43 +01:00
Andy Wilkinson
0e815d2342 Polish "Use Stream.toList()"
See gh-36167
2023-07-05 09:39:38 +01:00
Johnny Lim
0fa58c04e7 Use Stream.toList()
See gh-36167
2023-07-05 09:38:19 +01:00
Ahmed Ashour
298bfd96c2 Change WebServer log messages to use port or ports, not port(s)
See gh-36103
2023-06-30 16:28:21 +01:00
Andy Wilkinson
c038d27c49 Merge branch '3.1.x'
Closes gh-36085
2023-06-27 11:11:34 +01:00
Andy Wilkinson
b4d7e1837e Merge branch '3.0.x' into 3.1.x
Closes gh-36084
2023-06-27 11:11:20 +01:00
Andy Wilkinson
774993b510 Merge branch '2.7.x' into 3.0.x
Closes gh-36083
2023-06-27 11:10:51 +01:00
Andy Wilkinson
0fdaba2487 Make TestSliceMetadata depend on source set's processResources task
Closes gh-36082
2023-06-27 11:10:30 +01:00
Andy Wilkinson
357c67a999 Merge branch '3.1.x' 2023-06-23 15:58:51 +01:00
Andy Wilkinson
3f7fe25cb9 Merge branch '3.0.x' into 3.1.x
Closes gh-36044
2023-06-23 15:58:36 +01:00
Andy Wilkinson
2fae5de245 Merge branch '2.7.x' into 3.0.x
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson
d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
See gh-35915
2023-06-23 12:38:12 +01:00
Andy Wilkinson
ca5bd37e81 Upgrade to Spring Framework 6.1.0-M1
Closes gh-35977
Closes gh-35980
2023-06-19 18:12:16 +01:00
Phillip Webb
23eb7ec1f8 Merge branch '3.1.x' 2023-06-16 14:35:44 -07:00
Phillip Webb
5d6a507142 Merge branch '3.0.x' into 3.1.x 2023-06-16 14:35:23 -07:00
Phillip Webb
48e13af8c4 Merge branch '2.7.x' into 3.0.x 2023-06-16 14:34:54 -07:00
Phillip Webb
b8d2c279ee Update copyright year of changed files 2023-06-16 14:32:43 -07:00
Andy Wilkinson
4a34015c54 Merge branch '3.1.x' 2023-06-16 10:00:36 +01:00
Andy Wilkinson
0cfc14ef6c Merge branch '3.0.x' into 3.1.x
Closes gh-35925
2023-06-16 09:58:42 +01:00
Andy Wilkinson
845c97fae0 Merge branch '2.7.x' into 3.0.x
Closes gh-35924
2023-06-16 09:55:52 +01:00
Andy Wilkinson
c46bef1858 Protect against unconstrained dependencies in starters
Closes gh-19775
2023-06-16 09:50:52 +01:00
Moritz Halbritter
6e604ad65c Implement @ConditionalOnVirtualThreads
Closes gh-35892
2023-06-15 08:30:09 +02:00
Andy Wilkinson
0ce2b054d2 Merge branch '3.1.x' 2023-06-14 18:20:07 +01:00
Andy Wilkinson
9b88128e3b Merge branch '3.0.x' into 3.1.x 2023-06-14 18:19:53 +01:00
Andy Wilkinson
4694e20628 Merge branch '2.7.x' into 3.0.x 2023-06-14 18:19:43 +01:00
Andy Wilkinson
7d07c0d09c Polish configuration related to predictive test selection
Most notably, this commit splits the tests that use Spring REST Docs
out into a separate task for which predictive test selection is
disabled. This allows it to be cached and use Gradle's built-in
up-to-date checking, thereby avoiding the generation of new snippets
and the need to then run the asciidoctor and asciidoctorPdf tasks.

It also updates spring-boot-smoke-test-junit-vintage to disable
predictive test selection so that we can continue to assert that
the some tests were executed.

See gh-35869
2023-06-14 18:15:04 +01:00
Andy Wilkinson
ee9a1e6467 Merge branch '3.1.x' 2023-06-13 21:06:37 +01:00
Andy Wilkinson
25c6083fe8 Merge branch '3.0.x' into 3.1.x
Closes gh-35871
2023-06-13 21:06:04 +01:00
Andy Wilkinson
effa77359b Merge branch '2.7.x' into 3.0.x
Closes gh-35870
2023-06-13 21:05:19 +01:00
Andy Wilkinson
2084ae1d1f Make predictive test selection opt-in
Closes gh-35869
2023-06-13 21:04:07 +01:00
Andy Wilkinson
125ff54aaf Merge branch '3.1.x' 2023-06-13 20:30:44 +01:00
Andy Wilkinson
cd0b735da8 Merge branch '3.0.x' into 3.1.x
Closes gh-35877
2023-06-13 20:30:32 +01:00
Andy Wilkinson
23c0e0cccc Merge branch '2.7.x' into 3.0.x
Closes gh-35876
2023-06-13 20:30:18 +01:00
Andy Wilkinson
b2ef9da154 Always run Actuator documentation tests
The tests must run so that the snippets included in the docs are
generated.

Closes gh-35875
2023-06-13 20:29:30 +01:00
Andy Wilkinson
5b39794f93 Merge branch '3.1.x' 2023-06-13 15:55:11 +01:00
Andy Wilkinson
795d8ca194 Merge branch '3.0.x' into 3.1.x
Closes gh-35871
2023-06-13 15:54:59 +01:00
Andy Wilkinson
2ce6a4b2d6 Merge branch '2.7.x' into 3.0.x
Closes gh-35870
2023-06-13 15:54:36 +01:00
Andy Wilkinson
1e0c129452 Enable predictive test selection for local builds
Closes gh-35869
2023-06-13 15:54:20 +01:00
Andy Wilkinson
a732f0dfb2 Merge branch '3.1.x' 2023-06-13 11:55:29 +01:00
Andy Wilkinson
50a5e31873 Fix comparision of identical snapshots
Closes gh-35860
2023-06-13 11:53:36 +01:00
Andy Wilkinson
409eb055bb Prepare 3.1.x branch 2023-06-08 10:19:32 +01:00
Andy Wilkinson
159c93d0b2 Polish "Expose spring.ssl bundle keys"
See gh-35667
2023-06-06 17:57:40 +01:00
Stephane Nicoll
7a9bb55fdf Merge branch '3.0.x'
Closes gh-35589
2023-05-22 16:24:56 +02:00
Moritz Halbritter
b70399e998 Merge branch '3.0.x' 2023-05-12 12:03:32 +02:00