Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
Closes gh-40700
This commit is contained in:
Moritz Halbritter
2024-05-13 11:30:42 +02:00
parent e55773d14e 8c300b1652
commit 364af04377
9 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImage.java
View File

@@ -49,6 +49,7 @@ import org.springframework.boot.buildpack.platform.docker.type.ImageName;
import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
import org.springframework.boot.buildpack.platform.io.ZipFileTarArchive;
import org.springframework.boot.gradle.util.VersionExtractor;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
/**
@@ -382,7 +383,7 @@ public abstract class BootBuildImage extends DefaultTask {
private BuildRequest customizeEnvironment(BuildRequest request) {
Map<String, String> environment = getEnvironment().getOrNull();
if (environment != null && !environment.isEmpty()) {
if (!CollectionUtils.isEmpty(environment)) {
request = request.withEnv(environment);
}
return request;
@@ -411,7 +412,7 @@ public abstract class BootBuildImage extends DefaultTask {
private BuildRequest customizeBuildpacks(BuildRequest request) {
List<String> buildpacks = getBuildpacks().getOrNull();
if (buildpacks != null && !buildpacks.isEmpty()) {
if (!CollectionUtils.isEmpty(buildpacks)) {
return request.withBuildpacks(buildpacks.stream().map(BuildpackReference::of).toList());
}
return request;
@@ -419,7 +420,7 @@ public abstract class BootBuildImage extends DefaultTask {
private BuildRequest customizeBindings(BuildRequest request) {
List<String> bindings = getBindings().getOrNull();
if (bindings != null && !bindings.isEmpty()) {
if (!CollectionUtils.isEmpty(bindings)) {
return request.withBindings(bindings.stream().map(Binding::of).toList());
}
return request;
@@ -427,7 +428,7 @@ public abstract class BootBuildImage extends DefaultTask {
private BuildRequest customizeTags(BuildRequest request) {
List<String> tags = getTags().getOrNull();
if (tags != null && !tags.isEmpty()) {
if (!CollectionUtils.isEmpty(tags)) {
return request.withTags(tags.stream().map(ImageReference::of).toList());
}
return request;

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LaunchScriptConfiguration.java
View File

@@ -30,6 +30,8 @@ import org.gradle.api.tasks.PathSensitive;
import org.gradle.api.tasks.PathSensitivity;
import org.gradle.api.tasks.bundling.AbstractArchiveTask;
import org.springframework.util.StringUtils;
/**
* Encapsulates the configuration of the launch script for an executable jar or war.
*
@@ -111,7 +113,7 @@ public class LaunchScriptConfiguration implements Serializable {
private void putIfMissing(Map<String, String> properties, String key, String... valueCandidates) {
if (!properties.containsKey(key)) {
for (String candidate : valueCandidates) {
if (candidate != null && !candidate.isEmpty()) {
if (StringUtils.hasLength(candidate)) {
properties.put(key, candidate);
return;
}