Commit Graph

439 Commits

Author SHA1 Message Date
Phillip Webb
792c13eaf0 Merge branch '3.3.x' into 3.4.x
Closes gh-44364
2025-02-19 12:21:04 -08:00
Dmytro Nosan
e919fd806f Polish ClassPath
See gh-44355

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-19 12:20:10 -08:00
Phillip Webb
8c6e856340 Fix formatting 2025-02-18 17:44:24 -08:00
Phillip Webb
661fcfe033 Merge branch '3.3.x' into 3.4.x 2025-02-18 17:29:31 -08:00
Phillip Webb
082c5859e8 Polish 2025-02-18 17:22:53 -08:00
Phillip Webb
e4077cb2e9 Merge branch '3.3.x' into 3.4.x
Closes gh-44345
2025-02-18 12:11:48 -08:00
Dmytro Nosan
0e81b6386e Don't use ArgFile when using JavaCompiler
See gh-44340

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-18 12:10:41 -08:00
Phillip Webb
bac9217b14 Merge branch '3.3.x' into 3.4.x
Closes gh-44343
2025-02-18 12:09:48 -08:00
Dmytro Nosan
616d4cb149 Polish ClasspathBuilder
See gh-44330

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-18 12:08:49 -08:00
Stéphane Nicoll
332958a8de Merge branch '3.3.x' into 3.4.x
Closes gh-44328
2025-02-18 16:31:12 +01:00
Stéphane Nicoll
cd8c12da0b Polish "Use ArgFile for classpath argument on Windows"
See gh-44305
2025-02-18 16:25:57 +01:00
Dmytro Nosan
a6b80831f0 Use ArgFile for classpath argument on Windows
This commit uses @argfile syntax for classpath argument on Windows OS
to avoid creating a command-line that is too long.

See gh-44305

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-18 16:25:57 +01:00
Stéphane Nicoll
3e39b0256d Merge branch '3.3.x'
Closes gh-43617
2024-12-26 16:08:26 +01:00
Stéphane Nicoll
7e9fda8216 Polish "Preserve milliseconds in build info timestamp"
See gh-43612
2024-12-26 15:58:09 +01:00
Gaurav
0944b07c90 Preserve milliseconds in build info timestamp
See gh-43612
2024-12-26 15:52:08 +01:00
Moritz Halbritter
4dca6ee5d3 Polish "Only set imagePlatform if it has text"
See gh-43424
2024-12-05 11:03:14 +01:00
Leonid Bogdanov
fe1f9b3002 Only set imagePlatform if it has text
See gh-43424
2024-12-05 10:59:17 +01:00
Moritz Halbritter
35b6c49b79 Merge branch '3.3.x'
Closes gh-43062
2024-11-07 15:26:47 +01:00
Moritz Halbritter
317d943083 Use native encoding when writing the java arguments file
Closes gh-43051
2024-11-07 15:14:45 +01:00
Stéphane Nicoll
a52bdc98e7 Merge branch '3.3.x'
Closes gh-42936
2024-10-30 16:39:46 +09:00
Stéphane Nicoll
35d6d76d12 Merge branch '3.2.x' into 3.3.x
Closes gh-42935
2024-10-30 16:39:32 +09:00
Stéphane Nicoll
1a3f1a41b1 Polish "Complete support for project.build.outputTimestamp"
See gh-42922
2024-10-30 11:04:48 +09:00
Andreas Höhmann
491515e6e3 Complete support for project.build.outputTimestamp
This commit completes the support of project.build.outputTimestamp to
also support a value that's expressed as seconds since the epoch.

See gh-42922
2024-10-30 10:51:07 +09:00
Moritz Halbritter
5e5f41b7a6 Merge branch '3.3.x'
Closes gh-42845
2024-10-23 08:27:51 +02:00
Moritz Halbritter
9cced069a0 Delete argfile on JVM exit
Closes gh-42841
2024-10-23 08:27:31 +02:00
Stéphane Nicoll
90f847d454 Merge branch '3.3.x'
Closes gh-41696
2024-08-05 16:29:32 +02:00
Stéphane Nicoll
7607bf1ab8 Document that repackage should not be used on the command-line
This commit clarifies how we intend the spring-boot:repackage goal to
be used. As it operates on the source jar (or war) that must be
effectively up-to-date to produce an accurate result, the package phase
must have run.

Contrary to build-image that was designed to be used on the command-line
by forking a package lifecycle first, repackage does not do that. This
commit also clarifies that by providing a more focused error message.

Closes gh-22317
2024-08-05 16:16:09 +02:00
Stéphane Nicoll
e49a2daf38 Merge branch '3.3.x'
Closes gh-41662
2024-07-31 17:04:21 +02:00
Stéphane Nicoll
8ea6d3c92e Merge branch '3.2.x' into 3.3.x
Closes gh-41661
2024-07-31 17:04:01 +02:00
Stéphane Nicoll
200fc15b5d Detect backup jar when the package lifecycle is forked
Previously, if a classifier was set and build-image was executed from
the command-line, the build will fail as the plugin was unable to find
the original jar. This is because it relies on the attached artifacts
of the project, and those are not set when package has run as part of
a forked lifecycle.

This commit makes sure that the backup file is found by convention
first, the same way it is done for the target file.

Closes gh-26721
2024-07-31 17:01:00 +02: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
Stéphane Nicoll
8ef5540624 Merge branch '3.3.x'
Closes gh-41648
2024-07-30 10:58:38 +02:00
Stéphane Nicoll
397aeee9b6 Merge branch '3.2.x' into 3.3.x
Closes gh-41647
2024-07-30 10:58:31 +02:00
Stéphane Nicoll
05468def54 Tolerate module-info with AOT processing
This commit updates the Maven Plugin to tolerate projects that are using
the module path on the JVM and targeting native images with AOT.

Previously, the plugin compiled AOT sources directly to target/classes
and the presence of a module-info there is enough to trigger a
compilation on the module path.

With this change we now compile in a separate directory that contains
the generated AOT classes (typically CGLIB proxies). These are copied to
target/classes once compilation completes already.

The integration test also uses our parent, rather than relying on what
Maven provides. That's because older Maven versions provide a default
compiler plugin version that did not handle the module path correctly.

Closes gh-33383
2024-07-30 10:56:06 +02:00
Stéphane Nicoll
6ab053d823 Merge branch '3.3.x'
Closes gh-41642
2024-07-29 16:56:29 +02:00
Stéphane Nicoll
a63a1fe6c5 Merge branch '3.2.x' into 3.3.x
Closes gh-41641
2024-07-29 16:56:18 +02:00
Stéphane Nicoll
47465f6ed5 Do not validate settings if publishing is disabled
This commit improves the Maven Plugin to only validate the publishing
settings if publishing is actually enabled.

Closes gh-29756
2024-07-29 16:55:02 +02: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
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
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
Moritz Halbritter
126927f462 Merge branch '3.2.x'
Closes gh-40499
2024-04-24 14:04:17 +02:00
Moritz Halbritter
b416db4dee Merge branch '3.1.x' into 3.2.x
Closes gh-40498
2024-04-24 14:04:08 +02:00
Moritz Halbritter
2cb19f368e Polish "Remove unnecessary nesting of calls to String.format"
See gh-40494
2024-04-24 13:57:07 +02:00
Hyeon Sung
0cf15fcad0 Remove unnecessary nesting of calls to String.format
See gh-40494
2024-04-24 13:55:04 +02:00
Andy Wilkinson
0ed6864d1d Merge branch '3.2.x'
Closes gh-40324
2024-04-11 16:54:46 +01:00