Phillip Webb
d9360a034f
Polish
2024-07-22 18:41:12 +01:00
Phillip Webb
36b1214feb
Merge branch '3.2.x' into 3.3.x
2024-07-22 18:30:45 +01:00
Phillip Webb
61dc82d836
Update copyright year of changed files
2024-07-22 18:16:19 +01:00
Andy Wilkinson
46ec3e3a07
Polish "Support service connections for redis-stack and redis-stack-server"
...
See gh-41327
2024-07-17 11:08:52 +01:00
Eddú Meléndez
2634d0c6b1
Support service connections for redis-stack and redis-stack-server
...
See gh-41327
2024-07-17 10:54:06 +01:00
Stéphane Nicoll
4415b4ab1c
Polish "Allow NestedConfigurationProperty on getters"
...
See gh-38844
2024-07-15 10:02:58 +02:00
Jared Bates
6c8987e0d8
Allow NestedConfigurationProperty on getters
...
This commit adds support adding `@NestedConfigurationProperty` on a
getter.
See gh-38844
2024-07-15 09:24:27 +02:00
Andy Wilkinson
c563c501e9
Merge branch '3.3.x'
...
Closes gh-41456
2024-07-12 07:32:56 +01:00
Andy Wilkinson
8617c981cf
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41455
2024-07-12 07:31:58 +01:00
Andy Wilkinson
f702230c12
Test Gradle plugin against Gradle 8.9
...
Closes gh-41454
2024-07-12 07:31:24 +01:00
Scott Frederick
7b8364d248
Fix LifecycleTests on Windows
...
See gh-gh-41352
2024-07-11 17:07:23 -05: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
Andy Wilkinson
375b3b16a0
Remove APIs that were deprecated for removal in 3.4.0
...
Closes gh-41435
2024-07-10 13:31:21 +01:00
Rui Figueira
e7424eacf8
Add SslBundle support to MailSender
...
See gh-40037
2024-07-04 15:13:15 +02:00
Moritz Halbritter
ee8a706e1f
Merge branch '3.3.x'
...
Closes gh-41317
2024-07-04 11:10:22 +02:00
Alexis Couvreur
47c8a859ea
Support NestedConfigurationProperty for record types
...
Add ElementType.RECORD_COMPONENT to NestedConfigurationProperty and
implement isMarkedAsNested for RecordParameterPropertyDescriptor.
This will allow nested records to be properly harvested for their
properties.
See gh-41251
2024-07-04 10:58:51 +02: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
Andy Wilkinson
99904d0307
Merge branch '3.3.x'
...
Closes gh-41274
2024-06-28 16:01:46 +01:00
Andy Wilkinson
55ac058385
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41273
2024-06-28 15:47:54 +01:00
Andy Wilkinson
d71fdd9712
Make buildSrc's custom Gradle tasks consistently abstract
...
Closes gh-41272
2024-06-28 15:40:56 +01: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
1521258695
Merge branch '3.3.x'
...
Closes gh-41269
2024-06-28 12:13:38 +01:00
Andy Wilkinson
ac8a3b6332
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41268
2024-06-28 12:12:15 +01:00
Andy Wilkinson
a195394be6
Merge branch '3.3.x'
2024-06-28 11:41:37 +01:00
Andy Wilkinson
7f2e8f85ae
Merge branch '3.2.x' into 3.3.x
2024-06-28 11:40:48 +01:00
Andy Wilkinson
365fdfee45
Reduce scope of mavenOptional feature to only the Maven Plugin
...
Previously, the mavenOptional was added to every published module but it
was only used by spring-boot-maven-plugin. This commit reduces its scope
so that it only affects the Maven plugin. It also reworks the
implementation to reuse the existing optional configuration rather than
declaring a new mavenOptional configuration. Lastly, publication of
Gradle Module Metadata (GMM) has been disabled for
spring-boot-maven-plugin. This is seen as preferable to publishing the
metadata – which isn't really needed as it does not contain any useful
additional information – and having to suppress warnings about
incomplete mapping of GMM to pom metadata.
Closes gh-41263
2024-06-28 11:39:46 +01:00
Andy Wilkinson
2ed72c6e4d
Correct syntax for plexus-utils exclusion
...
See 07442f8366
See gh-41248
2024-06-28 11:39:46 +01:00
Andy Wilkinson
6749ad674f
Polish "Add support for org.testcontainers.kafka.KafkaContainer"
...
See gh-40695
2024-06-27 15:10:58 +01:00
Eddú Meléndez
769f3e9d14
Add support for org.testcontainers.kafka.KafkaContainer
...
Testcontainers 1.19.8 provides `org.testcontainers.kafka.KafkaContainer`,
which relies on `apache/kafka` image.
See gh-40695
2024-06-27 14:58:57 +01:00
Andy Wilkinson
13ab5618a6
Merge branch '3.3.x'
2024-06-27 13:08:38 +01:00
Andy Wilkinson
0df946ccad
Fix botched merge of spring-boot-maven-plugin's build.gradle
2024-06-27 13:06:44 +01: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
Andy Wilkinson
4515c882c7
Merge branch 'gh-41228' into 3.2.x
...
Closes gh-41228
2024-06-27 09:55:59 +01:00
Phillip Webb
00ed053ceb
Merge branch '3.3.x'
...
Closes gh-41253
2024-06-26 16:27:56 -07:00
Phillip Webb
1a699aee24
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41252
2024-06-26 16:27:41 -07:00
Phillip Webb
962936370a
Don't report already migrated properties
...
Update `PropertiesMigrationReporter` so that already migrated properties
are not reported. Prior to this commit, if a deprecated property was
replaced by a property that could bind with the name relaxed name it
would be reported. For example: `test.someproperty` being replaced with
`test.some-property`.
In order to check the actual underlying property name, the
`PropertySourceOrigin` class has been updated so that it is always
returned, even if another `Origin` is available.
Fixes gh-35774
2024-06-26 16:24:32 -07: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
Scott Frederick
8623c92a29
Change spring-boot-buildpack-platform api deps to implementation
...
Closes gh-40935
2024-06-26 14:12:43 -05:00
Scott Frederick
267956cf5c
Replace JNI domain sockets implementation with one that uses JDK support
...
Closes gh-41050
2024-06-26 14:09:19 -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
89a06608d2
Update spring-boot-maven-plugin to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:29 +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
Andy Wilkinson
d5ef5e9c9d
Update spring-boot-buildpack-platform to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:08 +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
61ac0e32a1
Merge branch '3.3.x'
...
Closes gh-41250
2024-06-26 17:01:14 +01:00
Andy Wilkinson
2dd6c1c3a0
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41249
2024-06-26 17:00:58 +01:00
Andy Wilkinson
07442f8366
Exclude plexus-utils in favor of Maven's build-in version
...
Closes gh-41248
2024-06-26 16:59:23 +01:00
Phillip Webb
f5eb6e95ce
Merge branch '3.3.x'
...
Closes gh-41235
2024-06-25 12:43:15 -07:00
Phillip Webb
eb9f16e7e6
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41234
2024-06-25 12:42:53 -07:00
Phillip Webb
85f6641a7e
Allow 'npipe://' prefix in Docker host address
...
Update `LocalHttpClientTransport` to support explicit `npipe://` prefix
in the host name. This is the format used in the Docker config from
v4.31.1 onward.
Fixes gh-41199
2024-06-25 12:40:11 -07: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
Andy Wilkinson
23597cc744
Start work on Spring Boot 3.4
2024-06-20 19:50:32 +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
Scott Frederick
84956ad56b
Merge branch '3.2.x'
...
Closes gh-41091
2024-06-12 15:16:26 -05:00
Scott Frederick
e228ed39b3
Support CNB builders that do not specify a stack
...
Fixes gh-41046
2024-06-12 15:16:21 -05:00
Piyal Ahmed
e2cf638cd5
Add file extension to xref
...
See gh-41083
2024-06-12 10:45:07 +02:00
Phillip Webb
147240aa0c
Merge branch '3.2.x'
...
Closes gh-41080
2024-06-11 13:32:30 -07:00
Phillip Webb
bcbcafaab2
Polish "Use method references when possible in test code"
...
See gh-40974
2024-06-11 12:58:04 -07:00
Ahmed Ashour
207327d97c
Use method references when possible in test code
...
See gh-40974
2024-06-11 12:58:00 -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
Phillip Webb
41c93c53e5
Merge branch '3.2.x'
...
Closes gh-41079
2024-06-11 12:31:43 -07:00
Ahmed Ashour
2c5934dab2
Use 'switch' instead of 'if'
...
See gh-40985
2024-06-11 12:24:11 -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
Scott Frederick
87094edab0
Merge branch '3.2.x'
...
Closes gh-41049
2024-06-10 17:32:46 -05:00
Scott Frederick
2bb74b261c
Disable stale checking for local Docker daemon connections
...
Fixes gh-40697
2024-06-10 17:27:02 -05:00
Moritz Halbritter
771e356b3b
Use version 2.34.0 of ActiveMQ Artemis docker image
...
Closes gh-41008
2024-06-07 10:43:32 +02:00
Scott Frederick
2df0c7961a
Reorganize packaging and optimizing documentation
...
Documentation for native executables, CDS, and checkpoint/restore are
now under a common heading in the reference documentation, along with
sections on building container images. A few sections containing
prescriptive workflows have been moved from reference to how-to guides.
This consolidates and improves the consistency of recommendations on
how to package and run applications.
Closes gh-40977
2024-06-06 16:11:10 -05:00
Andy Wilkinson
16302c18b2
Merge branch '3.2.x'
...
Closes gh-41006
2024-06-06 14:58:28 +01:00
Andy Wilkinson
217c2c862b
Ignore file entries in META-INF/versions of multi-release jar
...
Fixes gh-41001
2024-06-06 13:28:36 +01: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
Moritz Halbritter
9def6f86c9
Keep track of written jar entries to not duplicate them
...
Closes gh-40903
2024-05-27 12:18:00 +02: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
Scott Frederick
190b120628
Merge branch '3.2.x'
2024-05-16 21:20:10 -05:00
Scott Frederick
bdc6508b62
Catch any exception when deleting image building workspace
...
See gh-40760
2024-05-16 21:19:51 -05:00
Scott Frederick
5f4d7f41bc
Merge branch '3.2.x'
...
Closes gh-40799
2024-05-16 17:38:07 -05:00
Scott Frederick
cd441130bd
Warn when image building workspace directories cannot be deleted
...
When the `buildWorkspace` location in the
`spring-boot:build-image` Maven goal or `bootBuildImage` Gradle
task is configured to use a local bind source, the location
is passed to the CNB lifecycle without further processing by
Spring Boot. The lifecycle is in control of creating any files
in the specified location. Spring Boot tries to remove the
directories at the specified location after an image is
successfully created, but should not fail the image build
if the lifecycle has created files or directories with
permissions that keep them from being deleted successfully.
Fixes gh-40760
2024-05-16 17:37:44 -05:00