Commit Graph

1331 Commits

Author SHA1 Message Date
Andy Wilkinson 51d15c7c78 Merge branch '3.3.x'
Closes gh-43649 in 3.4.x
Closes gh-43651
2025-01-02 12:22:59 +00:00
Andy Wilkinson d8a9ebd14b Upgrade to Gradle 8.12
Closes gh-43649
2025-01-02 12:05:14 +00:00
Andy Wilkinson 734040abe2 Update Gradle test scripts to avoid warnings with 8.12
Closes gh-43496
2025-01-02 12:05:14 +00:00
Phillip Webb 54b96c86ce Merge branch '3.3.x'
Closes gh-43526
2024-12-16 10:44:33 -08:00
Phillip Webb 239fa0356f Remove trailing slashes from all link URLs
Closes gh-43518
2024-12-16 10:44:20 -08:00
Stéphane Nicoll cc877987a4 Merge branch '3.3.x'
Closes gh-43519
2024-12-16 10:42:55 +01:00
Tran Ngoc Nhan 7832d3be73 Fix typo
See gh-43512
2024-12-16 10:42:22 +01:00
Andy Wilkinson 32433e84f3 Merge branch '3.3.x'
Closes gh-43270
2024-11-22 15:46:38 +00:00
Andy Wilkinson bb3651b7d1 Reduce warnings reported by Eclipse
Closes gh-43269
2024-11-22 15:39:35 +00:00
Moritz Halbritter 0d6bd6c152 Merge branch '3.3.x'
Closes gh-43141
2024-11-13 14:54:59 +01:00
Moritz Halbritter 6f52739c32 Merge branch '3.2.x' into 3.3.x
Closes gh-43140
2024-11-13 14:41:45 +01:00
Moritz Halbritter 3b0fec6d00 Upgrade build to Gradle 8.11
Closes gh-43136
2024-11-13 14:36:08 +01:00
Andy Wilkinson a3168e3a2f Centralize dependency management of Commons Compress
Closes gh-39368
2024-11-04 11:45:41 +00:00
Andy Wilkinson 4a9da78eb8 Merge branch '3.3.x'
Closes gh-42969
2024-11-01 14:32:51 +00:00
Andy Wilkinson f9281a61ff Rework Antora Gradle Infrastructure
Closes gh-40572

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-11-01 14:28:18 +00:00
Moritz Halbritter c018c43886 Merge branch '3.3.x'
Closes gh-42736
2024-10-17 13:44:25 +02:00
Moritz Halbritter 8efe6e02d9 Merge branch '3.2.x' into 3.3.x
Closes gh-42735
2024-10-17 13:38:03 +02:00
Moritz Halbritter a3060652f8 Call String.toLowerCase and .toUppercase with explicit locale
Closes gh-42719
2024-10-17 13:20:39 +02:00
Phillip Webb 465e909974 Merge branch '3.3.x' 2024-10-16 13:09:09 -07:00
Phillip Webb 5732782043 Merge branch '3.2.x' into 3.3.x 2024-10-16 13:08:44 -07:00
Phillip Webb 41ae973d16 Update copyright year of changed files 2024-10-16 13:08:37 -07:00
Moritz Halbritter 4429e847bf Merge branch '3.3.x'
Closes gh-42629
2024-10-14 11:59:26 +02:00
Moritz Halbritter 5754be36f1 Improve documentation for CycloneDX integration
Closes gh-41506
2024-10-14 11:55:45 +02:00
Anthony Dahanne 416413957a Use builder-jammy-java-tiny when using Buildpacks
See gh-42508
2024-10-07 13:30:41 +02:00
Andy Wilkinson 42ad6ddf0a Raise the minimum supported version of Gradle to 8.4
Closes gh-42481
2024-10-01 17:23:24 +01:00
Phillip Webb 99142dbbb2 Merge branch '3.3.x' 2024-09-30 16:25:47 -07:00
Phillip Webb ec615f631c Merge branch '3.2.x' into 3.3.x 2024-09-30 16:03:30 -07:00
Phillip Webb 05b4edfd2c Use `ifeval` block for Commercial/OSS documentation
See gh-42333
2024-09-30 15:56:40 -07:00
Phillip Webb 7b3077280c Merge branch '3.3.x'
Closes gh-42441
2024-09-24 14:32:48 -07:00
Phillip Webb 100bedc07d Merge branch '3.2.x' into 3.3.x
Closes gh-42440
2024-09-24 14:29:09 -07:00
Phillip Webb ad72411e2b Apply conventions plugin to all subprojects
Closes gh-42438
2024-09-24 14:26:32 -07:00
Phillip Webb 72f379a5b2 Merge branch '3.2.x' into 3.3.x
Closes gh-42434
2024-09-24 13:01:05 -07:00
Phillip Webb eafe61c4ca Backport upgrade to Gradle 8.10.1
Cherry-pick commits d756bf4e86, 083ac67d13 and 162c929a80 to
upgrade to Gradle 8.10.1.

Closes gh-42433
2024-09-24 12:55:29 -07:00
Andy Wilkinson 1a4f5abb13 Merge branch '3.3.x'
Closes gh-42358
2024-09-18 14:58:35 +01:00
Andy Wilkinson 4a6793eab5 Merge branch '3.2.x' into 3.3.x
Closes gh-42357
2024-09-18 14:55:35 +01:00
Andy Wilkinson 1240c59482 Only configure plugin classpath where it's needed
When spring-boot-gradle-plugin is using GradleRunner, it needs to be
configured with a custom plugin classpath to account for the fact
that our Gradle plugin is on the classpath of the system classloader
but some of the other plugins would only be available on a
Gradle-created classloader. This imbalance cause class loading
problems as code in spring-boot-gradle-plugin can't see types at
runtime that are only available on the Gradle-created classloader.

To overcome this, we need to configure the GradleRunner with a custom
plugin classpath that contains both spring-boot-gradle-plugin and all
of the other plugins that are used in its various integration tests.
Previously, this was done in GradleBuild that's used by both
spring-boot-gradle-plugin and spring-boot-image-tests. This caused
a problem as spring-boot-image-tests does not have the
above-described problem and trying to correct it did not work leaving
tests that use spring-boot-gradle-plugin unable to see other plugins
such that the native image plugin.

This commit reworks the customization of the plugin classpath so that
it's only done in spring-boot-gradle-plugin's integration tests.

Closes gh-42338
2024-09-18 14:53:54 +01:00
Moritz Halbritter 9294c003b4 Remove setting BP_NATIVE_IMAGE
Closes gh-32884
2024-09-17 15:50:57 +02:00
Andy Wilkinson c460600c43 Merge branch '3.3.x'
Closes gh-42189
2024-09-09 13:53:14 +01:00
Andy Wilkinson 2c9f693d17 Merge branch '3.2.x' into 3.3.x
Closes gh-42188
2024-09-09 13:53:03 +01:00
Andy Wilkinson 9a74437fbc Delete unused javadoc CSS file
Closes gh-42187
2024-09-09 13:52:23 +01:00
Phillip Webb b05336d218 Merge branch '3.3.x' 2024-09-03 21:05:05 -07:00
Phillip Webb 09684295e0 Merge branch '3.3.x'
Closes gh-42083
2024-09-01 18:56:14 -07:00
martinfrancois fd9d907ef3 Improve formatting for Docker configuration example with Colima
See gh-42078
2024-09-01 18:55:59 -07:00
Phillip Webb 7fc5c4bb6c Merge branch '3.3.x'
Closes gh-42082
2024-09-01 18:51:45 -07:00
Phillip Webb b29bc2dc2e Merge branch '3.2.x' into 3.3.x
Closes gh-42081
2024-09-01 18:51:33 -07:00
Johnny Lim a8452b54b5 Polish
See gh-42069
2024-09-01 18:50:38 -07:00
Phillip Webb 019dd678e6 Merge branch '3.3.x'
Closes gh-42051
2024-08-28 13:01:17 -07:00
Phillip Webb 71f509c9fd Fix broken tab markup
Closes gh-42046
2024-08-28 13:00:25 -07:00
Andy Wilkinson 162c929a80 Remove workaround that should now be redundant
See gh-41980
2024-08-23 16:29:20 +01:00
Andy Wilkinson d756bf4e86 Upgrade build to Gradle 8.10
Closes gh-41980
2024-08-23 12:41:05 +01:00
Scott Frederick f2479bd4a6 Polish documentation
See gh-40944
2024-07-30 15:25:08 -05:00
Scott Frederick dfab18c965 Add imagePlatform option for image building
An `imagePlatform` option for the Maven and Gradle image-building
goal/task can be used to specify the os/architecture of any
builder, run, and buildpack images that are pulled during image
building.

Closes gh-40944
2024-07-30 14:19:40 -05:00
Phillip Webb fdd5d007f5 Merge branch '3.3.x' 2024-07-25 20:49:42 +01:00
Phillip Webb 28faf12062 Migrate plugins to javadoc asciidoctor macro
See gh-41605
2024-07-25 20:49:02 +01:00
Phillip Webb 84e2049fc5 Merge branch '3.3.x' 2024-07-25 18:25:23 +01:00
Phillip Webb fd58261b9d Revert "Migrate plugins to javadoc asciidoctor macro"
This reverts commit b63e1e7443.
2024-07-25 18:25:15 +01:00
Phillip Webb 7bbb5003db Merge branch '3.3.x' 2024-07-25 18:05:04 +01:00
Phillip Webb b63e1e7443 Migrate plugins to javadoc asciidoctor macro
See gh-41605
2024-07-25 18:03:37 +01:00
Andy Wilkinson f1e98d0a73 Merge branch '3.3.x'
Closes gh-41608
2024-07-24 19:23:04 +01:00
Andy Wilkinson a00304de28 Merge branch '3.2.x' into 3.3.x
Closes gh-41607
2024-07-24 19:22:49 +01:00
Andy Wilkinson f9f530ddaa Remove method references to improve compatibility
The use of method references requires the referenced method to be
present even if it isn't called. This made it impossible for Gradle
to remove the deprecated methods as it would break our plugin.
By switching the lambdas, the methods only have to be present when
they're called which will only happen with Gradle 8.2 and earlier.

Closes gh-41599
2024-07-24 19:22:05 +01:00
Scott Frederick 224b06982e Add support for untrusted CNB builders
A `trustBuilder` configuration option has been added to the Maven and
Gradle CNB integration image building goal and task. A known set of
builders published by Paketo, Heroku, and Google are trusted by default,
all other builders are untrusted by default.

Closes gh-41352
2024-07-11 13:51:54 -05:00
Scott Frederick 17c5538062 Merge branch '3.3.x' 2024-07-01 11:24:00 -05:00
Scott Frederick 70e14d648d Polish documentation headings
Title case should be used in all headings.
2024-07-01 11:23:41 -05:00
Scott Frederick 26b59ae912 Use Paketo tiny builder by default for JVM and native apps
Closes gh-40859
2024-06-28 11:45:54 -05:00
Moritz Halbritter a2378e1439 Merge branch '3.3.x'
Closes gh-41271
2024-06-28 13:52:12 +02:00
Moritz Halbritter 9984dc16a9 Merge branch '3.2.x' into 3.3.x
Closes gh-41270
2024-06-28 13:50:33 +02:00
Sébastien Deleuze a6f1bb9590 Update Kotlin DSL examples of bootBuildImage to be additive
See gh-41173
2024-06-28 13:47:42 +02:00
Andy Wilkinson 97612d5445 Merge branch '3.2.x' 2024-06-27 12:59:19 +01:00
Andy Wilkinson d01c44a66a Merge branch '3.2.x' into 3.3.x 2024-06-27 12:58:46 +01:00
Andy Wilkinson d2f74426f7 Work around bug in Gradle's Eclipse model
The model incorrectly marks the Gradle API and all of its
dependencies as test dependencies, making them unavailable in Eclipse
to code in src/main/java. We work around this by modifying the
classpath container to remove the test attribute from the
dependencies that should be available to main code.

See gh-41228
2024-06-27 12:58:36 +01:00
Andy Wilkinson 5b7365b63b Merge branch '3.3.x'
Closes gh-41258
2024-06-27 10:25:32 +01:00
Andy Wilkinson b0d4f1d356 Merge branch '3.2.x' into 3.3.x
Closes gh-41257
2024-06-27 10:16:36 +01:00
Scott Frederick 9da2d1e089 Revert "Use Paketo tiny builder by default for JVM and native apps"
This reverts commit 6d2ebc0713.
2024-06-26 15:25:37 -05:00
Andy Wilkinson 654016af7f Move Docker-related test support into a separate module
See gh-41228
2024-06-26 19:47:35 +01:00
Andy Wilkinson 7d5a761d51 Update spring-boot-gradle-plugin to use docker-test plugin
See gh-41228
2024-06-26 19:46:25 +01:00
Scott Frederick 6d2ebc0713 Use Paketo tiny builder by default for JVM and native apps
Closes gh-40859
2024-06-26 13:42:23 -05:00
Andy Wilkinson 28a887ad0f Raise minimum supported version of Gradle
Closes gh-41180
2024-06-21 14:52:22 +01:00
Andy Wilkinson 63c6b1ee72 Remove fail-fast logic for versions less than minimum supported
CLoses gh-41200
2024-06-21 14:52:15 +01:00
Phillip Webb 9dda006a18 Merge branch '3.2.x' 2024-06-19 22:55:00 -07:00
Phillip Webb 2a4582b084 Update copyright year of changed files 2024-06-19 22:54:40 -07:00
Phillip Webb 905d6b96d0 Merge branch '3.2.x'
Closes gh-41166
2024-06-19 22:30:58 -07:00
Andy Wilkinson 491f34d25c Improve container test code
Replace `DockerImageNames` with a enum and relocate it from the
`testcontainers` to `container` package. The enum now also
becomes a common location that we can use to apply container
configuration such as timeouts.

Closes gh-41164

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-06-19 20:10:03 -07:00
Phillip Webb 147240aa0c Merge branch '3.2.x'
Closes gh-41080
2024-06-11 13:32:30 -07:00
Phillip Webb dcccb3b2b1 Polish "Use method references when possible"
See gh-40974
2024-06-11 12:57:59 -07:00
Ahmed Ashour 507229eef8 Use method references when possible
See gh-40974
2024-06-11 12:57:55 -07:00
Moritz Halbritter b6c9914c0b Configure Gradle's processResources to include the SBOM
This also configures the BootWar task to add the SBOM location to the
manifest.

Closes gh-40890
2024-06-11 11:42:26 +02:00
Andy Wilkinson 58a175bf23 Merge branch '3.2.x'
Closes gh-40975
2024-06-03 09:37:14 +01:00
Andy Wilkinson dd6f516d66 Test Gradle Plugin against 8.8
Closes gh-40573
2024-06-03 08:29:02 +01:00
Andy Wilkinson cf447e3aa6 Merge branch '3.2.x'
Closes gh-40931
2024-05-28 16:52:32 +01:00
Andy Wilkinson 5ee0580339 Upgrade to the latest Framework 6.0.x release
Closes gh-40929
2024-05-28 16:52:00 +01:00
Andy Wilkinson 73b7705baf Merge branch '3.2.x'
Closes gh-40924
2024-05-28 10:51:08 +01:00
Andy Wilkinson d80cf05406 Remove unnecessary use of SingletonSupplier
As of Framework 6.1, it contains a field of a type that's
incompatible with Gradle's configuration cache.

Fixes gh-40911
2024-05-28 10:50:33 +01:00
Scott Frederick fccc4ec3b8 Merge branch '3.2.x'
Closes gh-40871
2024-05-22 08:36:35 -05:00
Scott Frederick 4e5cd2c2fd Fix default security options for bootBuildImage task
Fixes gh-39830
2024-05-22 07:56:15 -05:00
Scott Frederick 48632b212f Merge branch '3.2.x'
Closes gh-40819
2024-05-17 11:42:21 -05:00
Scott Frederick 7f2b917851 Merge branch '3.1.x' into 3.2.x
Closes gh-40818
2024-05-17 11:41:23 -05:00
Scott Frederick 70aceb21eb Relocate test CNB builder and buildpack
The test CNB builder and buildpack used in integration tests have moved
from a projects.registry.vmware.com registry to ghcr.io/spring-io. This
commit modifies tests to use the new location.

Closes gh-40800
2024-05-17 10:59:41 -05:00
Scott Frederick 95145b23ec Merge branch '3.2.x' 2024-05-16 22:19:13 -05:00
Scott Frederick d38c1e06b3 Ignore exceptions when deleting caches in bind cache tests
See gh-40760
2024-05-16 22:19:04 -05:00