Commit Graph
126 Commits
Author SHA1 Message Date
Andy Wilkinson e33f3c6781 Expect deprecation warnings from Protobuf plugin
See gh-51428
2026-08-25 08:37:58 +01:00
Stéphane Nicoll 7b2cf7f27b Merge branch '4.0.x' into 4.1.x 2026-08-04 16:37:45 +02:00
Stéphane Nicoll e61ef57f30 Restore additional repositories for integrtion tests as well
As it turns out, intTest are also affected.

See gh-51266
2026-08-04 16:30:58 +02:00
Stéphane Nicoll d70bcd5389 Merge branch '4.0.x' into 4.1.x
Closes gh-51267
2026-08-04 15:52:30 +02:00
Stéphane Nicoll 4c8de39294 Restore additional repositories for docker tests
This commit reverts partially what was done in gh-49397 to let docker
tests have access to additional maven repositories. Unfortunately, maven
build executions with the Spring Boot Maven Plugin do not use the BOM
for dependency management. As such, if one of the dependency requires
a dependency that has not been prepared in the local repository, it will
need to be able to download it from the relevant repository.

This is the case with spring-core that the maven plugin depends on when
Spring Framework and Spring Boot do not use the same Micrometer version:
the build prepares the version that Spring Boot uses, but the build
execution attempts to download the one that Spring Framework relies on.

Closes gh-51266
2026-08-04 15:41:43 +02:00
Andy Wilkinson 811f3a225b Merge branch '4.0.x' into 4.1.x
Closes gh-51164
2026-07-30 12:38:23 +01:00
Andy Wilkinson 6c19b31fb7 Update the build for release train participation
Closes gh-51163
2026-07-30 12:37:42 +01:00
Stéphane Nicoll d107f342f0 Merge branch '4.0.x' into 4.1.x
Closes gh-51104
2026-07-23 12:25:25 +02:00
Manu Sridharan b6f117c9cd Adapt function types in ClassPath to avoid nullability warning
See gh-51091

Signed-off-by: Manu Sridharan <msridhar@gmail.com>
2026-07-23 12:19:57 +02:00
Stéphane Nicoll 15c7518da5 Merge branch '4.0.x' into 4.1.x
Closes gh-50959
2026-07-16 11:09:08 +02:00
Sebastien Tardif c3153dc39f Close JarFile when finding main class from archive
MainClassFinder.findSingleMainClass(JarFile, ...) does not close the
JarFile; the caller owns the resource. FindMainClass passed a newly
opened JarFile without closing it, unlike sibling call sites that use
try-with-resources.

See gh-50949

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>
2026-07-16 11:08:06 +02:00
Stéphane Nicoll a500eaaefe Merge branch '4.0.x' 2026-07-15 08:02:02 +02:00
Stéphane Nicoll 8c6c3fd1e4 Polish "Upgrade to Gradle 9.6.1"
Stop using providers.properties as it is deprecated

See gh-50793
2026-07-15 07:51:22 +02:00
Stéphane Nicoll c7dd44815a Upgrade to Native Build Tools Plugin 1.1.4
Closes gh-50947
2026-07-14 16:20:52 +02:00
Stéphane Nicoll 2eedeabe9a Upgrade to Gradle 9.6.1
This commit also suppresses new warnings from the Native Build Tools
Plugin, see https://github.com/graalvm/native-build-tools/pull/903

Closes gh-50793
2026-07-14 16:03:14 +02:00
Andy Wilkinson 7a45ee8767 Merge branch '4.0.x'
Closes gh-50851
2026-06-24 19:12:35 +01:00
Yanming Zhou 9d5c98b7e9 Replace isAssignableFrom() with isInstance() where feasible
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-50750
2026-06-24 19:11:59 +01:00
Doehyun Baek f7c2c0b2a6 Align documentation with changes made during 4.1's development
Signed-off-by: Doehyun Baek <doehyunbaek@gmail.com>

See gh-50800
2026-06-24 15:44:05 +01:00
Andy Wilkinson 7483278e7d Only apply grpc defaults when grpc plugin is configured
Previously, Spring Boot's Gradle plugin reacted to the Protobuf
plugin by configuring Protobuf's grpc plugin. This worked well for
projects using gRPC but went too far for those using Protobuf
without gRPC.

This commit dials the support back a little bit. Now, our recommended
gRPC defaults are only applied when Protobuf is configured with the
grpc plugin.

Closes gh-50822
2026-06-24 08:58:17 +01:00
Stéphane Nicoll 6a625e292c Merge branch '4.0.x'
Closes gh-50620
2026-05-29 12:36:56 +02:00
Stéphane Nicoll 8845b31cf9 Merge branch '3.5.x' into 4.0.x
Closes gh-50619
2026-05-29 12:36:08 +02:00
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