84e2049fc5
Merge branch '3.3.x'
2024-07-25 18:25:23 +01:00
fd58261b9d
Revert "Migrate plugins to javadoc asciidoctor macro"
...
This reverts commit b63e1e7443
2024-07-25 18:25:15 +01:00
7bbb5003db
Merge branch '3.3.x'
2024-07-25 18:05:04 +01:00
b63e1e7443
Migrate plugins to javadoc asciidoctor macro
...
See gh-41605
2024-07-25 18:03:37 +01:00
000600c68a
Merge branch '3.3.x'
2024-07-22 18:41:53 +01:00
36b1214feb
Merge branch '3.2.x' into 3.3.x
2024-07-22 18:30:45 +01:00
61dc82d836
Update copyright year of changed files
2024-07-22 18:16:19 +01:00
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
375b3b16a0
Remove APIs that were deprecated for removal in 3.4.0
...
Closes gh-41435
2024-07-10 13:31:21 +01:00
17c5538062
Merge branch '3.3.x'
2024-07-01 11:24:00 -05:00
70e14d648d
Polish documentation headings
...
Title case should be used in all headings.
2024-07-01 11:23:41 -05:00
26b59ae912
Use Paketo tiny builder by default for JVM and native apps
...
Closes gh-40859
2024-06-28 11:45:54 -05:00
99904d0307
Merge branch '3.3.x'
...
Closes gh-41274
2024-06-28 16:01:46 +01:00
55ac058385
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41273
2024-06-28 15:47:54 +01:00
d71fdd9712
Make buildSrc's custom Gradle tasks consistently abstract
...
Closes gh-41272
2024-06-28 15:40:56 +01:00
1521258695
Merge branch '3.3.x'
...
Closes gh-41269
2024-06-28 12:13:38 +01:00
ac8a3b6332
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41268
2024-06-28 12:12:15 +01:00
a195394be6
Merge branch '3.3.x'
2024-06-28 11:41:37 +01:00
7f2e8f85ae
Merge branch '3.2.x' into 3.3.x
2024-06-28 11:40:48 +01:00
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
2ed72c6e4d
Correct syntax for plexus-utils exclusion
...
See 07442f8366
2024-06-28 11:39:46 +01:00
13ab5618a6
Merge branch '3.3.x'
2024-06-27 13:08:38 +01:00
0df946ccad
Fix botched merge of spring-boot-maven-plugin's build.gradle
2024-06-27 13:06:44 +01:00
5b7365b63b
Merge branch '3.3.x'
...
Closes gh-41258
2024-06-27 10:25:32 +01:00
b0d4f1d356
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41257
2024-06-27 10:16:36 +01:00
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
654016af7f
Move Docker-related test support into a separate module
...
See gh-41228
2024-06-26 19:47:35 +01:00
89a06608d2
Update spring-boot-maven-plugin to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:29 +01:00
6d2ebc0713
Use Paketo tiny builder by default for JVM and native apps
...
Closes gh-40859
2024-06-26 13:42:23 -05:00
61ac0e32a1
Merge branch '3.3.x'
...
Closes gh-41250
2024-06-26 17:01:14 +01:00
2dd6c1c3a0
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41249
2024-06-26 17:00:58 +01:00
07442f8366
Exclude plexus-utils in favor of Maven's build-in version
...
Closes gh-41248
2024-06-26 16:59:23 +01:00
23597cc744
Start work on Spring Boot 3.4
2024-06-20 19:50:32 +01:00
9dda006a18
Merge branch '3.2.x'
2024-06-19 22:55:00 -07:00
2a4582b084
Update copyright year of changed files
2024-06-19 22:54:40 -07:00
905d6b96d0
Merge branch '3.2.x'
...
Closes gh-41166
2024-06-19 22:30:58 -07:00
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
e2cf638cd5
Add file extension to xref
...
See gh-41083
2024-06-12 10:45:07 +02:00
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
fccc4ec3b8
Merge branch '3.2.x'
...
Closes gh-40871
2024-05-22 08:36:35 -05:00
4e5cd2c2fd
Fix default security options for bootBuildImage task
...
Fixes gh-39830
2024-05-22 07:56:15 -05:00
48632b212f
Merge branch '3.2.x'
...
Closes gh-40819
2024-05-17 11:42:21 -05:00
7f2b917851
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40818
2024-05-17 11:41:23 -05:00
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
95145b23ec
Merge branch '3.2.x'
2024-05-16 22:19:13 -05:00
d38c1e06b3
Ignore exceptions when deleting caches in bind cache tests
...
See gh-40760
2024-05-16 22:19:04 -05:00
5f4d7f41bc
Merge branch '3.2.x'
...
Closes gh-40799
2024-05-16 17:38:07 -05:00
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
50b197da55
Merge branch '3.2.x'
...
Closes gh-40793
2024-05-16 18:07:01 +01:00
493efd6798
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40792
2024-05-16 18:06:32 +01:00
f35ecfbdca
Reduce and update the versions of Maven that we test against
...
Closes gh-40791
2024-05-16 18:05:24 +01:00
d77fcf30fa
Merge branch '3.2.x'
2024-05-16 17:22:36 +01:00
feaccef3a4
Temporarily disable tests for image building with bind caches
...
See gh-40760
2024-05-16 17:22:02 +01:00
d98987f11e
Merge branch '3.2.x'
...
Closes gh-40701
2024-05-13 11:31:55 +02:00
364af04377
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40700
2024-05-13 11:30:42 +02:00
0e450d602d
Use CollectionUtils.isEmpty() and StringUtils.hasLength()
...
See gh-40645
2024-05-13 11:26:56 +02:00
9bb981be11
Merge branch '3.2.x'
...
Closes gh-40625
2024-05-06 10:25:08 +02:00
c47cdda824
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40624
2024-05-06 09:51:39 +02:00
126927f462
Merge branch '3.2.x'
...
Closes gh-40499
2024-04-24 14:04:17 +02:00
b416db4dee
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40498
2024-04-24 14:04:08 +02:00
2cb19f368e
Polish "Remove unnecessary nesting of calls to String.format"
...
See gh-40494
2024-04-24 13:57:07 +02:00
0cf15fcad0
Remove unnecessary nesting of calls to String.format
...
See gh-40494
2024-04-24 13:55:04 +02:00
00a10fdc52
Move Docker Compose and Testcontainers to separate section
...
See gh-38361
2024-04-17 14:05:52 +02:00
0ed6864d1d
Merge branch '3.2.x'
...
Closes gh-40324
2024-04-11 16:54:46 +01:00
45e9412d9b
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40323
2024-04-11 16:54:33 +01:00
baf5a7f130
Make includes configurable via a property
...
See gh-39837
2024-04-11 16:32:17 +01:00
2a6293940b
Polish "Make excludes configurable via property"
...
See gh-39837
2024-04-11 16:31:24 +01:00
58fc8f8c01
Make excludes configurable via property
...
See gh-39837
2024-04-11 15:43:31 +01:00
3ed77ae5f3
Polish
2024-04-04 23:45:21 -07:00
10260c084b
Rename Antora component from spring-boot to boot
...
Closes gh-40131
2024-03-28 13:21:27 -07:00
957facf1cc
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40117
2024-03-27 09:35:44 +01:00
ff66036e90
Remove redundant Regex escapes
...
Closes gh-40116
2024-03-27 09:34:28 +01:00
af0353ddd3
Remove anchor-rewrite.properties
...
Remove `anchor-rewrite.properties` now that we have `rewrite.adoc` to
replace them.
See gh-40062
2024-03-26 11:27:03 -07:00
dab1afcc77
Fix anchor rewrites in preparation for migration to Antora
...
Update `anchor-rewrite.properties` to fix a few errors and remove
elements that no longer exist. This commit also fixes a few anchors
in some `.adoc` files.
See gh-40062
2024-03-26 11:18:27 -07:00
8724807628
Update documentation to reflect CDS work
...
Closes gh-39834
2024-03-26 11:27:47 +01:00
2d9b1ad592
Use xref for documentation links
...
Closes gh-33745
2024-03-26 10:11:47 +01:00
6bb6a798ce
Set version to `true` in antora.yml to allow docs generation
...
See gh-33766
2024-03-25 08:52:51 -07:00
8ee20c8dae
Migrate maven-plugin to Antora
...
See gh-33766
2024-03-20 15:21:56 -07:00
5a77122abe
Create classpath argfile on windows for run tasks
...
Closes gh-17766
2024-03-19 14:08:14 +01:00
702cf75b21
Merge branch '3.2.x'
...
Closes gh-39934
2024-03-13 18:40:28 +00:00
e2d53fa0e9
Ensure that Maven Plugin uses a consistent Framework dependency version
...
Fixes gh-39927
2024-03-13 18:38:38 +00:00
793aca60d2
Implement extract and list-layers command
...
Adds a new jarmode called 'tools'. This provides two commands,
'extract' and 'list-layers'. list-layers is the same as list from
the layertools.
extract is able to extract the JAR in four different modes:
- CDS compatible extraction with libraries in a lib folder and a runner
.jar
- CDS compatible as above, but with layers
- Launcher based
- Launcher based with layers. This is essentially the same as extract
from the layertools
The commands in layertools have been deprecated in favor of the commands
in 'tools'.
This also changes the behavior of layers.enabled from the Gradle and
Maven plugin: before this commit, layers.enabled prevents the inclusion
of the layer index file as well as the layertools JAR.
After this commit, layers.enabled only prevents the inclusion of the
layer index file.
layer.includeLayerTools have been deprecated in favor of includeTools,
and the layertools JAR has been renamed to tools.
Closes gh-38276
2024-03-07 13:34:13 +01:00
f8a1dae835
Merge branch '3.2.x'
2024-02-21 15:27:57 -08:00
12de6aa46a
Merge branch '3.1.x' into 3.2.x
2024-02-21 15:27:27 -08:00
2c4909a89a
Update copyright year of changed files
2024-02-21 13:58:53 -08:00
7f55cae90f
Merge branch '3.2.x'
2024-02-12 10:19:46 +01:00
4387b79831
Merge branch '3.1.x' into 3.2.x
2024-02-12 10:18:46 +01:00
8ffcfc9b77
Harmonize style of igored exceptions across the codebase
2024-02-12 10:14:20 +01:00
cc2233a7d9
Merge branch '3.2.x'
...
Closes gh-39423
2024-02-06 13:10:22 +01:00
976152b244
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39422
2024-02-06 13:10:15 +01:00
8fd28d9ece
Polish "Update the Debugging Documentation of the Spring Boot Maven Plugin"
...
See gh-39392
2024-02-06 13:07:55 +01:00
b25d52c896
Update the Debugging Documentation of the Spring Boot Maven Plugin
...
See gh-39392
2024-02-06 13:06:57 +01:00
a0a804cfdf
Merge branch '3.2.x'
2024-01-22 12:20:41 -08:00
6f4a8cc0c3
Polish "Change log messages to use singular or plural instead of "noun(s)""
...
See gh-37017
2024-01-11 14:44:07 +00:00
c6c7fbc15f
Change log messages to use singular or plural instead of "noun(s)"
...
See gh-37017
2024-01-11 14:35:49 +00:00
17e9f0cb8e
Merge branch '3.2.x'
...
Closes gh-39093
2024-01-11 11:36:38 +00:00
7087897507
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39091
2024-01-11 10:33:57 +00:00
45c32854a5
Fix Checkstyle upgrade
...
Closes gh-38746
2024-01-10 15:37:38 +00:00
5ef7db9a28
Start working on Spring Boot 3.3
2024-01-04 10:56:56 +00:00
5354ad15b3
Merge branch '3.1.x'
...
Closes gh-38877
2023-12-19 22:51:48 -08:00
ac18e3015c
Use `.isEmpty()` where feasible
...
See gh-38739
2023-12-19 22:38:05 -08:00
d433deb737
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38485
2023-11-21 17:30:54 -06:00
dabcebf8a3
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38484
2023-11-21 17:30:07 -06:00
d1cce0f8ef
Upgrade default CNB builders to Paketo Jammy
...
Closes gh-38477
2023-11-21 17:22:32 -06:00
82f0684cd8
Merge branch '3.1.x'
...
Closes gh-38354
2023-11-14 17:04:41 +01:00
22a991b334
Document tags format used in Gradle and Maven plugins
...
Closes gh-33088
2023-11-14 17:03:50 +01:00
77218a644e
Merge branch '3.1.x'
2023-11-02 14:16:37 -07:00
afa4d274c2
Merge branch '3.0.x' into 3.1.x
2023-11-02 14:14:19 -07:00
8d53caa1c6
Merge branch '2.7.x' into 3.0.x
2023-11-02 14:13:47 -07:00
e891a3e24c
Polish adoc formatting
2023-11-02 14:12:56 -07:00
f66c76e2a8
Merge branch '3.1.x'
...
Closes gh-38078
2023-10-27 13:47:23 +02:00
5ca7201fa5
Fix "Integrating with Actuator" code snippet
...
Closes gh-36114
2023-10-27 13:47:02 +02:00
35aa28485a
Merge branch '3.1.x'
...
Closes gh-38069
2023-10-27 09:50:57 +02:00
8bb2228adf
Document how to unset maven.compiler.release
...
Closes gh-37993
2023-10-27 09:50:12 +02:00
0d1a223fee
Merge branch '3.1.x'
...
Closes gh-38032
2023-10-25 14:08:22 +01:00
649117de35
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38031
2023-10-25 14:08:10 +01:00
331bf51332
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38030
2023-10-25 14:07:57 +01:00
666f68ea60
Document configuration for building images with Colima
...
Closes gh-34522
2023-10-25 14:07:43 +01:00
3eeb1b2849
Merge branch '3.1.x'
2023-10-19 23:21:42 -07:00
7c864804d5
Merge branch '2.7.x' into 3.0.x
2023-10-19 23:21:08 -07:00
d47f8bf945
Update copyright year of changed files
2023-10-19 23:20:43 -07:00
b8365e3118
Fix misconfigured Maven test
...
See gh-37669
2023-10-18 22:58:45 -07:00
33c5e1269a
Write signature files to uber jars to for Oracle Java 17 verification
...
Update Gradle and Maven plugins to write an empty `META-INF/BOOT.SF`
file whenever there is a nested signed jar.
This update allows Oracle Java 17 to correctly verify the nested JARs.
The file is required because `JarVerifier` has code roughly equivalent
to:
if (!jarManifestNameChecked && SharedSecrets
.getJavaUtilZipFileAccess().getManifestName(jf, true) == null) {
throw new JarException("The JCE Provider " + jarURL.toString() +
" is not signed.");
}
The `SharedSecrets.getJavaUtilZipFileAccess().getManifestName(jf, true)`
call ends up in `ZipFile.getManifestName(onlyIfSignatureRelatedFiles)`
which is a private method that we cannot override in our `NestedJarFile`
subclass. By writing an empty `.SF` file we ensure that the `Manifest`
is always returned because there are always "signature related files".
Fixes gh-28837
2023-10-16 16:19:16 -07:00
bdaf7a7603
Merge branch '3.1.x'
...
Closes gh-37830
2023-10-11 15:06:09 +01:00
411586347c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37829
2023-10-11 15:04:21 +01:00
781ac2ece2
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37828
2023-10-11 15:02:36 +01:00
5a75fae23b
Polish "Polish"
...
See gh-37745
2023-10-11 14:58:04 +01:00
303015ea2d
Polish
...
See gh-37745
2023-10-11 14:57:38 +01:00
75ddb9fa47
Fix test failure caused by PropertiesLoader class reference
...
See gh-37667
2023-10-03 17:27:39 -07:00
55b5610dd9
Add Maven and Gradle option for the loader implementation to use
...
Add properties to the Maven and Gradle plugins so that users can
switch between the two loader modules.
See gh-37669
2023-10-03 15:40:42 -07:00
c22548982a
Relocate launcher classes
...
Create alternative launcher classes under the package
`org.springframework.boot.loader.launch` and use them in favor
of the previous location.
This update is designed to improve compatibility with future
changes in the loader.
Closes gh-37667
2023-10-03 14:53:04 -07:00
3d6859e80f
Use the term "uber jar" in reference documentation and javadoc
...
Update reference documentation and javadoc to use the term "uber jar"
rather than "fat jar".
Closes gh-37653
2023-10-02 23:01:34 -07:00
3cf08e1351
Clarify default security options for image building
...
See gh-37479
2023-09-27 11:05:40 -05:00
fb15125d01
Merge branch '3.1.x'
...
Closes gh-37548
2023-09-22 16:30:36 +01:00
8080bb9cfb
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37547
2023-09-22 16:30:19 +01:00
ce813346c9
Add Javadoc since for AbstractAotMojo.getSession()
...
See gh-37462
2023-09-22 16:29:49 +01:00
ec9ac05d3d
Merge branch '3.1.x'
...
Closes gh-37536
2023-09-22 11:21:53 +02:00
059bb69705
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37535
2023-09-22 11:21:37 +02:00
c991a7b90b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37534
2023-09-22 11:21:25 +02:00
a3611ae9f3
Polish "Use the Maven Archiver implementation for parsing outputTimestamp"
...
See gh-37438
2023-09-22 11:13:10 +02:00
a1b08e1819
Use the Maven Archiver implementation for parsing outputTimestamp
...
See gh-37438
2023-09-22 11:12:48 +02:00
7de770f6a1
Add support for security options in CNB builder container config
...
Closes gh-37479
2023-09-20 13:43:36 -05:00
4433fcd1f2
Add support for build workspace option when building images
...
Closes gh-37478
2023-09-20 13:43:35 -05:00
a9f26e0f95
Conditionally enable image building bind cache tests
...
Accessing bind mount directories as is done in the tests for building
images with bind mount caches requires Docker configuration when
using Docker Desktop. It works without configuration on Linux with
Docker Engine.
See gh-28387
2023-09-12 17:00:59 -05:00
1c03ed3184
Merge branch '3.1.x'
...
Closes gh-37052
2023-08-21 16:41:11 -05:00
ef40d9ebe2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37051
2023-08-21 16:40:55 -05:00
0b197650a9
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37050
2023-08-21 16:40:43 -05:00
d5cfe4d475
Remove invalid caches parameter entry from Maven plugin docs
...
Fixes gh-37048
2023-08-21 16:40:18 -05:00
c17ecf0f0b
Add support for caching to bind mounts when building images
...
When building an image using the Maven `spring-boot:build-image` goal or
the Gradle `bootBuildImage` task, the build and launch caches can be
configured to use a bind mount as an alternative to using a named
volume.
Closes gh-28387
2023-08-21 15:04:39 -05:00
eb45aab712
Upgrade default CNB builders to Paketo Jammy
...
Closes gh-36689
2023-08-14 13:29:42 -05:00
Phillip Webb
Scott Frederick
Andy Wilkinson
Piyal Ahmed
Moritz Halbritter
Yanming Zhou
Hyeon Sung
Matti Tahvonen
lukasdooo
teacmity
Scott Frederick
Moritz Halbritter
Phillip Webb
Andy Wilkinson
Johnny Lim
Niels Basjes