Commit Graph

904 Commits

Author SHA1 Message Date
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
Moritz Halbritter
7b4056df7f Merge branch '2.7.x' into 3.0.x 2023-05-12 12:00:11 +02:00
Moritz Halbritter
700e89097c Polish
See https://stackoverflow.com/questions/28671903/the-hashsett-removeall-method-is-surprisingly-slow
2023-05-12 11:57:33 +02:00
Andy Wilkinson
1ec6195994 Merge branch '3.0.x'
Closes gh-35320
2023-05-05 08:21:00 +01:00
Andy Wilkinson
1af5f4e40b Merge branch '2.7.x' into 3.0.x
Closes gh-35319
2023-05-05 08:20:05 +01:00
Andy Wilkinson
3a45d46583 Allow buildSrc to resolve Framework snapshots
Closes gh-35297
2023-05-05 08:16:37 +01:00
Phillip Webb
a890323758 Merge branch '3.0.x' 2023-05-02 14:52:42 -07:00
Andy Wilkinson
d24167371e Merge branch '3.0.x'
Closes gh-35226
2023-05-02 09:17:28 +01:00
Andy Wilkinson
8f3f74ffd5 Merge branch '2.7.x' into 3.0.x
Closes gh-35225
2023-05-02 09:03:17 +01:00
Andy Wilkinson
695e58f418 Align buildSrc's Framework version with the main build's version
Closes gh-35224
2023-05-02 08:59:58 +01:00
Andy Wilkinson
95a8c11773 Merge branch '3.0.x' 2023-05-02 08:44:45 +01:00
Andy Wilkinson
c208a4482d Merge branch '2.7.x' into 3.0.x 2023-05-02 08:41:35 +01:00
Andy Wilkinson
d0a354352d Polish buildSrc's build.gradle 2023-05-02 08:41:20 +01:00
Andy Wilkinson
ad4f7577c7 Merge branch '3.0.x' 2023-04-26 20:37:08 +01:00
Andy Wilkinson
32b52102d8 Merge branch '2.7.x' into 3.0.x 2023-04-26 20:36:57 +01:00
Andy Wilkinson
c72b77c08e Polish 2023-04-26 20:36:45 +01: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
Andy Wilkinson
6b9bc012a5 Check that BPP and BFPP bean methods won't cause eager initialization
Closes gh-35164
2023-04-26 11:47:03 +01:00
Phillip Webb
13d00d85e0 Filter out /build folders on Eclipse classpath
Add `EclipseConventions` to filter out build folders contributed by
the Kotlin Gradle Plugin.

Closes gh-35101
2023-04-25 13:02:50 -07:00
Mortitz Halbritter
842e17eced Add Docker Compose support
Add `spring-boot-docker-compose` module with service connection
support.

Closes gh-34747

Co-authored-by: Phillip Webb <pwebb@vmware.com>
Co-authored-by: "Andy Wilkinson <wilkinsona@vmware.com>
2023-04-17 01:00:08 -07:00
Phillip Webb
1849b82334 Don't apply configuration-properties from auto-configuration plugin
Update the auto-configuration gradle plugin so that the
configuration-properties plugin is not longer automatically applied.
This  allows us to have auto-configuration modules that don't ship
configuration properties.

Closes gh-35028
2023-04-17 00:41:25 -07:00
Phillip Webb
e9a198a68f Merge branch '3.0.x' 2023-04-12 22:16:35 -07:00
Phillip Webb
7fea4c84b4 Update copyright year of changed files 2023-04-12 22:16:07 -07:00
Phillip Webb
7da347ad91 Merge branch '3.0.x' 2023-04-09 15:43:43 -07:00
Phillip Webb
e0b9ec2bc2 Fix Eclipse WTP facet version
Add `WarConventions` to fix the facet version used by Eclipse WTP
2023-04-09 15:42:44 -07:00
Andy Wilkinson
1aaf498bb9 Merge branch '3.0.x'
Closes gh-34797
2023-03-28 13:47:32 +01:00
Andy Wilkinson
c37ff8d687 Merge branch '2.7.x' into 3.0.x
Closes gh-34798
2023-03-28 13:47:12 +01:00
Andy Wilkinson
0ed73a859b Upgrade to Spring Asciidoctor Backends 0.0.5
Closes gh-34432
2023-03-28 13:23:12 +01:00
Andy Wilkinson
a401ff87d0 Improve Bomr's upgrade suggestions for milestones and RCs
Closes gh-34307
2023-03-22 17:53:53 +00:00
Andy Wilkinson
7283493031 Upgrade to Maven Help Plugin 3.4.0
Closes gh-34687
2023-03-21 12:04:36 +00:00
Andy Wilkinson
0bba1903ea Merge branch '3.0.x'
Closes gh-34485
2023-03-06 10:18:58 +00:00
Andy Wilkinson
dd397c124c Merge branch '2.7.x' into 3.0.x
Closes gh-34484
2023-03-06 10:18:43 +00:00