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
Andy Wilkinson
85acdf5165
Merge branch '3.2.x'
...
Closes gh-40796
2024-05-16 18:21:02 +01:00
Andy Wilkinson
524424bc98
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40795
2024-05-16 18:20:52 +01:00
Andy Wilkinson
a1d5369a9c
Limit configuration cache testing to the latest version of Gradle
...
Closes gh-40794
2024-05-16 18:20:13 +01:00
Andy Wilkinson
50b197da55
Merge branch '3.2.x'
...
Closes gh-40793
2024-05-16 18:07:01 +01:00
Andy Wilkinson
493efd6798
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40792
2024-05-16 18:06:32 +01:00
Andy Wilkinson
f35ecfbdca
Reduce and update the versions of Maven that we test against
...
Closes gh-40791
2024-05-16 18:05:24 +01:00
Andy Wilkinson
d77fcf30fa
Merge branch '3.2.x'
2024-05-16 17:22:36 +01:00
Andy Wilkinson
feaccef3a4
Temporarily disable tests for image building with bind caches
...
See gh-40760
2024-05-16 17:22:02 +01:00
Moritz Halbritter
d98987f11e
Merge branch '3.2.x'
...
Closes gh-40701
2024-05-13 11:31:55 +02:00
Moritz Halbritter
364af04377
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40700
2024-05-13 11:30:42 +02:00
Yanming Zhou
0e450d602d
Use CollectionUtils.isEmpty() and StringUtils.hasLength()
...
See gh-40645
2024-05-13 11:26:56 +02:00
Phillip Webb
348ed47e67
Merge branch '3.2.x'
2024-05-08 18:28:24 -07:00
Phillip Webb
24bfe5087f
Fix checkstyle violation
...
See gh-40549
2024-05-08 18:28:09 -07:00
Phillip Webb
5e4796f0fb
Merge branch '3.2.x'
2024-05-08 18:05:31 -07:00
Phillip Webb
8457fc333f
Adapt Windows path handling fix to deal with Jetty
...
Update `NestedLocation` to deal with the fact that Jetty attempts
to fix URLs.
See gh-40549
2024-05-08 18:04:17 -07:00
Phillip Webb
ac9d2e7c11
Merge branch '3.2.x'
...
Closes gh-40643
2024-05-08 15:44:35 -07:00
Phillip Webb
7708ec7592
Fix Windows path handling for nested jars
...
Update `Path` creation for nested locations to allow both UNC and classic
file references to be used. This commit attempts to align our URL
handling with that of standard file URLs. The `NestedLocation` class
no longer attempts to remove leading all `\` characters and instead
only removes the first `\` when the second char is `:`. This duplicates
the logic found in Java's own internal `WindowsUriSupport` class which
is used when calling `Path.of(url)` with a `file:` URL.
Fixes gh-40549
2024-05-08 15:44:03 -07:00
Moritz Halbritter
9bb981be11
Merge branch '3.2.x'
...
Closes gh-40625
2024-05-06 10:25:08 +02:00
Moritz Halbritter
c47cdda824
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40624
2024-05-06 09:51:39 +02:00
Moritz Halbritter
d18fb9ce65
Upgrade to bcprov-jdk18on 1.78.1
...
Closes gh-40621
2024-05-06 09:49:32 +02:00
Phillip Webb
3b66eb7bb7
Merge branch '3.2.x'
...
See gh-40616
2024-05-03 12:31:33 -07:00
Phillip Webb
8a72e55106
Fix UriPathEncoder bug to improve performance
...
Fix `isAllowed` check and write test to ensure that additional object
instances are not created unnecessarily.
See gh-40615
2024-05-03 12:29:41 -07:00
Phillip Webb
208efae975
Merge branch '3.2.x'
...
Closes gh-40616
2024-05-02 15:53:38 -07:00
Phillip Webb
d0ce4daec1
Use URI encoded values when creating NestedPath URIs
...
Update `NestedPath.toUri()` so that the URI is constructed using encoded
strings.
Fixes gh-40615
2024-05-02 15:53:01 -07:00
Moritz Halbritter
d3e49747b0
Merge branch '3.2.x'
2024-05-02 14:48:37 +02:00
Moritz Halbritter
75dac1435f
Merge branch '3.1.x' into 3.2.x
2024-05-02 14:48:04 +02:00
Moritz Halbritter
68a63a7797
Polish
2024-05-02 14:47:53 +02:00
Andy Wilkinson
c44e477a77
Merge branch '3.2.x'
...
Closes gh-40613
2024-05-02 10:49:55 +01:00
Andy Wilkinson
94c9a5c686
Polish
2024-05-02 10:49:31 +01:00
Andy Wilkinson
c7ec6080ce
Publish a runtime variant that supports Java 22
...
In order to support Java 22, we must use spring-core 6.1.x.
spring-core 6.1.x is a multi-release jar so, in order to support Java
22, a version of Gradle that supports multi-release jars must be
used.
This commit adds a new variant to spring-boot-gradle-plugin for
modern versions of Gradle. When Gradle's plugin API version is 8.7 or
later, we use spring-core 6.1.x. spring-core 6.0.x is used at all
other times.
Closes gh-40074
2024-05-02 10:45:18 +01:00
Moritz Halbritter
51b8b992aa
Merge branch '3.2.x'
...
Closes gh-40606
2024-05-02 10:51:24 +02:00
Moritz Halbritter
888ae040e4
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40605
2024-05-02 10:51:10 +02:00
Moritz Halbritter
64b302032c
Polish "Change Spring Boot CLI init command docs default build system to gradle"
...
See gh-40603
2024-05-02 10:49:51 +02:00
coursar
1a786fc788
Change Spring Boot CLI init command docs default build system to gradle
...
See gh-40603
2024-05-02 10:44:33 +02:00