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

eclipse/spring-boot-project.setup

@@ -127,7 +127,7 @@
         name="spring-boot-tools">
       <predicate
           xsi:type="predicates:NamePredicate"
-          pattern="spring-boot-(tools|antlib|configuration-.*|loader|.*-tools|*.layertools|.*-plugin|autoconfigure-processor|cloudnativebuildpack)"/>
+          pattern="spring-boot-(tools|antlib|configuration-.*|loader|.*-tools|*.layertools|.*-plugin|autoconfigure-processor|buildpack.*)"/>
     </workingSet>
     <workingSet
         name="spring-boot-starters">

settings.gradle

@@ -41,7 +41,7 @@ include 'spring-boot-project:spring-boot-dependencies'
 include 'spring-boot-project:spring-boot-parent'
 include 'spring-boot-project:spring-boot-tools:spring-boot-antlib'
 include 'spring-boot-project:spring-boot-tools:spring-boot-autoconfigure-processor'
-include 'spring-boot-project:spring-boot-tools:spring-boot-cloudnativebuildpack'
+include 'spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform'
 include 'spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata'
 include 'spring-boot-project:spring-boot-tools:spring-boot-configuration-processor'
 include 'spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin'

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

@@ -1421,7 +1421,7 @@ bom {
 				'spring-boot-actuator-autoconfigure',
 				'spring-boot-autoconfigure',
 				'spring-boot-autoconfigure-processor',
-				'spring-boot-cloudnativebuildpack',
+				'spring-boot-buildpack-platform',
 				'spring-boot-configuration-metadata',
 				'spring-boot-configuration-processor',
 				'spring-boot-devtools',

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/build.gradle → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle

@@ -5,7 +5,7 @@ plugins {
 	id 'org.springframework.boot.internal-dependency-management'
 }
 
-description = 'Spring Boot Cloud Native Buildpack'
+description = 'Spring Boot Buildpack Platform'
 
 dependencies {
 	api platform(project(':spring-boot-project:spring-boot-parent'))
@@ -25,4 +25,4 @@ dependencies {
 	testImplementation 'org.mockito:mockito-core'
 	testImplementation 'org.mockito:mockito-junit-jupiter'
 	testImplementation 'org.skyscreamer:jsonassert'
-}
\ No newline at end of file
+}

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

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.util.List;
 import java.util.function.Consumer;
 
-import org.springframework.boot.cloudnativebuildpack.docker.LogUpdateEvent;
-import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressEvent;
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
+import org.springframework.boot.buildpack.platform.docker.LogUpdateEvent;
+import org.springframework.boot.buildpack.platform.docker.TotalProgressEvent;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
 
 /**
  * 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 → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/ApiVersion.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

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

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.PrintStream;
 import java.util.function.Consumer;
 
-import org.springframework.boot.cloudnativebuildpack.docker.LogUpdateEvent;
-import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressEvent;
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
+import org.springframework.boot.buildpack.platform.docker.LogUpdateEvent;
+import org.springframework.boot.buildpack.platform.docker.TotalProgressEvent;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
 
 /**
  * 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 → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildOwner.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.util.Map;
 
-import org.springframework.boot.cloudnativebuildpack.io.Owner;
+import org.springframework.boot.buildpack.platform.io.Owner;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.File;
 import java.util.Collections;
@@ -22,9 +22,9 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Function;
 
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.io.Owner;
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.io.Owner;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
 import org.springframework.util.Assert;
 
 /**

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

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.IOException;
 import java.util.function.Consumer;
 
-import org.springframework.boot.cloudnativebuildpack.build.BuilderMetadata.Stack;
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi;
-import org.springframework.boot.cloudnativebuildpack.docker.DockerException;
-import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressEvent;
-import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressPullListener;
-import org.springframework.boot.cloudnativebuildpack.docker.UpdateListener;
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.build.BuilderMetadata.Stack;
+import org.springframework.boot.buildpack.platform.docker.DockerApi;
+import org.springframework.boot.buildpack.platform.docker.DockerException;
+import org.springframework.boot.buildpack.platform.docker.TotalProgressEvent;
+import org.springframework.boot.buildpack.platform.docker.TotalProgressPullListener;
+import org.springframework.boot.buildpack.platform.docker.UpdateListener;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
@@ -25,10 +25,10 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageConfig;
-import org.springframework.boot.cloudnativebuildpack.json.MappedObject;
-import org.springframework.boot.cloudnativebuildpack.json.SharedObjectMapper;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageConfig;
+import org.springframework.boot.buildpack.platform.json.MappedObject;
+import org.springframework.boot.buildpack.platform.json.SharedObjectMapper;
 import org.springframework.util.Assert;
 
 /**

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

@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.IOException;
 import java.time.Clock;
 import java.time.Instant;
 import java.util.Map;
 
-import org.springframework.boot.cloudnativebuildpack.build.BuilderMetadata.Stack.RunImage;
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageArchive;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.docker.type.Layer;
-import org.springframework.boot.cloudnativebuildpack.io.Content;
-import org.springframework.boot.cloudnativebuildpack.io.Owner;
-import org.springframework.boot.cloudnativebuildpack.toml.Toml;
+import org.springframework.boot.buildpack.platform.build.BuilderMetadata.Stack.RunImage;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageArchive;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.docker.type.Layer;
+import org.springframework.boot.buildpack.platform.io.Content;
+import org.springframework.boot.buildpack.platform.io.Owner;
+import org.springframework.boot.buildpack.platform.toml.Toml;
 
 /**
  * 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 → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Lifecycle.java

@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.function.Consumer;
 
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi;
-import org.springframework.boot.cloudnativebuildpack.docker.LogUpdateEvent;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerConfig;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerContent;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerReference;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
+import org.springframework.boot.buildpack.platform.docker.DockerApi;
+import org.springframework.boot.buildpack.platform.docker.LogUpdateEvent;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerConfig;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerContent;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerReference;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.util.Comparator;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,8 +22,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerConfig;
-import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerConfig;
+import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
 import org.springframework.util.StringUtils;
 
 /**

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

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.PrintStream;
 import java.util.function.Consumer;
 
-import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressBar;
-import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressEvent;
+import org.springframework.boot.buildpack.platform.docker.TotalProgressBar;
+import org.springframework.boot.buildpack.platform.docker.TotalProgressEvent;
 
 /**
  * {@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 → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/StackId.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.util.Map;
 
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageConfig;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageConfig;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

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

@@ -17,4 +17,4 @@
 /**
  * Central API for performing a buildpack build.
  */
-package org.springframework.boot.cloudnativebuildpack.build;
+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 → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.io.IOException;
 import java.net.URI;
@@ -26,16 +26,16 @@ import java.util.List;
 
 import org.apache.http.client.utils.URIBuilder;
 
-import org.springframework.boot.cloudnativebuildpack.docker.Http.Response;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerConfig;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerContent;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerReference;
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageArchive;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
-import org.springframework.boot.cloudnativebuildpack.json.JsonStream;
-import org.springframework.boot.cloudnativebuildpack.json.SharedObjectMapper;
+import org.springframework.boot.buildpack.platform.docker.Http.Response;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerConfig;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerContent;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerReference;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageArchive;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
+import org.springframework.boot.buildpack.platform.json.JsonStream;
+import org.springframework.boot.buildpack.platform.json.SharedObjectMapper;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -25,8 +25,8 @@ import org.apache.http.HttpHost;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.protocol.HttpContext;
 
-import org.springframework.boot.cloudnativebuildpack.socket.DomainSocket;
-import org.springframework.boot.cloudnativebuildpack.socket.NamedPipeSocket;
+import org.springframework.boot.buildpack.platform.socket.DomainSocket;
+import org.springframework.boot.buildpack.platform.socket.NamedPipeSocket;
 
 /**
  * {@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 → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerDnsResolver.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.net.URI;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerSchemePortResolver.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerSchemePortResolver.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import org.apache.http.HttpHost;
 import org.apache.http.conn.SchemePortResolver;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/Errors.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/Errors.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.util.Collections;
 import java.util.Iterator;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/Http.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/Http.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -22,7 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URI;
 
-import org.springframework.boot.cloudnativebuildpack.io.IOConsumer;
+import org.springframework.boot.buildpack.platform.io.IOConsumer;
 
 /**
  * HTTP transport used by the {@link DockerApi}.

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/HttpClientHttp.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/HttpClientHttp.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,9 +38,9 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 
-import org.springframework.boot.cloudnativebuildpack.io.Content;
-import org.springframework.boot.cloudnativebuildpack.io.IOConsumer;
-import org.springframework.boot.cloudnativebuildpack.json.SharedObjectMapper;
+import org.springframework.boot.buildpack.platform.io.Content;
+import org.springframework.boot.buildpack.platform.io.IOConsumer;
+import org.springframework.boot.buildpack.platform.json.SharedObjectMapper;
 
 /**
  * {@link Http} implementation backed by a {@link HttpClient}.

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/LoadImageUpdateEvent.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/LoadImageUpdateEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/LogUpdateEvent.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/LogUpdateEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.io.IOException;
 import java.io.InputStream;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/ProgressUpdateEvent.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ProgressUpdateEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/PullImageUpdateEvent.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/PullImageUpdateEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressBar.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressBar.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.io.PrintStream;
 import java.util.function.Consumer;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressEvent.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import org.springframework.util.Assert;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressPullListener.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressPullListener.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 
-import org.springframework.boot.cloudnativebuildpack.docker.ProgressUpdateEvent.ProgressDetail;
+import org.springframework.boot.buildpack.platform.docker.ProgressUpdateEvent.ProgressDetail;
 
 /**
  * {@link UpdateListener} that calculates the total progress of the entire pull operation

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/UpdateEvent.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/UpdateEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 /**
  * Base class for update events published by Docker.

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/UpdateListener.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/UpdateListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 /**
  * Listener for update events published from the {@link DockerApi}.

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/package-info.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/package-info.java

@@ -17,4 +17,4 @@
 /**
  * A limited Docker API providing the operations needed by pack.
  */
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerConfig.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ContainerConfig.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import org.springframework.boot.cloudnativebuildpack.json.SharedObjectMapper;
+import org.springframework.boot.buildpack.platform.json.SharedObjectMapper;
 import org.springframework.util.Assert;
 import org.springframework.util.StreamUtils;
 import org.springframework.util.StringUtils;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerContent.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ContainerContent.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
 import org.springframework.util.Assert;
 
 /**

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerReference.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ContainerReference.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import org.springframework.util.Assert;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/Image.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Image.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
-import org.springframework.boot.cloudnativebuildpack.json.MappedObject;
+import org.springframework.boot.buildpack.platform.json.MappedObject;
 
 /**
  * Image details as returned from {@code Docker inspect}.

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageArchive.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageArchive.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -33,13 +33,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import org.springframework.boot.cloudnativebuildpack.io.Content;
-import org.springframework.boot.cloudnativebuildpack.io.IOConsumer;
-import org.springframework.boot.cloudnativebuildpack.io.InspectedContent;
-import org.springframework.boot.cloudnativebuildpack.io.Layout;
-import org.springframework.boot.cloudnativebuildpack.io.Owner;
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
-import org.springframework.boot.cloudnativebuildpack.json.SharedObjectMapper;
+import org.springframework.boot.buildpack.platform.io.Content;
+import org.springframework.boot.buildpack.platform.io.IOConsumer;
+import org.springframework.boot.buildpack.platform.io.InspectedContent;
+import org.springframework.boot.buildpack.platform.io.Layout;
+import org.springframework.boot.buildpack.platform.io.Owner;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
+import org.springframework.boot.buildpack.platform.json.SharedObjectMapper;
 import org.springframework.util.Assert;
 
 /**

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageConfig.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageConfig.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.lang.invoke.MethodHandles;
 import java.util.Collections;
@@ -25,7 +25,7 @@ import java.util.function.Consumer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import org.springframework.boot.cloudnativebuildpack.json.MappedObject;
+import org.springframework.boot.buildpack.platform.json.MappedObject;
 
 /**
  * Image configuration information.

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageName.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageName.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import org.springframework.util.Assert;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageReference.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageReference.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.io.File;
 import java.util.regex.Matcher;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/Layer.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Layer.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import org.springframework.boot.cloudnativebuildpack.io.Content;
-import org.springframework.boot.cloudnativebuildpack.io.IOConsumer;
-import org.springframework.boot.cloudnativebuildpack.io.InspectedContent;
-import org.springframework.boot.cloudnativebuildpack.io.Layout;
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
+import org.springframework.boot.buildpack.platform.io.Content;
+import org.springframework.boot.buildpack.platform.io.IOConsumer;
+import org.springframework.boot.buildpack.platform.io.InspectedContent;
+import org.springframework.boot.buildpack.platform.io.Layout;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
 import org.springframework.util.Assert;
 
 /**

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/LayerId.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/LayerId.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.math.BigInteger;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/RandomString.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/RandomString.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.util.Random;
 import java.util.stream.IntStream;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/VolumeName.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/VolumeName.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/package-info.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Docker types.
  */
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/Content.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/Content.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/DefaultOwner.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/DefaultOwner.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 /**
  * Default {@link Owner} implementation.

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/IOConsumer.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/IOConsumer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.IOException;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/IOSupplier.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/IOSupplier.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.IOException;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/InspectedContent.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/InspectedContent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/Layout.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/Layout.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.IOException;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/Owner.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/Owner.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 /**
  * A user and group ID that can be used to indicate file ownership.

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/TarArchive.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/TarArchive.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.File;
 import java.io.IOException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/TarLayoutWriter.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/TarLayoutWriter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.Closeable;
 import java.io.IOException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/ZipFileTarArchive.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/ZipFileTarArchive.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.File;
 import java.io.IOException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/package-info.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/package-info.java

@@ -17,4 +17,4 @@
 /**
  * IO classes and utilities.
  */
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/JsonStream.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/JsonStream.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.json;
+package org.springframework.boot.buildpack.platform.json;
 
 import java.io.IOException;
 import java.io.InputStream;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/MappedObject.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/MappedObject.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.json;
+package org.springframework.boot.buildpack.platform.json;
 
 import java.io.IOException;
 import java.io.InputStream;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/SharedObjectMapper.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/SharedObjectMapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.json;
+package org.springframework.boot.buildpack.platform.json;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/package-info.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Utilities and classes for JSON processing.
  */
-package org.springframework.boot.cloudnativebuildpack.json;
+package org.springframework.boot.buildpack.platform.json;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/AbstractSocket.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/AbstractSocket.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.socket;
+package org.springframework.boot.buildpack.platform.socket;
 
 import java.io.IOException;
 import java.net.InetAddress;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/BsdDomainSocket.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/BsdDomainSocket.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.socket;
+package org.springframework.boot.buildpack.platform.socket;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/DomainSocket.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/DomainSocket.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.socket;
+package org.springframework.boot.buildpack.platform.socket;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,7 +26,7 @@ import com.sun.jna.LastErrorException;
 import com.sun.jna.Native;
 import com.sun.jna.Platform;
 
-import org.springframework.boot.cloudnativebuildpack.socket.FileDescriptor.Handle;
+import org.springframework.boot.buildpack.platform.socket.FileDescriptor.Handle;
 
 /**
  * A {@link Socket} implementation for Linux of BSD domain sockets.

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/FileDescriptor.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/FileDescriptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.socket;
+package org.springframework.boot.buildpack.platform.socket;
 
 import java.io.Closeable;
 import java.io.IOException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/LinuxDomainSocket.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/LinuxDomainSocket.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.socket;
+package org.springframework.boot.buildpack.platform.socket;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/NamedPipeSocket.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/NamedPipeSocket.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.socket;
+package org.springframework.boot.buildpack.platform.socket;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/package-info.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Low-level {@link java.net.Socket} implementations required for local Docker access.
  */
-package org.springframework.boot.cloudnativebuildpack.socket;
+package org.springframework.boot.buildpack.platform.socket;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/toml/Toml.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/toml/Toml.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.toml;
+package org.springframework.boot.buildpack.platform.toml;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/toml/package-info.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/toml/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Support for writing TOML content.
  */
-package org.springframework.boot.cloudnativebuildpack.toml;
+package org.springframework.boot.buildpack.platform.toml;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/ApiVersionTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/ApiVersionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuildLogTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildLogTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuildOwnerTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildOwnerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuildRequestTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildRequestTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -30,9 +30,9 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.io.Owner;
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.io.Owner;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuilderMetadataTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderMetadataTests.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.IOException;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageConfig;
-import org.springframework.boot.cloudnativebuildpack.json.AbstractJsonTests;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageConfig;
+import org.springframework.boot.buildpack.platform.json.AbstractJsonTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuilderTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -24,15 +24,15 @@ import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.stubbing.Answer;
 
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi;
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi.ContainerApi;
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi.ImageApi;
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi.VolumeApi;
-import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressPullListener;
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageArchive;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
+import org.springframework.boot.buildpack.platform.docker.DockerApi;
+import org.springframework.boot.buildpack.platform.docker.DockerApi.ContainerApi;
+import org.springframework.boot.buildpack.platform.docker.DockerApi.ImageApi;
+import org.springframework.boot.buildpack.platform.docker.DockerApi.VolumeApi;
+import org.springframework.boot.buildpack.platform.docker.TotalProgressPullListener;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageArchive;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/EphemeralBuilderTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -37,11 +37,11 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageArchive;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageConfig;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.json.AbstractJsonTests;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageArchive;
+import org.springframework.boot.buildpack.platform.docker.type.ImageConfig;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.json.AbstractJsonTests;
 import org.springframework.util.FileCopyUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/LifecycleTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -33,18 +33,18 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.stubbing.Answer;
 
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi;
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi.ContainerApi;
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi.ImageApi;
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi.VolumeApi;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerConfig;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerContent;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerReference;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
-import org.springframework.boot.cloudnativebuildpack.io.IOConsumer;
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
-import org.springframework.boot.cloudnativebuildpack.json.SharedObjectMapper;
+import org.springframework.boot.buildpack.platform.docker.DockerApi;
+import org.springframework.boot.buildpack.platform.docker.DockerApi.ContainerApi;
+import org.springframework.boot.buildpack.platform.docker.DockerApi.ImageApi;
+import org.springframework.boot.buildpack.platform.docker.DockerApi.VolumeApi;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerConfig;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerContent;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerReference;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
+import org.springframework.boot.buildpack.platform.io.IOConsumer;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
+import org.springframework.boot.buildpack.platform.json.SharedObjectMapper;
 import org.springframework.util.FileCopyUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/LifecycleVersionTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleVersionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/PhaseTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/PhaseTests.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerConfig.Update;
-import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerConfig.Update;
+import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/PrintStreamBuildLogTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/PrintStreamBuildLogTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStreamReader;
@@ -25,11 +25,11 @@ import java.util.function.Consumer;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.docker.LogUpdateEvent;
-import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressEvent;
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
+import org.springframework.boot.buildpack.platform.docker.LogUpdateEvent;
+import org.springframework.boot.buildpack.platform.docker.TotalProgressEvent;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
 import org.springframework.util.FileCopyUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/StackIdTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/StackIdTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.build;
+package org.springframework.boot.buildpack.platform.build;
 
 import java.util.Collections;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageConfig;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageConfig;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiIntegrationTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.io.IOException;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
 import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
 
 /**

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -31,21 +31,21 @@ import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi.ContainerApi;
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi.ImageApi;
-import org.springframework.boot.cloudnativebuildpack.docker.DockerApi.VolumeApi;
-import org.springframework.boot.cloudnativebuildpack.docker.Http.Response;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerConfig;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerContent;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ContainerReference;
-import org.springframework.boot.cloudnativebuildpack.docker.type.Image;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageArchive;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.docker.type.VolumeName;
-import org.springframework.boot.cloudnativebuildpack.io.Content;
-import org.springframework.boot.cloudnativebuildpack.io.IOConsumer;
-import org.springframework.boot.cloudnativebuildpack.io.Owner;
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
+import org.springframework.boot.buildpack.platform.docker.DockerApi.ContainerApi;
+import org.springframework.boot.buildpack.platform.docker.DockerApi.ImageApi;
+import org.springframework.boot.buildpack.platform.docker.DockerApi.VolumeApi;
+import org.springframework.boot.buildpack.platform.docker.Http.Response;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerConfig;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerContent;
+import org.springframework.boot.buildpack.platform.docker.type.ContainerReference;
+import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.docker.type.ImageArchive;
+import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.boot.buildpack.platform.docker.type.VolumeName;
+import org.springframework.boot.buildpack.platform.io.Content;
+import org.springframework.boot.buildpack.platform.io.IOConsumer;
+import org.springframework.boot.buildpack.platform.io.Owner;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerExceptionTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerExceptionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.net.URI;
 import java.net.URISyntaxException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/ErrorsTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ErrorsTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.util.Iterator;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.docker.Errors.Error;
-import org.springframework.boot.cloudnativebuildpack.json.AbstractJsonTests;
+import org.springframework.boot.buildpack.platform.docker.Errors.Error;
+import org.springframework.boot.buildpack.platform.json.AbstractJsonTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/HttpClientHttpTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/HttpClientHttpTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -41,7 +41,7 @@ import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import org.springframework.boot.cloudnativebuildpack.docker.Http.Response;
+import org.springframework.boot.buildpack.platform.docker.Http.Response;
 import org.springframework.util.StreamUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/LoadImageUpdateEventTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/LoadImageUpdateEventTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.docker.ProgressUpdateEvent.ProgressDetail;
+import org.springframework.boot.buildpack.platform.docker.ProgressUpdateEvent.ProgressDetail;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/LogUpdateEventTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/LogUpdateEventTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.io.IOException;
 import java.io.InputStream;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/ProgressUpdateEventTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ProgressUpdateEventTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.docker.ProgressUpdateEvent.ProgressDetail;
+import org.springframework.boot.buildpack.platform.docker.ProgressUpdateEvent.ProgressDetail;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/PullImageUpdateEventTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/PullImageUpdateEventTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.docker.ProgressUpdateEvent.ProgressDetail;
+import org.springframework.boot.buildpack.platform.docker.ProgressUpdateEvent.ProgressDetail;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/PullUpdateEventTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/PullUpdateEventTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.json.AbstractJsonTests;
+import org.springframework.boot.buildpack.platform.json.AbstractJsonTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressBarTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressBarTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressEventTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressEventTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressPullListenerTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressPullListenerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker;
+package org.springframework.boot.buildpack.platform.docker;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,8 +24,8 @@ import java.util.function.Consumer;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.json.AbstractJsonTests;
-import org.springframework.boot.cloudnativebuildpack.json.JsonStream;
+import org.springframework.boot.buildpack.platform.json.AbstractJsonTests;
+import org.springframework.boot.buildpack.platform.json.JsonStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerConfigTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerConfigTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.StandardCharsets;
@@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets;
 import org.junit.jupiter.api.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 
-import org.springframework.boot.cloudnativebuildpack.json.AbstractJsonTests;
+import org.springframework.boot.buildpack.platform.json.AbstractJsonTests;
 import org.springframework.util.StreamUtils;
 
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerContentTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerContentTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerReferenceTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerReferenceTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageArchiveTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageArchiveTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -29,8 +29,8 @@ import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.junit.jupiter.api.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 
-import org.springframework.boot.cloudnativebuildpack.io.Owner;
-import org.springframework.boot.cloudnativebuildpack.json.AbstractJsonTests;
+import org.springframework.boot.buildpack.platform.io.Owner;
+import org.springframework.boot.buildpack.platform.json.AbstractJsonTests;
 import org.springframework.util.StreamUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageConfigTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageConfigTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.io.IOException;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.json.AbstractJsonTests;
+import org.springframework.boot.buildpack.platform.json.AbstractJsonTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageNameTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageNameTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageReferenceTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageReferenceTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.io.File;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.io.IOException;
 import java.util.List;
@@ -22,7 +22,7 @@ import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.json.AbstractJsonTests;
+import org.springframework.boot.buildpack.platform.json.AbstractJsonTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/LayerIdTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/LayerIdTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/LayerTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/LayerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -22,10 +22,10 @@ import java.io.ByteArrayOutputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.io.Content;
-import org.springframework.boot.cloudnativebuildpack.io.IOConsumer;
-import org.springframework.boot.cloudnativebuildpack.io.Layout;
-import org.springframework.boot.cloudnativebuildpack.io.Owner;
+import org.springframework.boot.buildpack.platform.io.Content;
+import org.springframework.boot.buildpack.platform.io.IOConsumer;
+import org.springframework.boot.buildpack.platform.io.Layout;
+import org.springframework.boot.buildpack.platform.io.Owner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/RandomStringTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/RandomStringTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/VolumeNameTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/VolumeNameTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.docker.type;
+package org.springframework.boot.buildpack.platform.docker.type;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/ContentTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/ContentTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/DefaultOwnerTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/DefaultOwnerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/InspectedContentTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/InspectedContentTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/OwnerTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/OwnerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/TarArchiveTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/TarArchiveTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/TarLayoutWriterTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/TarLayoutWriterTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/ZipFileTarArchiveTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/ZipFileTarArchiveTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.io;
+package org.springframework.boot.buildpack.platform.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/AbstractJsonTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/AbstractJsonTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.json;
+package org.springframework.boot.buildpack.platform.json;
 
 import java.io.InputStream;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/JsonStreamTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/JsonStreamTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.json;
+package org.springframework.boot.buildpack.platform.json;
 
 import java.util.ArrayList;
 import java.util.List;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/MappedObjectTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/MappedObjectTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.json;
+package org.springframework.boot.buildpack.platform.json;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,7 +23,7 @@ import java.lang.invoke.MethodHandles;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.json.MappedObjectTests.TestMappedObject.Person;
+import org.springframework.boot.buildpack.platform.json.MappedObjectTests.TestMappedObject.Person;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/SharedObjectMapperTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/SharedObjectMapperTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.json;
+package org.springframework.boot.buildpack.platform.json;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/socket/FileDescriptorTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/socket/FileDescriptorTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.socket;
+package org.springframework.boot.buildpack.platform.socket;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.socket.FileDescriptor.Handle;
+import org.springframework.boot.buildpack.platform.socket.FileDescriptor.Handle;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/toml/TomlTests.java → spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/toml/TomlTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cloudnativebuildpack.toml;
+package org.springframework.boot.buildpack.platform.toml;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle

@@ -15,7 +15,7 @@ configurations {
 
 dependencies {
 	api platform(project(':spring-boot-project:spring-boot-parent'))
-	api project(':spring-boot-project:spring-boot-tools:spring-boot-cloudnativebuildpack')
+	api project(':spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform')
 
 	compileOnly 'org.apache.maven.plugin-tools:maven-plugin-annotations'
 	compileOnly 'org.sonatype.plexus:plexus-build-api'

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java

@@ -38,13 +38,13 @@ import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 
-import org.springframework.boot.cloudnativebuildpack.build.AbstractBuildLog;
-import org.springframework.boot.cloudnativebuildpack.build.BuildLog;
-import org.springframework.boot.cloudnativebuildpack.build.BuildRequest;
-import org.springframework.boot.cloudnativebuildpack.build.Builder;
-import org.springframework.boot.cloudnativebuildpack.docker.TotalProgressEvent;
-import org.springframework.boot.cloudnativebuildpack.io.Owner;
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
+import org.springframework.boot.buildpack.platform.build.AbstractBuildLog;
+import org.springframework.boot.buildpack.platform.build.BuildLog;
+import org.springframework.boot.buildpack.platform.build.BuildRequest;
+import org.springframework.boot.buildpack.platform.build.Builder;
+import org.springframework.boot.buildpack.platform.docker.TotalProgressEvent;
+import org.springframework.boot.buildpack.platform.io.Owner;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
 import org.springframework.boot.loader.tools.EntryWriter;
 import org.springframework.boot.loader.tools.ImagePackager;
 import org.springframework.boot.loader.tools.Libraries;

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java

@@ -21,11 +21,11 @@ import java.util.function.Function;
 
 import org.apache.maven.artifact.Artifact;
 
-import org.springframework.boot.cloudnativebuildpack.build.BuildRequest;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageName;
-import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
-import org.springframework.boot.cloudnativebuildpack.io.Owner;
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
+import org.springframework.boot.buildpack.platform.build.BuildRequest;
+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.Owner;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
 import org.springframework.util.StringUtils;
 
 /**

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java

@@ -25,9 +25,9 @@ import org.apache.maven.artifact.handler.DefaultArtifactHandler;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.cloudnativebuildpack.build.BuildRequest;
-import org.springframework.boot.cloudnativebuildpack.io.Owner;
-import org.springframework.boot.cloudnativebuildpack.io.TarArchive;
+import org.springframework.boot.buildpack.platform.build.BuildRequest;
+import org.springframework.boot.buildpack.platform.io.Owner;
+import org.springframework.boot.buildpack.platform.io.TarArchive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;