Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename spring-boot-cloudnativebuildpack

Browse Source 
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
This commit is contained in:
Phillip Webb 2020-01-22 10:33:31 -08:00
parent 288889685d
commit e28338d6cd
156 changed files with 301 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eclipse/spring-boot-project.setup
View File

@ -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">

2
settings.gradle
View File

@ -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'

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -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',

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

@ -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'
}
}

12
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
View File

@ -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.

2
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
View File

@ -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;

12
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
View File

@ -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.

4
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
View File

@ -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;

8
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
View File

@ -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;
/**

18
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
View File

@ -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;

10
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
View File

@ -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;
/**

18
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
View File

@ -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.

18
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
View File

@ -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;

2
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
View File

@ -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;

6
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
View File

@ -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;
/**

6
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
View File

@ -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}.

6
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
View File

@ -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;

2
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
View File

@ -17,4 +17,4 @@
/**
* Central API for performing a buildpack build.
*/
package org.springframework.boot.cloudnativebuildpack.build;
package org.springframework.boot.buildpack.platform.build;

22
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
View File

@ -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;

6
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
View File

@ -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

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

4
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
View File

@ -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}.

8
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
View File

@ -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}.

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

4
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
View File

@ -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

2
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
View File

@ -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.

2
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
View File

@ -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}.

2
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
View File

@ -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;

4
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
View File

@ -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;

4
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
View File

@ -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;
/**

2
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
View File

@ -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;

4
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
View File

@ -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}.

16
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
View File

@ -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;
/**

4
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
View File

@ -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.

2
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
View File

@ -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;

2
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
View File

@ -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;

12
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
View File

@ -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;
/**

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

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

2
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
View File

@ -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;

2
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
View File

@ -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.

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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.

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

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

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

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

2
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
View File

@ -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;

2
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
View File

@ -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;

4
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
View File

@ -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.

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

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

2
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

8
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
View File

@ -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;

8
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
View File

@ -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;

20
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
View File

@ -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;

12
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
View File

@ -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;

26
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
View File

@ -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;

2
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
View File

@ -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;

6
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
View File

@ -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;

12
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
View File

@ -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;

6
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
View File

@ -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;

4
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
View File

@ -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;
/**

32
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
View File

@ -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;

2
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
View File

@ -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;

6
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
View File

@ -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;

4
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
View File

@ -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;

4
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
View File

@ -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;

2
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
View File

@ -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;

4
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
View File

@ -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;

4
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
View File

@ -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;

4
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
View File

@ -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;

2
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
View File

@ -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;

2
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
View File

@ -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;

6
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
View File

@ -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;

4
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
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More