Skip to content

Commit e28338d

Browse files
philwebbphilwebb
committed
Rename spring-boot-cloudnativebuildpack
Rename the `spring-boot-cloudnativebuildpack` module to `spring-boot-buildpack-platform` and update the the package name to `org.springframework.boot.buildpack.platform`. Closes gh-19851
1 parent 2888896 commit e28338d

File tree

156 files changed

+301
-301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+301
-301
lines changed

‎eclipse/spring-boot-project.setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
name="spring-boot-tools">
128128
<predicate
129129
xsi:type="predicates:NamePredicate"
130-
pattern="spring-boot-(tools|antlib|configuration-.*|loader|.*-tools|*.layertools|.*-plugin|autoconfigure-processor|cloudnativebuildpack)"/>
130+
pattern="spring-boot-(tools|antlib|configuration-.*|loader|.*-tools|*.layertools|.*-plugin|autoconfigure-processor|buildpack.*)"/>
131131
</workingSet>
132132
<workingSet
133133
name="spring-boot-starters">

‎settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ include 'spring-boot-project:spring-boot-dependencies'
4141
include 'spring-boot-project:spring-boot-parent'
4242
include 'spring-boot-project:spring-boot-tools:spring-boot-antlib'
4343
include 'spring-boot-project:spring-boot-tools:spring-boot-autoconfigure-processor'
44-
include 'spring-boot-project:spring-boot-tools:spring-boot-cloudnativebuildpack'
44+
include 'spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform'
4545
include 'spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata'
4646
include 'spring-boot-project:spring-boot-tools:spring-boot-configuration-processor'
4747
include 'spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin'

‎spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ bom {
14211421
'spring-boot-actuator-autoconfigure',
14221422
'spring-boot-autoconfigure',
14231423
'spring-boot-autoconfigure-processor',
1424-
'spring-boot-cloudnativebuildpack',
1424+
'spring-boot-buildpack-platform',
14251425
'spring-boot-configuration-metadata',
14261426
'spring-boot-configuration-processor',
14271427
'spring-boot-devtools',

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/build.gradle renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id 'org.springframework.boot.internal-dependency-management'
66
}
77

8-
description = 'Spring Boot Cloud Native Buildpack'
8+
description = 'Spring Boot Buildpack Platform'
99

1010
dependencies {
1111
api platform(project(':spring-boot-project:spring-boot-parent'))
@@ -25,4 +25,4 @@ dependencies {
2525
testImplementation 'org.mockito:mockito-core'
2626
testImplementation 'org.mockito:mockito-junit-jupiter'
2727
testImplementation 'org.skyscreamer:jsonassert'
28-
}
28+
}

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/AbstractBuildLog.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/AbstractBuildLog.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.util.List;
2020
import java.util.function.Consumer;
2121

22-
import org.springframework.boot.cloudnativebuildpack.docker.LogUpdateEvent;
23-
import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressEvent;
24-
import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
25-
import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
26-
import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
22+
import org.springframework.boot.buildpack.platform.docker.LogUpdateEvent;
23+
import org.springframework.boot.buildpack.platform.docker.TotalProgressEvent;
24+
import org.springframework.boot.buildpack.platform.docker.type.Image;
25+
import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
26+
import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
2727

2828
/**
2929
* Base class for {@link BuildLog} implementations.

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/ApiVersion.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/ApiVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.util.regex.Matcher;
2020
import java.util.regex.Pattern;

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuildLog.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.io.PrintStream;
2020
import java.util.function.Consumer;
2121

22-
import org.springframework.boot.cloudnativebuildpack.docker.LogUpdateEvent;
23-
import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressEvent;
24-
import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
25-
import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
26-
import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
22+
import org.springframework.boot.buildpack.platform.docker.LogUpdateEvent;
23+
import org.springframework.boot.buildpack.platform.docker.TotalProgressEvent;
24+
import org.springframework.boot.buildpack.platform.docker.type.Image;
25+
import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
26+
import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
2727

2828
/**
2929
* Callback interface used to provide {@link Builder} output logging.

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuildOwner.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildOwner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.util.Map;
2020

21-
import org.springframework.boot.cloudnativebuildpack.io.Owner;
21+
import org.springframework.boot.buildpack.platform.io.Owner;
2222
import org.springframework.util.Assert;
2323
import org.springframework.util.StringUtils;
2424

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuildRequest.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.io.File;
2020
import java.util.Collections;
2121
import java.util.LinkedHashMap;
2222
import java.util.Map;
2323
import java.util.function.Function;
2424

25-
import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
26-
import org.springframework.boot.cloudnativebuildpack.io.Owner;
27-
import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
25+
import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
26+
import org.springframework.boot.buildpack.platform.io.Owner;
27+
import org.springframework.boot.buildpack.platform.io.TarArchive;
2828
import org.springframework.util.Assert;
2929

3030
/**

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/Builder.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Builder.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.io.IOException;
2020
import java.util.function.Consumer;
2121

22-
import org.springframework.boot.cloudnativebuildpack.build.BuilderMetadata.Stack;
23-
import org.springframework.boot.cloudnativebuildpack.docker.DockerApi;
24-
import org.springframework.boot.cloudnativebuildpack.docker.DockerException;
25-
import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressEvent;
26-
import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressPullListener;
27-
import org.springframework.boot.cloudnativebuildpack.docker.UpdateListener;
28-
import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
29-
import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
22+
import org.springframework.boot.buildpack.platform.build.BuilderMetadata.Stack;
23+
import org.springframework.boot.buildpack.platform.docker.DockerApi;
24+
import org.springframework.boot.buildpack.platform.docker.DockerException;
25+
import org.springframework.boot.buildpack.platform.docker.TotalProgressEvent;
26+
import org.springframework.boot.buildpack.platform.docker.TotalProgressPullListener;
27+
import org.springframework.boot.buildpack.platform.docker.UpdateListener;
28+
import org.springframework.boot.buildpack.platform.docker.type.Image;
29+
import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
3030
import org.springframework.util.Assert;
3131
import org.springframework.util.StringUtils;
3232

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuilderMetadata.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuilderMetadata.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.io.IOException;
2020
import java.lang.invoke.MethodHandles;
@@ -25,10 +25,10 @@
2525
import com.fasterxml.jackson.databind.JsonNode;
2626
import com.fasterxml.jackson.databind.node.ObjectNode;
2727

28-
import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
29-
import org.springframework.boot.cloudnativebuildpack.docker.type.ImageConfig;
30-
import org.springframework.boot.cloudnativebuildpack.json.MappedObject;
31-
import org.springframework.boot.cloudnativebuildpack.json.SharedObjectMapper;
28+
import org.springframework.boot.buildpack.platform.docker.type.Image;
29+
import org.springframework.boot.buildpack.platform.docker.type.ImageConfig;
30+
import org.springframework.boot.buildpack.platform.json.MappedObject;
31+
import org.springframework.boot.buildpack.platform.json.SharedObjectMapper;
3232
import org.springframework.util.Assert;
3333

3434
/**

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/EphemeralBuilder.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilder.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.io.IOException;
2020
import java.time.Clock;
2121
import java.time.Instant;
2222
import java.util.Map;
2323

24-
import org.springframework.boot.cloudnativebuildpack.build.BuilderMetadata.Stack.RunImage;
25-
import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
26-
import org.springframework.boot.cloudnativebuildpack.docker.type.ImageArchive;
27-
import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
28-
import org.springframework.boot.cloudnativebuildpack.docker.type.Layer;
29-
import org.springframework.boot.cloudnativebuildpack.io.Content;
30-
import org.springframework.boot.cloudnativebuildpack.io.Owner;
31-
import org.springframework.boot.cloudnativebuildpack.toml.Toml;
24+
import org.springframework.boot.buildpack.platform.build.BuilderMetadata.Stack.RunImage;
25+
import org.springframework.boot.buildpack.platform.docker.type.Image;
26+
import org.springframework.boot.buildpack.platform.docker.type.ImageArchive;
27+
import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
28+
import org.springframework.boot.buildpack.platform.docker.type.Layer;
29+
import org.springframework.boot.buildpack.platform.io.Content;
30+
import org.springframework.boot.buildpack.platform.io.Owner;
31+
import org.springframework.boot.buildpack.platform.toml.Toml;
3232

3333
/**
3434
* An short lived builder that is created for each {@link Lifecycle} run.

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/Lifecycle.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Lifecycle.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.io.Closeable;
2020
import java.io.IOException;
2121
import java.util.function.Consumer;
2222

23-
import org.springframework.boot.cloudnativebuildpack.docker.DockerApi;
24-
import org.springframework.boot.cloudnativebuildpack.docker.LogUpdateEvent;
25-
import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerConfig;
26-
import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerContent;
27-
import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerReference;
28-
import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
29-
import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
30-
import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
23+
import org.springframework.boot.buildpack.platform.docker.DockerApi;
24+
import org.springframework.boot.buildpack.platform.docker.LogUpdateEvent;
25+
import org.springframework.boot.buildpack.platform.docker.type.ContainerConfig;
26+
import org.springframework.boot.buildpack.platform.docker.type.ContainerContent;
27+
import org.springframework.boot.buildpack.platform.docker.type.ContainerReference;
28+
import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
29+
import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
30+
import org.springframework.boot.buildpack.platform.io.TarArchive;
3131
import org.springframework.util.Assert;
3232
import org.springframework.util.StringUtils;
3333

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/LifecycleVersion.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/LifecycleVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.util.Comparator;
2020

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/Phase.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Phase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.util.ArrayList;
2020
import java.util.Arrays;
2121
import java.util.LinkedHashMap;
2222
import java.util.List;
2323
import java.util.Map;
2424

25-
import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerConfig;
26-
import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
25+
import org.springframework.boot.buildpack.platform.docker.type.ContainerConfig;
26+
import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
2727
import org.springframework.util.StringUtils;
2828

2929
/**

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/PrintStreamBuildLog.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/PrintStreamBuildLog.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.io.PrintStream;
2020
import java.util.function.Consumer;
2121

22-
import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressBar;
23-
import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressEvent;
22+
import org.springframework.boot.buildpack.platform.docker.TotalProgressBar;
23+
import org.springframework.boot.buildpack.platform.docker.TotalProgressEvent;
2424

2525
/**
2626
* {@link BuildLog} implementation that prints output to a {@link PrintStream}.

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/StackId.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/StackId.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.build;
17+
package org.springframework.boot.buildpack.platform.build;
1818

1919
import java.util.Map;
2020

21-
import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
22-
import org.springframework.boot.cloudnativebuildpack.docker.type.ImageConfig;
21+
import org.springframework.boot.buildpack.platform.docker.type.Image;
22+
import org.springframework.boot.buildpack.platform.docker.type.ImageConfig;
2323
import org.springframework.util.Assert;
2424
import org.springframework.util.StringUtils;
2525

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/package-info.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
/**
1818
* Central API for performing a buildpack build.
1919
*/
20-
package org.springframework.boot.cloudnativebuildpack.build;
20+
package org.springframework.boot.buildpack.platform.build;

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApi.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.docker;
17+
package org.springframework.boot.buildpack.platform.docker;
1818

1919
import java.io.IOException;
2020
import java.net.URI;
@@ -26,16 +26,16 @@
2626

2727
import org.apache.http.client.utils.URIBuilder;
2828

29-
import org.springframework.boot.cloudnativebuildpack.docker.Http.Response;
30-
import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerConfig;
31-
import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerContent;
32-
import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerReference;
33-
import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
34-
import org.springframework.boot.cloudnativebuildpack.docker.type.ImageArchive;
35-
import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
36-
import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
37-
import org.springframework.boot.cloudnativebuildpack.json.JsonStream;
38-
import org.springframework.boot.cloudnativebuildpack.json.SharedObjectMapper;
29+
import org.springframework.boot.buildpack.platform.docker.Http.Response;
30+
import org.springframework.boot.buildpack.platform.docker.type.ContainerConfig;
31+
import org.springframework.boot.buildpack.platform.docker.type.ContainerContent;
32+
import org.springframework.boot.buildpack.platform.docker.type.ContainerReference;
33+
import org.springframework.boot.buildpack.platform.docker.type.Image;
34+
import org.springframework.boot.buildpack.platform.docker.type.ImageArchive;
35+
import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
36+
import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
37+
import org.springframework.boot.buildpack.platform.json.JsonStream;
38+
import org.springframework.boot.buildpack.platform.json.SharedObjectMapper;
3939
import org.springframework.util.Assert;
4040
import org.springframework.util.StringUtils;
4141

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerConnectionSocketFactory.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerConnectionSocketFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.docker;
17+
package org.springframework.boot.buildpack.platform.docker;
1818

1919
import java.io.IOException;
2020
import java.net.InetSocketAddress;
@@ -25,8 +25,8 @@
2525
import org.apache.http.conn.socket.ConnectionSocketFactory;
2626
import org.apache.http.protocol.HttpContext;
2727

28-
import org.springframework.boot.cloudnativebuildpack.socket.DomainSocket;
29-
import org.springframework.boot.cloudnativebuildpack.socket.NamedPipeSocket;
28+
import org.springframework.boot.buildpack.platform.socket.DomainSocket;
29+
import org.springframework.boot.buildpack.platform.socket.NamedPipeSocket;
3030

3131
/**
3232
* {@link ConnectionSocketFactory} that connects to the Docker domain socket or named

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerDnsResolver.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerDnsResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.docker;
17+
package org.springframework.boot.buildpack.platform.docker;
1818

1919
import java.net.InetAddress;
2020
import java.net.UnknownHostException;

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerException.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.docker;
17+
package org.springframework.boot.buildpack.platform.docker;
1818

1919
import java.net.URI;
2020

‎spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerHttpClientConnectionManager.java renamed to ‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerHttpClientConnectionManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.cloudnativebuildpack.docker;
17+
package org.springframework.boot.buildpack.platform.docker;
1818

1919
import org.apache.http.config.Registry;
2020
import org.apache.http.config.RegistryBuilder;

0 commit comments

Comments
 (0)