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

Merge branch '3.4.x'

Browse Source
This commit is contained in:
Phillip Webb
2025-04-11 09:42:20 -07:00
parent 0d4b1dc9a4 35dc8e6f88
commit 75824bb9c7
25 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Phase.java
View File

@@ -1,5 +1,9 @@
/*
<<<<<<< HEAD
* Copyright 2012-2024 the original author or authors.
=======
* Copyright 2012-2025 the original author or authors.
>>>>>>> 3.3.x
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,7 +42,7 @@ class Phase {
private final String name;
private boolean daemonAccess = false;
private boolean daemonAccess;
private final List<String> args = new ArrayList<>();
@@ -50,7 +54,7 @@ class Phase {
private String networkMode;
private boolean requiresApp = false;
private boolean requiresApp;
/**
* Create a new {@link Phase} instance.