Commit Graph

1287 Commits

Author SHA1 Message Date
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
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
Andy Wilkinson 3b2e5e5292 Remove references to https://repo.spring.io/release 2023-01-11 17:03:45 +00:00
Andy Wilkinson 4c62de1710 Merge branch '2.7.x'
Closes gh-33764
2023-01-11 17:03:17 +00:00
Andy Wilkinson a8da4e1004 Upgrade to Asciidoctor Backends 0.0.4
Closes gh-33761
2023-01-11 17:02:39 +00:00
Phillip Webb 29b7c121fb Merge branch '2.7.x'
Closes gh-33739
2023-01-09 19:01:57 -08:00
Phillip Webb a369f936c9 Replace references to Pivotal
Closes gh-33737
2023-01-09 18:09:20 -08:00
Phillip Webb a2ac38e203 Update copyright year of changed files 2023-01-09 15:46:07 -08:00
Phillip Webb 1621cfd578 Merge branch '2.7.x' 2023-01-09 15:44:44 -08:00
Phillip Webb 80cfcb71ec Update copyright year of changed files 2023-01-09 15:18:10 -08:00
Krzysztof Krason cf6493f65c Simplify AssertJ assertions and also make them more readable
See gh-33653
2023-01-09 11:10:20 +01:00
Moritz Halbritter b641073777 Merge branch '2.7.x'
Closes gh-33725
2023-01-09 10:35:50 +01:00
Christoph Dreis 1b4ef5db0f Update copyrights to 2023
See gh-33682
2023-01-09 10:35:07 +01:00
Phillip Webb 5ec5007bf0 Merge branch '2.7.x'
Closes gh-33706
2023-01-05 17:21:34 -08:00
Phillip Webb 68af379714 Don't use repo.spring.io in released Homebrew or Scoop recipes
Update our Homebrew and Scoop recipes to use `repo1.maven.org` rather
than `repo.spring.io` for releases.

Fixes gh-33702
2023-01-05 13:56:58 -08:00
Phillip Webb 0d9967c70c Polish 2023-01-05 13:17:20 -08:00
Andy Wilkinson 3bcc7ece55 Merge branch '2.7.x'
Closes gh-33676
2023-01-03 16:09:51 +00:00
Andy Wilkinson 84c021bc97 Upgrade to Gradle Enterprise Gradle Plugin 3.12.1
Closes gh-33672
2023-01-03 15:57:48 +00:00
Phillip Webb f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Phillip Webb 0254619782 Merge branch '2.7.x' 2022-12-22 00:59:40 -08:00
Phillip Webb e4772cf3b7 Update copyright year of changed files 2022-12-22 00:59:32 -08:00
Phillip Webb 9562a2c2f1 Merge branch '2.7.x' 2022-12-21 23:01:57 -08:00
Phillip Webb 60a75e3799 Increase timeout for ApplicationRunner task 2022-12-21 23:00:10 -08:00
Moritz Halbritter f36e2ecb7b Use AutoClosables with try-with-resources
Closes gh-33538
2022-12-16 15:43:15 +01:00
Moritz Halbritter 725337f976 Make fields final
Closes gh-33537
2022-12-16 14:28:44 +01:00
Phillip Webb 67c9c7377a Merge branch '2.7.x'
Closes gh-33414
2022-11-29 11:00:18 -08:00
Jerome Prinet 72a9f494f3 Document that SystemTestPlugin output should never be cached
See gh-33411
2022-11-29 10:53:46 -08:00
Andy Wilkinson f39b297677 Merge branch '2.7.x'
Closes gh-33227
2022-11-16 18:09:35 +00:00
Andy Wilkinson 04353e4961 Merge branch '2.6.x' into 2.7.x
Closes gh-33226
2022-11-16 16:41:02 +00:00
Andy Wilkinson 1494deb4a0 Check for package tangles at build time
See gh-17299
2022-11-16 16:11:59 +00:00
Andy Wilkinson f8a2e68a5d Merge branch '2.7.x' 2022-11-08 13:53:44 +00:00
Andy Wilkinson 1e536f5c20 Merge branch '2.6.x' into 2.7.x 2022-11-08 13:53:35 +00:00
Andy Wilkinson 5dab9b0e9f Revert "Temporarily work around problems with Gradle's plugin portal"
This reverts commit fb954e8109.
2022-11-08 13:53:21 +00:00
Andy Wilkinson b357239861 Upgrade to Jakarta Activation 2.1.0
Closes gh-33045
2022-11-08 11:01:17 +00:00
Andy Wilkinson 7cbd90d87d Merge branch '2.7.x' 2022-11-08 10:18:48 +00:00
Andy Wilkinson 1d838f6faa Merge branch '2.6.x' into 2.7.x 2022-11-08 10:18:27 +00:00
Andy Wilkinson fb954e8109 Temporarily work around problems with Gradle's plugin portal 2022-11-08 10:18:13 +00:00
Phillip Webb 2b5a29d514 No longer log hostname during application start
Remove hostname logging since `InetAddress.getLocalHost().getHostName()`
causes a network lookup and can take a long time.

Closes gh-32908
2022-10-31 13:46:47 -07:00
Johnny Lim 5067aab552 Polish
See gh-32840
2022-10-27 16:33:14 +02:00
Phillip Webb 4be3218cb6 Merge branch '2.7.x' 2022-10-25 15:48:26 -07:00
Andy Wilkinson 99edda735e Polish 2022-10-25 12:57:58 +01:00
Andy Wilkinson edce1f4e91 Merge branch '2.7.x'
Closes gh-32611
2022-10-06 11:12:12 +01:00
Andy Wilkinson d909c4efb6 Merge branch '2.6.x' into 2.7.x
Closes gh-32610
2022-10-06 11:11:56 +01:00
Andy Wilkinson c4a0dad6fe Upgrade to Spring Java Format 0.0.35
Closes gh-32609
2022-10-06 11:10:45 +01:00
Phillip Webb e0b67889a8 Use Stream.toList instead of Stream.collect when possible
Update code to make use of `Stream.toList()` whenever possible.

Closes gh-28177
2022-10-04 00:29:22 -07:00
Andy Wilkinson a036b30822 Merge branch '2.7.x' 2022-09-29 12:52:51 +01:00
Andy Wilkinson c31d99d3a0 Merge branch '2.6.x' into 2.7.x 2022-09-29 12:52:37 +01:00
Andy Wilkinson 8a93abfaaa Improve diagnostics when run does not produce expected logging 2022-09-29 12:52:02 +01:00
Scott Frederick 08022ba86e Remove support for locating imports using spring.factories
With this commit, loading `@AutoConfiguration`,
`@ImportAutoConfiguration`, and `@ManagementContextConfiguration`
classes is supported with `.imports` files only. Support for loading
these classes with `spring.factories` is removed.

Closes gh-29699
2022-09-21 17:34:51 -05:00
Scott Frederick f9c341c75a Revert "Generate the AutoConfiguration.imports file from annotations"
This reverts commit da4de7d67d.
2022-09-21 14:50:15 -05:00
Andy Wilkinson 2f3b681a82 Merge branch '2.7.x' 2022-09-10 07:49:32 +01:00
Andy Wilkinson 3f779191e6 Merge branch '2.6.x' into 2.7.x 2022-09-10 07:49:12 +01:00
Andy Wilkinson 5cb23aeb85 Only disable test tasks when a project isn't compatible with toolchain
Disabling compilation means that any downstream project will break.
For example, disabling our Gradle plugin's compileJava task means
that the launch script test app fails to build as it uses our
Gradle plugin and its classes are missing.

See gh-gh-32280
2022-09-10 07:47:19 +01:00
Andy Wilkinson 144fdaa703 Merge branch '2.6.x' into 2.7.x
Closes gh-32283
2022-09-09 15:14:40 +01:00
Andy Wilkinson 78f4242e46 Build with Gradle 7.5 while still supporting Gradle 6.8+
Closes gh-32281
2022-09-09 15:13:43 +01:00
Phillip Webb 46be4a3f30 Merge branch '2.7.x' 2022-09-08 19:38:18 -07:00
Phillip Webb d4ed2bd47a Support import into Eclipse 2022-06
Fix a few issues preventing clean project import into Eclipse 2022-06:

  - `buildSrc` need to limit module imports to prevent clashes
    with those in the gradle API jar.

  - The CLI app needs some classpath changes in order to allow
    compileOnly project dependencies to resolve.

  - `AbstractJpaAutoConfigurationTests` needs some minor refactoring
    in order for generic captures to work with the Eclipse compiler.
2022-09-07 15:56:57 -07:00
Johnny Lim 2273191c03 Polish
See gh-32215
2022-09-07 08:48:08 +02:00
Andy Wilkinson d1810941e8 Automatically configure annotation processing in Eclipse
Closes gh-32236
2022-09-06 20:14:14 +01:00
Brian Clozel cca5ee8a89 Merge branch '2.6.x' into 2.7.x
Closes gh-32229
2022-09-05 14:24:06 +02:00
Andy Wilkinson d9265f0a92 Build against SnakeYAML 1.31 but still use 1.29 in dep mgmt and starter 2022-09-05 13:55:19 +02:00
Scott Frederick da4de7d67d Generate the AutoConfiguration.imports file from annotations
This commit adds the `AutoConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module. When added to a project build, the annotation processor will
generate the
`org.springframework.boot.autoconfigure.AutoConfiguration.imports`
file automatically from `@AutoConfiguration`-annotated classes. It
also applies the annotation processor to the Spring Boot build.

Closes gh-31228
2022-09-02 15:10:22 -05:00
Andy Wilkinson 19a7fee1d7 Merge branch '2.7.x'
Closes gh-32202
2022-08-31 17:49:37 +01:00
Andy Wilkinson d189853412 Merge branch '2.6.x' into 2.7.x
Closes gh-32201
2022-08-31 17:48:12 +01:00
Andy Wilkinson 01aeb550b6 Upgrade to Test Retry Gradle Plugin 1.4.1
Closes gh-32200
2022-08-31 14:58:03 +01:00
Phillip Webb 09bd531fe5 Add Maven plugin support for processing test contexts Ahead-of-time
Refactor and update the Spring Boot Maven Plugin so that it can
be used to perform AOT processing of test classes.

Closes gh-32191
2022-08-30 20:41:30 -07:00
Phillip Webb fe1ffff3d7 Merge branch '2.7.x'
Closes gh-32158
2022-08-23 16:11:27 -07:00
Phillip Webb 5f2f6d32cf Merge branch '2.6.x' into 2.7.x
Closes gh-32157
2022-08-23 16:11:13 -07:00
Phillip Webb 546d7b41e9 Polish 'Add JVM options to prevent warnings with asciidoctor'
See gh-32123
2022-08-23 16:09:58 -07:00
Andy Wilkinson 41334223ff Merge branch '2.7.x'
Closes gh-32044
2022-08-09 18:07:51 +01:00
Andy Wilkinson a9a9c9f966 Merge branch '2.6.x' into 2.7.x
Closes gh-32043
2022-08-09 18:07:27 +01:00
Andy Wilkinson f287acd1ff Fix external links in descriptions of Maven Plugin's goal parameters
Closes gh-29171
2022-08-09 18:06:37 +01:00
Andy Wilkinson ba93e6c0ed Restore support for Jersey
Closes gh-28637
2022-08-08 15:45:20 +01:00
Madhura Bhave 0991bd3983 Harmonize data configuration
Any classes that rely on Spring Data being on the classpath
have been moved under a data package.

Certain configuration properties have also been updated to
accurately reflect whether Spring Data is required for the
auto-configuration to work.

Closes gh-11574
2022-08-05 13:32:25 -07:00
Andy Wilkinson 36cf3b9f78 Merge branch '2.7.x'
See gh-31988
2022-08-04 21:56:57 +01:00
Andy Wilkinson eb67470b89 Merge branch '2.6.x' into 2.7.x
See gh-31987
2022-08-04 21:56:35 +01:00
Andy Wilkinson b905d7f341 Normalize included log output to remove CI-specific details
See gh-28208
2022-08-04 21:55:17 +01:00
Andy Wilkinson 05877dc927 Merge branch '2.7.x'
Closes gh-31988
2022-08-04 14:17:39 +01:00
Andy Wilkinson a69cf002f0 Merge branch '2.6.x' into 2.7.x
Closes gh-31987
2022-08-04 14:16:16 +01:00
Andy Wilkinson 6efa77f3f5 Generate console output examples at build time
Closes gh-28208
2022-08-04 14:15:25 +01:00
Andy Wilkinson 2f0dfc341c Merge branch '2.7.x'
Closes gh-31972
2022-08-03 15:20:34 +01:00
Andy Wilkinson 700460c322 Merge branch '2.6.x' into 2.7.x
Closes gh-31971
2022-08-03 14:58:07 +01:00
Andy Wilkinson fa73b73898 Fail build on missing configuration property descriptions
Closes gh-31916
2022-08-03 14:45:42 +01:00
Brian Clozel 38f1bc9793 Reinstate Spring for GraphQL auto-configuration
This commit adds the Spring for GraphQL auto-configuration back
into Spring Boot 3.0, now that a 1.1.0 release is scheduled with the
required baseline. This release also needs GraphQL Java 19.0 as a
baseline.

Closes gh-31809
2022-08-01 14:33:25 +02:00
Andy Wilkinson 8436654614 Merge branch '2.7.x'
Closes gh-31911
2022-07-28 16:32:16 +01:00
Andy Wilkinson 53703206ae Merge branch '2.6.x' into 2.7.x
Closes gh-31910
2022-07-28 16:31:47 +01:00
Andy Wilkinson 532285b47e Add support for upgrading specific libraries with Bomr
Closes gh-31909
2022-07-28 16:30:52 +01:00
Phillip Webb 7377d85096 Merge branch '2.7.x'
Closes gh-31866
2022-07-26 12:18:14 +01:00
Phillip Webb a4ef6a7c5c Merge branch '2.6.x' into 2.7.x
Closes gh-31865
2022-07-26 12:13:16 +01:00
Phillip Webb f8412847dc Update copyright year for "Fix typos in code and documentation"
See gh-31734
2022-07-26 12:08:30 +01:00
Marc Wrobel dbfc6bded4 Fix typos in code and documentation
See gh-31734
2022-07-26 12:08:07 +01:00
Phillip Webb b93dbd56e8 Merge branch '2.7.x' 2022-07-26 10:51:17 +01:00
Phillip Webb 3931e82841 Merge branch '2.6.x' into 2.7.x 2022-07-26 10:50:42 +01:00
Phillip Webb 757a0c2664 Update copyright year of changed files 2022-07-26 10:34:18 +01:00
Andy Wilkinson 0980362a88 Merge branch '2.7.x'
Closes gh-31843
2022-07-22 12:20:17 +01:00
Andy Wilkinson 64dcfe520d Merge branch '2.6.x' into 2.7.x
Closes gh-31842
2022-07-22 12:15:39 +01:00
Andy Wilkinson a1443d1cdc Enforce ordering in additional-spring-configuration-metadata.json files
Closes gh-31575
2022-07-22 12:09:58 +01:00
Andy Wilkinson 3405a54f9e Exclude Jetty toolchain dependencies in favor of official API artifacts
Closes gh-31720
2022-07-14 13:55:26 +01:00
Andy Wilkinson 631b1e0d76 Merge branch '2.7.x'
Closes gh-31526
2022-06-24 13:10:10 +01:00
Andy Wilkinson 1e08f545d0 Merge branch '2.6.x' into 2.7.x
Closes gh-31525
2022-06-24 13:05:06 +01:00
Andy Wilkinson f49b16c645 Upgrade to Spring Java Format 0.0.34
Closes gh-31524
2022-06-24 12:57:52 +01:00
Andy Wilkinson 0bc514593f Polish "Use pattern matching for instanceof where appropriate"
See gh-31475
2022-06-20 17:55:51 +01:00
dreis2211 5db04da275 Use pattern matching for instanceof where appropriate
See gh-31475
2022-06-20 17:55:36 +01:00
dreis2211 fb45fc4819 Use Files.writeString() and Files.readString() where possible
See gh-31459
2022-06-20 09:05:09 +02:00
Andy Wilkinson fabe0637cd Raise the minimum supported version of Kotlin to 1.7
Closes gh-31391
2022-06-15 10:53:26 +01:00
Andy Wilkinson 0c0d3f27c4 Merge branch '2.7.x'
Closes gh-31389
2022-06-14 20:10:14 +01:00
Andy Wilkinson 88128ccc97 Merge branch '2.6.x' into 2.7.x
Closes gh-31388
2022-06-14 20:09:30 +01:00
Andy Wilkinson 5a028e059c Align buildSrc's Kotlin version with the main build
Closes gh-31387
2022-06-14 20:09:14 +01:00
Andy Wilkinson 228be786ca Polish 2022-06-10 13:44:21 +01:00
Andy Wilkinson 4bb5ba2bd0 Merge branch '2.7.x' 2022-05-26 18:26:52 +01:00
Andy Wilkinson 935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson 3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson 5dfa5adb75 Merge branch '2.7.x'
Closes gh-31178
2022-05-26 15:54:58 +01:00
Andy Wilkinson 455ee0ce22 Merge branch '2.6.x' into 2.7.x
Closes gh-31177
2022-05-26 15:53:38 +01:00
Andy Wilkinson ee45fd2fc8 Remove redundant throws declarations from internal APIs
Closes gh-31176
2022-05-26 15:47:35 +01:00
Andy Wilkinson 003f747e77 Merge branch '2.7.x'
Closes gh-31170
2022-05-26 13:52:41 +01:00
Andy Wilkinson e617035dba Merge branch '2.6.x' into 2.7.x
Closes gh-31167
2022-05-26 13:45:52 +01:00
Andy Wilkinson 3e7bd582a3 Upgrade to Spring Java Format 0.0.33
Closes gh-31166
2022-05-26 13:22:23 +01:00
Phillip Webb 06f8041e4d Merge branch '2.7.x' 2022-05-17 21:50:42 -07:00
Phillip Webb d5d5997be7 Merge branch '2.6.x' into 2.7.x 2022-05-17 21:49:20 -07:00
Phillip Webb 99f5c781a5 Merge branch '2.5.x' into 2.6.x 2022-05-17 21:48:50 -07:00
Phillip Webb 350d27fe50 Polish code to use method references when possible 2022-05-17 21:16:42 -07:00
Andy Wilkinson 395cfd068b Merge branch '2.7.x' 2022-05-16 11:35:29 +01:00
Andy Wilkinson 9fcb5749ba Merge branch '2.6.x' into 2.7.x 2022-05-16 11:34:54 +01:00
Andy Wilkinson 195b12e1ea Merge branch '2.5.x' 2022-05-16 11:34:37 +01:00
Andy Wilkinson ac65d35f75 Improve diagnostics for 403 response to upgrade issue creation
See gh-30304
2022-05-16 11:26:10 +01:00
Andy Wilkinson 48c948973d Polish 2022-05-12 12:12:22 +01:00
Andy Wilkinson d0e55643b1 Polish
Closes gh-30993
2022-05-12 12:11:51 +01:00
Andy Wilkinson 1fd9c4d82c Polish
Closes gh-30992
2022-05-12 12:10:52 +01:00
izeye 624c41c80e Polish
See gh-30862
2022-05-12 12:07:12 +01:00
Andy Wilkinson 9711160190 Merge branch '2.7.x' 2022-05-12 11:07:44 +01:00
Andy Wilkinson dacfae2d59 Merge branch '2.6.x' into 2.7.x
Closes gh-30991
2022-05-12 11:07:29 +01:00
Andy Wilkinson 075d01db54 Merge branch '2.5.x' into 2.6.x
Closes gh-30990
2022-05-12 11:07:13 +01:00
Andy Wilkinson d5f4323f53 Upgrade to Test Retry Gradle Plugin 1.4.0
Closes gh-30989
2022-05-12 11:06:16 +01:00
Andy Wilkinson 61995d762f Merge branch '2.7.x' 2022-04-29 11:02:30 +01:00
Andy Wilkinson fb121a1d40 Merge branch '2.6.x' into 2.7.x
Closes gh-30836
2022-04-29 11:01:55 +01:00
Andy Wilkinson de1cda786e Merge branch '2.5.x' into 2.6.x
Closes gh-30835
2022-04-29 11:01:37 +01:00
Andy Wilkinson d338df513a Avoid stale inputs by using sync rather than copy
Closes gh-30829
2022-04-29 11:00:25 +01:00
Phillip Webb c7374fd415 Update copyright year of changed files 2022-04-20 15:30:20 -07:00
Stephane Nicoll a4cccc98c6 Merge branch '2.7.x' 2022-04-19 09:37:08 +02:00
izeye ed412af138 Polish
See gh-30695
2022-04-19 09:34:28 +02:00
Andy Wilkinson dd812a3f76 Upgrade to Groovy 4.0.1
Closes gh-30279
2022-03-18 12:38:41 +00:00
Andy Wilkinson 5736f5401b Merge branch '2.7.x' 2022-03-11 08:23:27 +00:00
Andy Wilkinson c0a72bf5ea Merge branch '2.6.x' into 2.7.x
Closes gh-30167
2022-03-11 08:21:13 +00:00
Andy Wilkinson 4c1d1a6a69 Merge branch '2.5.x' into 2.6.x
Closes gh-30166
2022-03-11 08:17:59 +00:00
Andy Wilkinson cced7edd9c Document Devtools' property defaults directly in reference docs
Closes gh-29406
2022-03-11 08:15:40 +00:00
Andy Wilkinson b3588cf8c3 Merge branch '2.7.x' 2022-03-09 15:51:33 +00:00
Andy Wilkinson 3c80049ccc Merge branch '2.6.x' into 2.7.x
Closes gh-30138
2022-03-09 15:51:12 +00:00
Andy Wilkinson a31135ebfc Merge branch '2.5.x' into 2.6.x
Closes gh-30137
2022-03-09 15:50:56 +00:00
Andy Wilkinson 0e627b00b3 Remove --illegal-access=warn from toolchain configuration
As of Java 17, it is ignored. Our Toolchain-based builds use at least
Java 17 so specifying it no longer has any effect.

Closes gh-30122
2022-03-09 15:49:18 +00:00
Andy Wilkinson 573934d545 Only treat warnings as errors when compiling with Java 17 2022-03-09 14:24:30 +00:00
Stephane Nicoll 0a81c238c2 Compile Kotlin code with a JVM target of 17
Closes gh-29956
2022-03-08 12:43:54 +01:00
Stephane Nicoll 099e811a38 Raise the minimum supported version of Kotlin to 1.6
Closes gh-29660
2022-03-08 12:42:31 +01:00
Andy Wilkinson 1547bad452 Merge branch '2.7.x' 2022-03-02 11:07:40 +00:00
Andy Wilkinson 1f8c5942cf Merge branch '2.6.x' into 2.7.x
Closes gh-30030
2022-03-02 11:07:27 +00:00
Andy Wilkinson 4ac884ee2d Merge branch '2.5.x' into 2.6.x
Closes gh-30029
2022-03-02 10:28:50 +00:00
Andy Wilkinson 69ce392c34 Add support for classifiers when defining a bom
Closes gh-29298
2022-03-02 10:17:45 +00:00
Phillip Webb 5454e2e26a Merge branch '2.7.x' 2022-02-23 23:02:59 -08:00
Phillip Webb 9f00c3acf5 Polish 2022-02-23 21:44:43 -08:00
Andy Wilkinson 132bf686f8 Merge branch '2.7.x' 2022-02-22 20:13:28 +00:00
Andy Wilkinson 2d9177dd9d Merge branch '2.6.x' into 2.7.x
Closes gh-29955
2022-02-22 20:11:47 +00:00
Andy Wilkinson 3614c8d1f8 Merge branch '2.5.x' into 2.6.x
Closes gh-29954
2022-02-22 20:08:31 +00:00
Andy Wilkinson 1e8d29f7aa Configure Kotlin compilation JVM target by convention
Closes gh-29952
2022-02-22 18:11:51 +00:00
Andy Wilkinson 834f07083d Merge branch '2.7.x' 2022-02-21 14:24:34 +00:00
Andy Wilkinson 43c339824c Merge branch '2.6.x' into 2.7.x
Closes gh-29924
2022-02-21 14:24:23 +00:00
Andy Wilkinson 30fcc195b4 Merge branch '2.5.x' into 2.6.x
Closes gh-29923
2022-02-21 14:24:00 +00:00
Andy Wilkinson 4cb8ae6c8a Try to avoid hitting secondary rate limit when opening issues
GitHub employs a secondary rate limit for actions that can trigger
notifications, such as opening a new issue. To avoid hitting this
limit, they recommend [1] waiting at least one second between each
request.

This commit attempts to comply with this guidance by adding a
one-second sleep prior to each POST request that opens an issue.

Closes gh-29879

[1] https://docs.github.com/en/rest/guides/best-practices-for-integrators#dealing-with-secondary-rate-limits
2022-02-21 14:19:08 +00:00
Andy Wilkinson 1940f7a5d9 Merge branch '2.7.x' 2022-02-21 14:04:54 +00:00
Andy Wilkinson 6493c7c561 Merge branch '2.6.x' into 2.7.x
Closes gh-29922
2022-02-21 14:01:58 +00:00
Andy Wilkinson fcd52c02a7 Merge branch '2.5.x' into 2.6.x
Closes gh-29921
2022-02-21 14:01:47 +00:00
Andy Wilkinson 55f68989d8 Remove redundant action to make plugins dat file reproducible
Closes gh-29917
2022-02-21 14:01:04 +00:00
Moritz Halbritter d42f675959 Merge branch '2.7.x' 2022-02-21 10:36:05 +01:00
Moritz Halbritter d7b229d3c7 Rename AutoConfigurationLoader to ImportCandidates
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports

See gh-29872
2022-02-21 10:34:38 +01:00
Andy Wilkinson 8209980ca0 Merge branch '2.7.x' 2022-02-18 19:02:54 +00:00
Andy Wilkinson 027093d852 Use a templated source file for SpringBootVersion
Closes gh-29670
2022-02-18 18:08:09 +00:00
Moritz Halbritter 829ff4d03f Merge branch '2.7.x' 2022-02-18 14:49:24 +01:00
Moritz Halbritter 2afa02c856 Fix missing test slice configuration
Test slices are now longer registered in spring.factories, but
TestSliceMetadata still looked there for them to generate documentation.
Fixed this so that TestSliceMetadata now looks in the right places for
test slices.

See gh-29873
2022-02-18 14:49:07 +01:00
Moritz Halbritter 303979fb65 Merge branch '2.7.x' 2022-02-17 09:17:35 +01:00
Moritz Halbritter 7d68b58c8f Load auto-configurations from META-INF/spring-boot
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.

Adapts the AutoConfigurationImportSelector to use the new loader.

Adapts the ImportAutoConfigurationImportSelector to use the new loader.

Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.

Updates the documentation for auto-configurations and test slices.

Closes gh-29872
2022-02-17 09:17:23 +01:00
Phillip Webb f4b849ec95 Merge branch '2.7.x' 2022-02-16 20:27:18 -08:00
Phillip Webb 26512f8ac6 Merge branch '2.6.x' into 2.7.x 2022-02-16 20:24:59 -08:00
Phillip Webb 5b4ec32645 Merge branch '2.5.x' into 2.6.x 2022-02-16 18:56:12 -08:00
Phillip Webb c86b1330cf Update copyright year of changed files 2022-02-16 17:56:19 -08:00
Scott Frederick 79e5d3a2d0 Merge branch '2.7.x' into main 2022-02-11 14:45:00 -06:00
Scott Frederick f80490bafb Precompute Spring Boot version at build time
Closes gh-29670
2022-02-11 14:44:28 -06:00
Andy Wilkinson 3b5e7ee0a8 Merge branch '2.7.x' 2022-02-09 12:19:21 +00:00
Andy Wilkinson 7e8d499333 Merge branch '2.6.x' into 2.7.x
Closes gh-29690
2022-02-09 12:18:57 +00:00
Andy Wilkinson 093e8a524d Merge branch '2.5.x' into 2.6.x
Closes gh-29689
2022-02-09 12:18:35 +00:00
Moritz Halbritter 52d9ba58d8 Move appendix subsections under appendix section
This involved a small code change to the generated configuration
properties snippets. The section id has to start with
'appendix.', otherwise the section-id asciidoctor extension
complains. To ensure that the anchors that are derived from the
section IDs remain backwards compatible, the anchor-rewrite
properties have been updated.

See gh-29667
2022-02-09 12:04:05 +00:00
Andy Wilkinson 977a0a8356 Merge branch '2.7.x' 2022-02-05 10:07:41 +00:00
Andy Wilkinson 2fec7b8562 Only use Kotlin 1.6 API and language versions in docs project
To preserve our existing Kotlin 1.3 baseline, we should compile our
Kotlin code with Kotlin 1.3 API and language versions. At the same
time, we want our documentation to use modern Kotlin. This commit
restores the 1.3 convention and overrides it to 1.6 in the docs
project. This maintains our Kotlin 1.3 baseline while also allowing
the Kotlin code examples to use 1.6 API and language features.

Closes gh-29654
2022-02-05 09:54:00 +00:00
Phillip Webb a6b7ae2110 Merge branch '2.7.x' 2022-02-04 19:45:01 -08:00
Phillip Webb 71695d2162 Merge branch '2.6.x' into 2.7.x
Closes gh-29658
2022-02-04 19:44:31 -08:00
Phillip Webb 05c58a18df Merge branch '2.5.x' into 2.6.x
Closes gh-29657
2022-02-04 19:44:05 -08:00
Phillip Webb 12a33a2eaf Upgrade to spring-asciidoctor-backends 0.0.3
Closes gh-29656
2022-02-04 19:43:47 -08:00
Phillip Webb 50047e6d8c Merge branch '2.7.x' 2022-02-04 16:10:50 -08:00
Phillip Webb 6c74e24147 Update copyright year of changed files 2022-02-04 16:09:35 -08:00
Phillip Webb 8ed5d15cd3 Merge branch '2.7.x' 2022-02-04 16:08:29 -08:00
Phillip Webb d33d92dfce Polish KotlinConventions 2022-02-04 16:08:08 -08:00
Phillip Webb f8c2bff825 Use Kotlin 1.6 for API and language version
Closes gh-29654
2022-02-04 16:07:37 -08:00
Phillip Webb a726210afc Merge branch '2.7.x' 2022-02-02 19:05:39 -08:00
Phillip Webb 546cad06db Merge branch '2.6.x' into 2.7.x
Closes gh-29635
2022-02-02 19:01:29 -08:00
Phillip Webb c01cee18b5 Merge branch '2.5.x' into 2.6.x
Closes gh-29634
2022-02-02 19:01:09 -08:00
Phillip Webb 79fc77fade Upgrade to spring-javaformat 0.0.31
Closes gh-29633
2022-02-02 19:00:28 -08:00
Andy Wilkinson f2ac7d10ef Merge branch '2.7.x' 2022-01-25 12:19:51 +00:00
Andy Wilkinson 8480abca20 Merge branch '2.6.x' into 2.7.x
Closes gh-29561
2022-01-25 12:19:37 +00:00
Andy Wilkinson fe43d527b5 Merge branch '2.5.x' into 2.6.x
Closes gh-29560
2022-01-25 12:19:16 +00:00
Andy Wilkinson 3ed65f2383 Avoid running Maven plugin ITs for each s-b-dependencies change
Closes gh-28781
2022-01-25 12:11:19 +00:00
Andy Wilkinson b8983cef59 Merge branch '2.7.x' 2022-01-24 15:11:51 +00:00
Andy Wilkinson cd426fd21e Merge branch '2.6.x' into 2.7.x
Closes gh-29547
2022-01-24 15:10:28 +00:00
Andy Wilkinson 75c3bff765 Merge branch '2.5.x' into 2.6.x
Closes gh-29546
2022-01-24 15:10:08 +00:00
Andy Wilkinson 761bed6c48 Upgrade buildSrc to Spring Framework 5.3.15
Closes gh-29545
2022-01-24 14:19:47 +00:00
Phillip Webb fb83e6930d Merge branch '2.7.x' 2022-01-19 13:35:20 -08:00
Phillip Webb b31e9d6b4a Merge branch '2.6.x' into 2.7.x
Closes gh-29492
2022-01-19 13:35:07 -08:00
Phillip Webb 1f61c36f7a Merge branch '2.5.x' into 2.6.x
Closes gh-29491
2022-01-19 13:33:36 -08:00
Andy Wilkinson 66428527e0 Minimize tasks run in ConventionsPluginTests
Update `ConventionsPluginTests` so that dependency resolution is
not required. This provides a work-around for our currently failing
Windows build.

Closes gh-29490
2022-01-19 13:31:40 -08:00
Andy Wilkinson 12cd97a20c Reinstate support for Thymeleaf 2022-01-18 16:01:29 +00:00
Stephane Nicoll 119b920969 Merge branch '2.7.x' 2022-01-02 11:30:28 +01:00
Stephane Nicoll f3d99f9ccc Merge branch '2.6.x' into 2.7.x 2022-01-02 11:30:22 +01:00
Stephane Nicoll 01c19ef444 Merge branch '2.5.x' into 2.6.x 2022-01-02 11:30:11 +01:00
Stephane Nicoll a0537888f5 Upgrade build to Log4j 2.17.1 2022-01-02 11:29:56 +01:00
Stephane Nicoll 3ef03cddb9 Merge branch '2.7.x' 2022-01-02 11:26:04 +01:00
Stephane Nicoll 9c868751d6 Merge branch '2.6.x' into 2.7.x
Closes gh-29199
2022-01-02 11:25:56 +01:00
Stephane Nicoll f54ea67ed6 Merge branch '2.5.x' into 2.6.x
Closes gh-29198
2022-01-02 11:25:46 +01:00
dreis2211 7a87d18b12 Update copyrights to 2022
See gh-29195
2022-01-02 11:24:58 +01:00
Brian Clozel f61c87c3a7 Revert "Merge branch '2.7.x'"
This reverts commit f0677a119c, reversing
changes made to 938d58f32c.
2021-12-21 09:05:06 +01:00
Brian Clozel f0677a119c Merge branch '2.7.x' 2021-12-21 09:04:10 +01:00
Brian Clozel de808834f5 Auto-configure Spring GraphQL base infrastructure
This commit adds the auto-configuration for setting up the base Spring
GraphQL infrastructure. Because GraphQL doesn't depend on any particular
transport, we must have a separate configuration for creating:

* the `GraphQlSource`, which holds the schema and the `GraphQL` instance
* the `GraphQlService` for executing incoming requests
* the `BatchLoaderRegistry` for batch loading support
* the `AnnotatedControllerConfigurer` for supporting the annotated
  controllers programming model

This comes with a starting point for the `"spring.graphql.*"`
configuration properties; we can now configure the locations and file
extensions of GraphQL schema files we should load and configure at
startup.

See gh-29140
2021-12-21 08:32:37 +01:00
Madhura Bhave 34f96514ad Fix link to source code in snapshot documentation
Fixes gh-28856
2021-12-20 10:49:07 -08:00
Stephane Nicoll e994ee3be5 Merge branch '2.7.x'
See gh-28986
2021-12-18 17:54:06 +01:00
Stephane Nicoll 821f7086d9 Merge branch '2.6.x' into 2.7.x
See gh-28985
2021-12-18 17:53:59 +01:00
Stephane Nicoll e048562c34 Merge branch '2.5.x' into 2.6.x
See gh-28984
2021-12-18 17:53:39 +01:00
Stephane Nicoll 21e54a595e Upgrade Build to Log4j 2.17.0
See gh-28983
2021-12-18 17:53:30 +01:00
Phillip Webb 003fb229fd Merge branch '2.7.x' 2021-12-16 13:07:22 -08:00
Phillip Webb f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08:00
Scott Frederick 07243539bd Remove unused import
See gh-29029
2021-12-15 14:30:12 -06:00
Scott Frederick caf49783d4 Merge branch '2.7.x' 2021-12-15 14:06:55 -06:00
Scott Frederick a773af0387 Merge branch '2.6.x' into 2.7.x
Closes gh-29073
2021-12-15 14:05:31 -06:00
Scott Frederick 9e6709eda0 Enable caching for system tests in CI
Setting the `systemTest` Gradle task output as never up-to-date ensures
that all system tests are executed each time they are run in CI. The
`--rerun-tasks` Gradle option that was used previously had the same
effect but also disabled build caching.

Closes gh-29029
2021-12-15 14:04:17 -06:00
Stephane Nicoll 1c72330bd9 Upgrade to Log4j2 2.16.0
Closes gh-28986
2021-12-15 09:31:43 +01:00
Stephane Nicoll 894eb83e66 Upgrade to Log4j2 2.16.0
Closes gh-28985
2021-12-15 09:31:04 +01:00
Stephane Nicoll 15ade0b5d3 Upgrade to Log4j2 2.16.0
Closes gh-28984
2021-12-15 09:30:10 +01:00
Stephane Nicoll 4c57d1717d Upgrade to Log4j2 2.16.0
Closes gh-28983
2021-12-15 09:28:44 +01:00
Stephane Nicoll 9f07bb50b2 Merge branch '2.7.x' 2021-12-14 09:50:51 +01:00
Stephane Nicoll 0c1a8c2c5e Merge branch '2.6.x' into 2.7.x
Closes gh-29009
2021-12-14 09:50:41 +01:00
Stephane Nicoll 91593eeea3 Merge branch '2.5.x' into 2.6.x
Closes gh-29008
2021-12-14 09:50:30 +01:00
Arun Suresh 43f3d0dea0 Upgrade Build to Log4j 2.15.0
See gh-29006
2021-12-14 09:42:46 +01:00
Andy Wilkinson 91faec3917 Merge branch '2.7.x' 2021-12-01 12:17:34 +00:00
Andy Wilkinson 51e0fc4b6b Merge branch '2.6.x' into 2.7.x
See gh-28879
2021-12-01 12:17:10 +00:00
Andy Wilkinson f0f0aa5c46 Merge branch '2.5.x' into 2.6.x
See gh-28878
2021-12-01 12:16:37 +00:00
Andy Wilkinson 8322dda8cc Fix variant selection in spring-boot-maven-plugin
See gh-28877
2021-12-01 12:16:14 +00:00
Andy Wilkinson 95025d442f Merge branch '2.7.x' 2021-12-01 11:21:54 +00:00
Andy Wilkinson bad05a7860 Merge branch '2.6.x' into 2.7.x
Closes gh-28879
2021-12-01 11:21:24 +00:00
Andy Wilkinson c7c7592899 Merge branch '2.5.x' into 2.6.x
Closes gh-28878
2021-12-01 11:21:04 +00:00
Andy Wilkinson 25bdc097a0 Make poms of all dependencies available in int test repo
Closes gh-28877
2021-12-01 11:20:21 +00:00
Andy Wilkinson 87a5b72aa5 Merge branch '2.7.x' 2021-11-30 19:27:53 +00:00
Andy Wilkinson f3957b7639 Merge branch '2.6.x' into 2.7.x
Closes gh-28865
2021-11-30 19:27:11 +00:00
Andy Wilkinson 9d4375bc12 Merge branch '2.5.x' into 2.6.x
Closes gh-28864
2021-11-30 19:26:22 +00:00
Andy Wilkinson 572bd6ca5c Upgrade to test-retry-gradle-plugin 1.3.1
Closes gh-28863
2021-11-30 19:26:09 +00:00
Scott Frederick 015dca1956 Remove support for Thymeleaf
Closes gh-28611
2021-11-30 15:55:47 +00:00
Andy Wilkinson 8bf2ffd93c Drop support for Jersey until jersey-spring6 is available
Closes gh-28808
2021-11-30 15:39:39 +00:00
Andy Wilkinson 900085628a Raise the minimum supported version of Java to 17
Closes gh-28101
2021-11-30 15:37:40 +00:00
Andy Wilkinson 814c86c5e8 Raise the minimum supported version of Gradle to 7.3
Closes gh-28100
2021-11-30 15:36:54 +00:00
Andy Wilkinson 75c117a33f Prepare 2.7.x branch 2021-11-30 15:02:11 +00:00
Andy Wilkinson 354a18c9a6 Prepare 2.6.x branch 2021-11-30 10:36:19 +00:00
Phillip Webb beb68671bb Update copyright year of changed files 2021-11-24 10:23:32 -08:00
Andy Wilkinson 381c094c41 Merge branch '2.5.x' 2021-11-19 13:39:37 +00:00
Andy Wilkinson 8f0e12dc34 Revert accidentally committed changes
This partially reverts commit c083e0b049.
2021-11-19 13:39:22 +00:00
Andy Wilkinson c0d90dfa8f Merge branch '2.5.x'
Closes gh-28749
2021-11-19 13:36:01 +00:00
Andy Wilkinson c083e0b049 Avoid using temp before @TempDir has initialized it
Closes gh-28748
2021-11-19 13:35:30 +00:00
Andy Wilkinson 00fa0fb769 Merge branch '2.5.x'
Closes gh-28746
2021-11-19 10:19:14 +00:00
Andy Wilkinson f2b959b0a5 Add <type>zip</type> to Elasticsearch dist in dependencies bom
Fixes gh-28725
2021-11-19 10:13:14 +00:00
Andy Wilkinson 2a342ef416 Merge branch '2.5.x'
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
2021-11-12 20:04:35 +00:00
Andy Wilkinson 51dc02e37b Merge branch '2.5.x'
See gh-28485
2021-10-29 17:18:52 +01:00
Andy Wilkinson 28d323ee3a Merge branch '2.4.x' into 2.5.x
See gh-28484
2021-10-29 17:18:30 +01:00
Andy Wilkinson b9e3660833 Revert running tests in parallel
See gh-19876
2021-10-29 17:18:13 +01:00
Andy Wilkinson c7a2d61aee Merge branch '2.4.x'
Closes gh-28485
2021-10-29 13:48:36 +01:00
Andy Wilkinson 7fe6f4887c Merge branch '2.4.x' into 2.5.x
Closes gh-28484
2021-10-29 13:48:23 +01:00
Andy Wilkinson 22d85e6d7b Allow tests to be run in parallel across multiple workers
Closes gh-19876
2021-10-29 12:48:45 +01:00
Phillip Webb 66aa713b85 Merge branch '2.5.x' 2021-10-14 17:41:06 -07:00
Phillip Webb 467e063d4b Merge branch '2.4.x' into 2.5.x 2021-10-14 17:40:47 -07:00
Phillip Webb 8e704aab48 Restore 'javax.xml.bind:jaxb-api' exclusion
Restore the 'javax.xml.bind:jaxb-api' exclusion from `xmlunit-core`
which is actually required when using Maven on Java 9+.

The `CheckClasspathForUnnecessaryExclusions` cannot deal with profile
specific dependencies so an exception has been hard coded.

See gh-28332
2021-10-14 17:38:05 -07:00
Phillip Webb e95b0b5257 Polish 2021-10-14 17:37:48 -07:00
Andy Wilkinson 37a7144426 Merge branch '2.5.x'
Closes gh-28343
2021-10-14 14:26:57 +01:00
Andy Wilkinson 1a30c660f3 Merge branch '2.4.x' into 2.5.x
Closes gh-28342
2021-10-14 14:22:25 +01:00
Andy Wilkinson adb9226dec Prohibit org.apache.geronimo.specs dependencies in our starters
Closes gh-28338
2021-10-14 14:19:21 +01:00
Andy Wilkinson 2d837a6eae Merge branch '2.5.x'
Closes gh-28337
2021-10-14 13:48:08 +01:00
Andy Wilkinson 3800f060b5 Merge branch '2.4.x' into 2.5.x
Closes gh-28336
2021-10-14 13:42:54 +01:00
Andy Wilkinson 2fb8c8d27e Check starters for unnecessary exclusions
Closes gh-28332
2021-10-14 13:37:53 +01:00
Andy Wilkinson 191b50241d Merge branch '2.5.x'
Closes gh-28331
2021-10-14 10:13:37 +01:00
Andy Wilkinson d3037103fe Merge branch '2.4.x' into 2.5.x
Closes gh-28330
2021-10-14 10:13:24 +01:00
Andy Wilkinson 9f13941c2f Prohibit org.jboss.spec.* dependencies
Closes gh-28329
2021-10-14 10:09:30 +01:00
Phillip Webb 2034ad4827 Merge branch '2.5.x' 2021-10-13 18:48:18 -07:00
Phillip Webb 02b577390f Merge branch '2.4.x' into 2.5.x 2021-10-13 18:47:51 -07:00
Phillip Webb 0561992c2a Update copyright year of changed files 2021-10-13 18:45:38 -07:00
Andy Wilkinson 1a505964ee Merge branch '2.5.x'
Closes gh-28207
2021-10-06 10:03:24 +01:00
Andy Wilkinson 1931104d13 Merge branch '2.4.x' into 2.5.x
Closes gh-28206
2021-10-06 09:57:19 +01:00
Andy Wilkinson 9c9fbf400e Upgrade to Spring Java Format 0.0.29
Closes gh-28205
2021-10-06 09:52:45 +01:00
Andy Wilkinson 0b58d4858d Merge branch '2.5.x'
Closes gh-28200
2021-10-05 11:13:20 +01:00
Andy Wilkinson 322615d9c5 Merge branch '2.4.x' into 2.5.x
Closes gh-28199
2021-10-05 11:12:48 +01:00
Andy Wilkinson 8c3820f87e Fix up-to-date checking of syncAppSource tasks
Previously, the project version was used while filtering the apps
source during syncing but it was not considered as an input to
the task. This could result in the syncing being skipped even though
the project's version had changed.

This commit introduces a new custom task to make the configuration
more declarative and to allow the necessary input configuration to be
done in a single place.

Closes gh-28197
2021-10-05 11:08:22 +01:00
Andy Wilkinson ea68672594 Merge branch '2.5.x'
Closes gh-28153
2021-09-30 17:06:09 +01:00
Andy Wilkinson 9e484e2cdc Merge branch '2.4.x' into 2.5.x
Closes gh-28152
2021-09-30 17:05:39 +01:00
Andy Wilkinson 3824512357 Tighten up build's task interdependencies
Closes gh-28103
2021-09-30 15:35:39 +01:00
dreis2211 cf0fcafd13 Polish
See gh-27940
2021-09-21 08:08:29 +02:00
Andy Wilkinson 7c034c33e2 Merge branch '2.5.x'
Closes gh-27967
2021-09-13 10:48:19 +01:00
Andy Wilkinson f530819d68 Merge branch '2.4.x' into 2.5.x
Closes gh-27966
2021-09-13 10:47:47 +01:00
Andy Wilkinson 273600bcdd Retain distinction between compile and runtime deps of optional deps
Previously, the optional configuration was added to the compile and
runtime classpaths of each source set and the the javadoc classpath
as well. This had a few disadvantages, the most notable of which is
that it meant that the configuration was ifrst resolved and then
the outcome of the resolution was added to the compile and runtime
classpaths. As a result, none of the attributes on the compile and
runtime classpaths were considered to influence variant selection.

This commit reworks the optional dependencies plugin so that the
compile and runtime classpaths of each source set are now configured
to extend from the optional configuration. This allows each
classpath configuration's attributes to influence the dependencies
that are selected from the optional configuration during resolution.
For example, when resolving the compile classpath, compile
dependencies (Usage.JAVA_API) will be selected and when resolving the
runtime classpath, runtime dependencies (Usage.JAVA_RUNTIME) will be
selected.

The above-described change means that runtime dependencies of an
optional dependencies will no longer leak into the compile classpath.
As a result of this, our Gradle plugin's test infrastructure has
been updated so that it no longer references runtime dependencies of
the Kotlin Gradle plugin at compile time.

Closes gh-27965
2021-09-13 10:47:14 +01:00
Andy Wilkinson 69d4e273d3 Merge branch '2.5.x'
Closes gh-27787
2021-08-20 13:56:09 +01:00
Andy Wilkinson 3566e5881b Merge branch '2.4.x' into 2.5.x
Closes gh-27786
2021-08-20 13:54:02 +01:00
Andy Wilkinson 9f402f0428 Use snapshot rather than libs-snapshot when generating effective bom
Closes gh-27785
2021-08-20 13:53:34 +01:00
Andy Wilkinson fd2fbcb3c6 Merge branch '2.5.x'
Closes gh-27758
2021-08-18 18:28:34 +01:00
Andy Wilkinson 6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x
Closes gh-27757
2021-08-18 17:56:32 +01:00
Andy Wilkinson ffbd28b60a Polish "Polish access modifiers for test classes"
See gh-27736
2021-08-18 17:52:42 +01:00
izeye 8a425dedfd Polish access modifiers for test classes
See gh-27736
2021-08-18 17:38:40 +01:00
Andy Wilkinson 2dfdcf5e88 Merge branch '2.5.x'
Closes gh-27754
2021-08-18 13:52:23 +01:00
Andy Wilkinson 0d904b8868 Merge branch '2.4.x' into 2.5.x
Closes gh-27753
2021-08-18 13:51:49 +01:00
Andy Wilkinson 0b7994a679 Polish "Use 2012 for copyright beginning year"
See gh-27734
2021-08-18 13:48:29 +01:00
izeye 07da144826 Use 2012 for copyright beginning year
See gh-27734
2021-08-18 13:46:35 +01:00
Andy Wilkinson 44884cc495 Merge branch '2.5.x'
Closes gh-27752
2021-08-18 13:00:32 +01:00
Andy Wilkinson 10ceb504ae Merge branch '2.4.x' into 2.5.x
Closes gh-27751
2021-08-18 13:00:19 +01:00
Andy Wilkinson 32c184e31c Revert changes made to work around JDK-8156584
Closes gh-26848
2021-08-18 13:00:11 +01:00
Andy Wilkinson af13125796 Merge branch '2.5.x'
Closes gh-27498
2021-07-26 15:37:03 +01:00
Andy Wilkinson 9127588082 Merge branch '2.4.x' into 2.5.x
Closes gh-27497
2021-07-26 15:36:52 +01:00
Andy Wilkinson ea6cb74ccf Ignore Spring Boot when finding dependency upgrades
Closes gh-27447
2021-07-26 15:36:08 +01:00
Andy Wilkinson a5ec7560f5 Merge branch '2.5.x'
Closes gh-27314
2021-07-13 17:42:54 +01:00
dreis2211 e4978f604c Fix JDK 16 pipeline
See gh-27310
2021-07-13 17:42:20 +01:00
Andy Wilkinson 9ccd6a6f2f Merge branch '2.5.x'
Closes gh-27307
2021-07-13 15:56:32 +01:00
Andy Wilkinson 705feeed6a Polish "Allow additional JVM args when running tests via toolchain"
See gh-27089
2021-07-13 15:28:04 +01:00
dreis2211 01b0156fed Allow additional JVM args when running tests via toolchain
See gh-27089
2021-07-13 15:24:45 +01:00
Scott Frederick 18c7c0af22 Add Paketo image building system tests
A new system test plugin is being made available for running test
suites that should be run less frequently than with every commit, such
as tests that verify Spring Boot compatibility with external
projects. CI pipeline configuration for running system tests is also
provided.

The first system tests verify the behavior of the Spring Boot image
building plugins when building images using Paketo buildpacks.

Closes gh-25824
2021-07-08 17:02:43 -05:00
Andy Wilkinson fcf7240f3c Merge branch '2.5.x'
See gh-27047
2021-06-24 10:03:44 +01:00
Andy Wilkinson f7140d0401 Merge branch '2.4.x' into 2.5.x
See gh-27045
2021-06-24 10:03:17 +01:00
Andy Wilkinson 316d2cce89 Don't offer upgrade for version that is already aligned
See gh-27044
2021-06-24 10:02:14 +01:00
Phillip Webb 6102f10639 Merge branch '2.5.x' 2021-06-23 21:02:36 -07:00
Phillip Webb 2c518f1dff Merge branch '2.4.x' into 2.5.x 2021-06-23 21:02:05 -07:00
Phillip Webb a76e5c043e Update copyright year of changed files 2021-06-23 21:01:45 -07:00
Andy Wilkinson aa3d72cb05 Merge branch '2.5.x'
See gh-27047
2021-06-23 19:52:04 +01:00
Andy Wilkinson 5139c79c4f Merge branch '2.4.x' into 2.5.x
See gh-27045
2021-06-23 19:51:40 +01:00
Andy Wilkinson 4d694ddaa8 Fix bom plugin management versions
See gh-27044
2021-06-23 19:50:06 +01:00
Andy Wilkinson 5d6a612b4b Merge branch '2.5.x'
Closes gh-27047
2021-06-23 17:39:06 +01:00
Andy Wilkinson ec2a7b9a5b Merge branch '2.4.x' into 2.5.x
Closes gh-27045
2021-06-23 17:10:50 +01:00
Andy Wilkinson 363de4cfa5 Add dependency lock and constraint version alignment to Bomr
Closes gh-27044
2021-06-23 17:09:24 +01:00
Andy Wilkinson 06778abb61 Merge branch '2.5.x'
See gh-26934
2021-06-16 20:37:21 +01:00
Andy Wilkinson 577c58b798 Merge branch '2.4.x' into 2.5.x
See gh-26933
2021-06-16 20:35:56 +01:00
Andy Wilkinson ac8c6a6fb7 Tune config of source and target compatilility with toolchain
See gh-26932
2021-06-16 20:33:17 +01:00
Andy Wilkinson 2106114f64 Merge branch '2.5.x'
Closes gh-26934
2021-06-16 19:57:00 +01:00
Andy Wilkinson 560d272db3 Merge branch '2.4.x' into 2.5.x
Closes gh-26933
2021-06-16 19:56:41 +01:00
Andy Wilkinson 6e43dd879b Allow Eclipse to properly detect source and target compatibility
Previously, our conventions configured the source and target
compatibility on the project's JavaCompile tasks. This causes the
settings to be missed when importing the projects into Eclipse [1].

This commit updates the conventions to set the source and target
compatibility on the project-wide JavaPluginExtension. This allows
the Eclipse import to correctly detect and honour the settings.

Closes gh-26932

[1] https://github.com/eclipse/buildship/issues/978
2021-06-16 19:56:20 +01:00
Andy Wilkinson 0f52bbc560 Stop using ConfigureUtil in BomExtension
While we're building with Gradle 6.9 at the moment and ConfigureUtil
has only been deprecated in Gradle 7.1, it doesn't do any harm to
stop using it now.

Closes gh-26928
2021-06-16 12:24:38 +01:00
Phillip Webb 28abcf88a0 Upgrade to spring-asciidoctor-backends 0.0.2
Closes gh-26846
2021-06-10 00:18:34 -07:00
Andy Wilkinson de410b7621 Merge branch '2.4.x'
Closes gh-26828
2021-06-09 18:01:32 +01:00
Andy Wilkinson a1c5fcca58 Move common Asciidoctor configuration into our conventions
Closes gh-26620
2021-06-09 18:00:45 +01:00
Phillip Webb f798f26596 Merge branch '2.4.x' 2021-06-08 18:05:50 -07:00
Phillip Webb 6424e3de12 Merge branch '2.4.x'
Closes gh-26671
2021-05-25 17:40:23 -07:00
Phillip Webb 14f578ed80 Merge branch '2.3.x' into 2.4.x
Closes gh-26670
2021-05-25 17:40:05 -07:00
Phillip Webb 39e3746cf6 Force Eclipse to use JavaSE-1.8 runtime
Add `EclipseConventions` to force the JavaSE-1.8 runtime to be applied
to the imported projects.

Closes gh-26669
2021-05-25 17:38:55 -07:00
Phillip Webb 60a8fae65c Upgrade to spring-asciidoctor-backends 0.0.1
Closes gh-26293
2021-05-19 22:40:24 -07:00
Phillip Webb f0896c2de6 Rework title anchors for maven docs
Closes gh-26617
2021-05-19 21:19:24 -07:00
Phillip Webb 34b288e5fe Add prefix to appendix property anchor links
Refactor property appendix generator code so that the complete section
is generated and anchors follow the expected naming.

Closes gh-26375
2021-05-18 21:19:24 -07:00
Andy Wilkinson a6dd97e40d Polish
See gh-26576
2021-05-17 15:43:34 +01:00
Andy Wilkinson 763e58e392 Merge branch '2.4.x'
Closes gh-26576
2021-05-17 15:10:38 +01:00
Andy Wilkinson ad5ba2e414 Compile Kotlin code will all warnings treated as errors
Closes gh-26083
2021-05-17 15:07:50 +01:00
Andy Wilkinson aaceb9565c Upgrade to Kotlin 1.5.0
Closes gh-26553
2021-05-17 13:39:56 +01:00
Andy Wilkinson f7d28567c0 Merge branch '2.4.x'
Closes gh-26520
2021-05-17 10:35:44 +01:00
dreis2211 6179b99710 Remove add-opens workaround in ToolchainPlugin
See gh-26465
2021-05-17 09:57:18 +01:00