Commit Graph

853 Commits

Author SHA1 Message Date
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
Andy Wilkinson b4fccf480a Ensure that Maven plugin's intTest runs when Maven binaries change
Previously, the intTest task had a dependsOn relationship with
prepareMavenBinaries task. This ensured that the two tasks ran in the
correct order but did not ensure that the intTest task would run if
the prepared binaries had changed.

This commit updates the configuration of the intTest task to wire up
the output of the prepareMavenBinaries as an input of the intTest
task. This ensures that the intTest task will run when the prepared
binaries have changed and also creates an implicit dependsOn
relationship between the two tasks.

Closes gh-34474
2023-03-06 10:18:24 +00:00
Phillip Webb 157091a811 Merge branch '3.0.x' 2023-02-22 18:36:57 -08:00
Phillip Webb 0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00
Phillip Webb a5902d7a00 Update copyright year of changed files 2023-02-22 18:35:17 -08:00
Andy Wilkinson 7d697310a0 Merge branch '3.0.x'
Closes gh-34335
2023-02-22 11:03:10 +00:00
Andy Wilkinson 50da0bce56 Merge branch '2.7.x' into 3.0.x
Closes gh-34334
2023-02-22 11:02:41 +00:00
Andy Wilkinson 510c78154b Remove unused version alignment support from Bomr
Closes gh-34333
2023-02-22 10:51:42 +00:00
Phillip Webb b07269a018 Merge branch '3.0.x' 2023-02-21 23:20:07 -08:00
Phillip Webb c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
Phillip Webb d2e3e5231c Merge branch '3.0.x'
Closes gh-34331
2023-02-21 22:39:03 -08:00
Phillip Webb d3104257d7 Merge branch '2.7.x' into 3.0.x
Closes gh-34330
2023-02-21 22:37:44 -08:00
Phillip Webb b93c9f7fec Upgrade to spring-javaformat 0.0.38
Closes gh-34329
2023-02-21 22:29:11 -08:00
Scott Frederick 12537c7170 Merge branch '3.0.x'
Closes gh-34162
2023-02-09 15:47:57 -06:00
Scott Frederick cbac3c81d6 Merge branch '2.7.x' into 3.0.x
Closes gh-34161
2023-02-09 15:47:34 -06:00
Scott Frederick 33aef7fe27 Update CLI installation docs to download releases from Maven Central
Closes gh-33962
2023-02-09 15:45:15 -06:00
Andy Wilkinson 6aceca710f Merge branch '3.0.x'
Closes gh-34159
2023-02-09 18:05:55 +00:00
Andy Wilkinson a6f357c2fd Merge branch '2.7.x'
Closes gh-34147
2023-02-09 15:55:20 +00:00
Andy Wilkinson 994a7a0795 Add support to Bomr for moving to snapshots
Closes gh-27002
2023-02-09 15:53:52 +00:00
Andy Wilkinson 64dcbec763 Merge branch '3.0.x'
Closes gh-34124
2023-02-08 14:17:30 +00:00
Andy Wilkinson 1cdc24a11d Merge branch '2.7.x' into 3.0.x
Closes gh-34123
2023-02-08 14:17:06 +00:00
Andy Wilkinson 07fcb67540 Use repo.maven.apache.org consistently
Maven Central has two canonical URLs [1]:

- https://repo1.maven.org
- https://repo.maven.apache.org

This commit updates the codebase to only use repo.maven.apache.org.

Closes gh-33938

[1] https://central.sonatype.org/news/20190715_http_deprecation_update/#canonical-urls
2023-02-08 14:04:16 +00:00
Moritz Halbritter 48db5ff35c Merge branch '3.0.x'
Closes gh-34018
2023-01-31 10:51:45 +01:00
Moritz Halbritter 0a080736d8 Merge branch '2.7.x' into 3.0.x
Closes gh-34017
2023-01-31 10:50:30 +01:00
Johnny Lim 5eeb429e44 Polish
See gh-33966
2023-01-31 10:48:30 +01:00
Phillip Webb 390892f11b Merge branch '3.0.x'
Closes gh-33998
2023-01-26 21:45:57 -08:00
Krzysztof Krason 1b5b1cd250 Use Files.writeString
See gh-33987
2023-01-26 20:47:35 -08:00
Krzysztof Krason 55a50d565c Use Comparator.comparing
See gh-33987
2023-01-26 20:47:34 -08:00
Krzysztof Krason 6e46423983 Use diamond operators
See gh-33987
2023-01-26 20:35:08 -08:00
Andy Wilkinson 8e7822d214 Create 3.0.x branch 2023-01-23 12:04:16 +00:00
Phillip Webb a889c539ab Merge branch '2.7.x' 2023-01-17 10:12:25 -08:00
Phillip Webb a0fe8241a7 Update copyright year of changed files 2023-01-17 10:07:03 -08:00
Moritz Halbritter 522ef881a0 Merge branch '2.7.x'
Closes gh-33852
2023-01-17 10:35:52 +01:00
Moritz Halbritter af2b5b4571 Increase sleep duration after creating GitHib issue in BOMR
Closes gh-30304
2023-01-17 10:32:36 +01:00
Moritz Halbritter e3483f10be Merge branch '2.7.x'
Closes gh-33844
2023-01-16 15:29:03 +01:00
Moritz Halbritter a41ca05a2f Default to empty string if description in plugin.xml is not set
Closes gh-20890
2023-01-16 14:52:29 +01:00
Moritz Halbritter 6567f40650 Merge branch '2.7.x' 2023-01-13 13:54:05 +01:00
Moritz Halbritter a2f9e30e77 Reduce number of threads used for BOMR library update checks
See gh-33824
2023-01-13 13:53:49 +01:00
Moritz Halbritter c1ca05d99d Merge branch '2.7.x'
Closes gh-33825
2023-01-13 10:51:19 +01:00
Moritz Halbritter e0b7720b9e Implement multithreaded BOMR library resolution
- BOMR now first looks for library updates, collects them all and then
  prompts the user to choose which update to apply
- Refactored code into StandardLibraryUpdateResolver
- Implemented MultithreadedLibraryUpdateResolver on top of the standard
  one
- Uses 8 threads by default, this is configurable
- When run with --info, it logs how long each update search took

Closes gh-33824
2023-01-13 10:47:24 +01:00
Moritz Halbritter 600300c071 Merge branch '2.7.x' 2023-01-13 09:28:52 +01:00
Moritz Halbritter 484d662085 Allow multiple startsWith, contains and endsWith clauses in bomr
- Add support for startsWith prohibition
2023-01-12 17:33:26 +01:00
Moritz Halbritter 3d42ab085a Polish MavenMetadataVersionResolver 2023-01-12 17:32:44 +01:00
Moritz Halbritter b3644c1a99 Polish StandardGitHub 2023-01-12 17:32:24 +01:00
Moritz Halbritter 75f934c92e Merge branch '2.7.x'
Closes gh-33816
2023-01-12 16:13:26 +01:00
Moritz Halbritter aca087e762 Add more possibilities to prohibit version upgrades
Closes gh-32457
2023-01-12 16:08:06 +01:00
Moritz Halbritter af04d4ae46 Merge branch '2.7.x'
Closes gh-33793
2023-01-12 13:52:15 +01:00
Moritz Halbritter d5e541226b Add bomr support for 5 component version numbers
Closes gh-29928
2023-01-12 13:49:27 +01:00
Andy Wilkinson 485025310e Merge branch '2.7.x'
Closes gh-33777
2023-01-12 12:04:04 +00:00
Andy Wilkinson 9d57cbc1d5 Drop scoop manifest creation
Closes gh-33703
2023-01-12 12:00:39 +00:00
Andy Wilkinson 433364601d Merge branch '2.7.x' 2023-01-11 17:04:33 +00:00