Commit Graph
105 Commits
Author SHA1 Message Date
Andy Wilkinson 6a74bb85a3 Merge branch '4.0.x'
Closes gh-50440
2026-05-14 15:03:44 +01:00
Andy Wilkinson add52b6ccd Merge branch '3.5.x' into 4.0.x
Closes gh-50439
2026-05-14 15:02:24 +01:00
Dongliang Xie 6d307ed250 Align protoc version with protobuf-java
Update `ProtobufPluginAction` to align the protoc version with
`protobuf-java` rather than `protobuf-java-util`. The util
jar is only required for server gRPC code.

See gh-50405

Signed-off-by: Dongliang Xie <dragonfsky@gmail.com>
2026-05-12 08:58:47 -07:00
Phillip Webb b23ad48047 Simplify ProtobufPluginAction versionFromRuntimeClasspath
Simplify the stream logic to make use of `getAllComponents()`
rather than using `getAllDependencies()` and
`DependencyResult::getFrom`.

See gh-50405
2026-05-12 08:56:00 -07:00
Phillip Webb 796b0343c6 Merge branch '4.0.x'
Closes gh-50291
2026-05-04 15:37:42 -07:00
Phillip Webb a6895e3da2 Merge branch '3.5.x' into 4.0.x
Closes gh-50289
2026-05-04 14:03:03 -07:00
Stéphane Nicoll 61ca2f51cd Merge branch '4.0.x'
Closes gh-50114
2026-04-18 09:40:21 +02:00
Stéphane Nicoll 63fd49758c Merge branch '3.5.x' into 4.0.x
Closes gh-50113
2026-04-18 09:40:14 +02:00
Stéphane Nicoll ee4457457d Merge branch '4.0.x'
Closes gh-50112
2026-04-18 09:31:24 +02:00
Stéphane Nicoll a9f458c55a Merge branch '3.5.x' into 4.0.x
Closes gh-50111
2026-04-18 09:31:17 +02:00
Moritz Halbritter d7334fed64 Upgrade to Native Build Tools Plugin 1.0.0
Closes gh-49920
2026-04-07 09:31:33 +02:00
Stéphane Nicoll 3972d42a8f Add support for loading layers configuration from the plugin classpath
This commit introduces an alternative to load layers configuration from
the classpath. This lets user package their custom layers XML at
META-INF/spring/layers/<name>.xml in a plugin dependency rather than
referencing a file path directly.

The name of the layers configuration can then be referenced using the
new `configurationName` property.

Closes gh-32466
2026-03-27 17:39:18 +01:00
Andy Wilkinson a052376237 Configure protobuf when com.google.protobuf plugin is applied
Update spring-boot-gradle plugin to apply protobuf configuration
when the `com.google.protobuf` plugin is detected.

Closes gh-49369
2026-03-19 15:12:30 -07:00
Stéphane Nicoll a7b86cd49c Merge branch '4.0.x' 2026-03-16 16:05:07 +01:00
Stéphane Nicoll 5896b0cba8 Merge branch '3.5.x' into 4.0.x 2026-03-16 16:04:56 +01:00
Andy Wilkinson 255626f29e Upgrade to Kotlin 2.3.20
Closes gh-49613
2026-03-16 14:08:30 +00:00
Andy Wilkinson e7c0bec8ab Improve input/output configuration of DSL-created bootBuildInfo task
There are two problems with the current approach:

1. The DSL uses dependsOn to try to inform Gradle of the dependency
   relationship between tasks. This isn't recommended and inputs and
   outputs should be used instead.
2. The generated build-info.properties file doesn't appear on the
   classpath when running an application in an IDE, unless that IDE
   delegates the execution to Gradle.

This commit addresses both of these shortcomings by configuring the
bootBuildInfo task's output to be a src dir of the main source set's
resources. This gives Gradle the preferred input- and output-based
view of the tasks' interdependencies. It also causes the generated
build-info.properties to appear on the classpath in IDEs that don't
delegate to Gradle. For example, the Eclipse Buildship plugin
automatically configures build/bootBuildInfo as a source folder on
the project's build path.

Closes gh-49547
2026-03-11 10:11:46 +00:00
Moritz Halbritter 662f5841df Merge branch '4.0.x'
Closes gh-49513
2026-03-09 09:48:15 +01:00
Moritz Halbritter 1edf7b8e9b Merge branch '3.5.x' into 4.0.x
Closes gh-49512
2026-03-09 09:48:00 +01:00
Stéphane Nicoll fde18f4523 Upgrade to Native Build Tools Plugin 0.11.5
Closes gh-49498
2026-03-07 11:29:27 +01:00
Stéphane Nicoll e3e167bf9b Upgrade to Native Build Tools Plugin 0.11.5
Closes gh-49475
2026-03-07 08:50:31 +01:00
Andy Wilkinson 5ba6340ed7 Merge branch '4.0.x' 2026-03-05 20:52:39 +00:00
Andy Wilkinson b6f52e6d63 Merge branch '3.5.x' into 4.0.x 2026-03-05 20:52:28 +00:00
Andy Wilkinson b8a710bcc4 Merge branch '4.0.x'
Closes gh-49398
2026-03-04 12:31:04 +00:00
Andy Wilkinson 85dd0c72b4 Merge branch '3.5.x' into 4.0.x
Closes gh-49397
2026-03-04 12:30:47 +00:00
Andy Wilkinson d76f056249 Merge branch '4.0.x'
Closes gh-49322
2026-02-25 10:05:01 +00:00
Andy Wilkinson 14444669fe Merge branch '3.5.x' into 4.0.x
Closes gh-49321
2026-02-25 10:04:41 +00:00
Stéphane Nicoll 7cc47e60ec Merge branch '4.0.x'
Closes gh-49296
2026-02-23 12:49:20 +01:00
Stéphane Nicoll 5f8a752070 Merge branch '3.5.x' into 4.0.x
Closes gh-49295
2026-02-23 12:49:12 +01:00
Andy Wilkinson 542ea4f18a Polish "Support configuring bootBuildImage's environment on the command line"
See gh-48792
2026-01-12 15:51:26 +00:00
HuitaePark a1c83b52b0 Support configuring bootBuildImage's environment on the command line
Accumulate command line --environment values in a ListProperty and
merge them with the configured environment when building the
effective environment map. Add a test that verifies multiple entries
are accepted and propagated.

See gh-48792

Signed-off-by: HuitaePark <qkrgmlxo3174@gmail.com>
2026-01-12 15:51:13 +00:00
Andy Wilkinson c12e1dc872 Upgrade to Kotlin 2.3.0
Closes gh-48745
2026-01-09 09:54:21 +00:00
Andy Wilkinson 3d6671d47a Merge branch '4.0.x'
Closes gh-48701
2026-01-08 12:14:50 +00:00
Andy Wilkinson 0ffffee4bf Upgrade to Nullability Plugin 0.0.9
Closes gh-48638
2026-01-08 11:59:51 +00:00
Stéphane Nicoll 55d7550df2 Merge branch '3.5.x' into 4.0.x
Closes gh-48662
2026-01-02 14:36:05 +01:00
Stéphane Nicoll 4c14695322 Merge branch '4.0.x' 2026-01-02 10:48:03 +01:00
Stéphane Nicoll 57ae8a5778 Merge branch '3.5.x' into 4.0.x 2026-01-02 10:47:53 +01:00
Stéphane Nicoll ca4a11c672 Merge branch '4.0.x'
Closes gh-48644
2025-12-30 13:25:59 +01:00
Stéphane Nicoll 2ef60a10da Clarify how to include devtools using Maven
Closes gh-48641
2025-12-30 13:25:14 +01:00
Stéphane Nicoll a4e49c1e0a Revisit condition to skip AOT processing of tests
This commit stop skipping AOT processing of tests when tests execution
is skipped. With this commit, only the presence of maven.test.skip makes
the processing to skip.

This harmonize the behavior with other standard plugins that do react
to the property. For instance, the compiler plugin will not compile the
tests if that property is set, but would do so if skipTests was
provided.

Closes gh-46929
2025-12-23 17:22:52 +01:00
Stéphane Nicoll da56bfea6e Remove support for the deprecated layertools jar mode
Closes gh-48568
2025-12-22 08:36:52 +01:00
Stefano Cordio b2b0fed285 Decorate all Assert implementations with @CheckReturnValue
See gh-46766

Signed-off-by: Stefano Cordio <stefano.cordio@gmail.com>
2025-12-19 10:39:37 +01:00
Stéphane Nicoll 458f7f6ac9 Polish "Start development of Spring Boot 4.1.x" 2025-12-19 10:31:22 +01:00
Phillip Webb 0254c693cf Merge branch '3.5.x'
Closes gh-48478
2025-12-09 08:42:36 -08:00
Andy Wilkinson b5703eaa4c Merge branch '3.5.x'
Closes gh-48300
2025-11-26 12:43:51 +00:00
Phillip Webb 2685f4bf29 Change tomcat and jetty runtime modules to starters
Change `spring-boot-tomcat-runtime` and `spring-boot-jetty-runtime`
into starter POMs and reduce the number of dependencies needed for
`spring-boot-tomcat` and `spring-boot-jetty`.

The runtime starters provide only the jars required to run the
embedded server along with the module jar itself (excluding transitive
dependencies) and `spring-boot-webserver` (excluding transitive
dependencies).

The build setup required for an executable jar is slightly different
between Maven and Gradle. For Maven, the regular module is put in the
`provided` scope. For Gradle, the regular module remains in main
configuration and the runtime jar is put in the `providedRuntime`
configuration. The reference documentation has been updated to
show how to configure things if starters are being used.

Manual testing has been performed to ensure that wars build with Maven
and Gradle work with both Tomcat and Jetty in both deployed and
`java -jar` modes.

Closes gh-48175
2025-11-19 21:59:03 -08:00
Phillip Webb 2e75008ba1 Merge branch '3.5.x'
Closes gh-48197
2025-11-19 21:58:48 -08:00
Phillip Webb 2e54aa6760 Merge branch '3.5.x'
Closes gh-48160
2025-11-17 21:00:09 -08:00
Stéphane Nicoll d1e5fe3248 Merge branch '3.5.x'
Closes gh-48106
2025-11-13 10:31:25 +01:00
Andy Wilkinson 0e44f1de42 Merge branch '3.5.x' 2025-11-10 10:39:32 +00:00