From e28338d6cd483896dc1632653cff90d5da8fd9e9 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 22 Jan 2020 10:33:31 -0800 Subject: [PATCH] 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 | 2 +- settings.gradle | 2 +- .../spring-boot-dependencies/build.gradle | 2 +- .../build.gradle | 4 +-- .../platform}/build/AbstractBuildLog.java | 12 +++---- .../buildpack/platform}/build/ApiVersion.java | 2 +- .../buildpack/platform}/build/BuildLog.java | 12 +++---- .../buildpack/platform}/build/BuildOwner.java | 4 +-- .../platform}/build/BuildRequest.java | 8 ++--- .../buildpack/platform}/build/Builder.java | 18 +++++----- .../platform}/build/BuilderMetadata.java | 10 +++--- .../platform}/build/EphemeralBuilder.java | 18 +++++----- .../buildpack/platform}/build/Lifecycle.java | 18 +++++----- .../platform}/build/LifecycleVersion.java | 2 +- .../boot/buildpack/platform}/build/Phase.java | 6 ++-- .../platform}/build/PrintStreamBuildLog.java | 6 ++-- .../buildpack/platform}/build/StackId.java | 6 ++-- .../platform}/build/package-info.java | 2 +- .../buildpack/platform}/docker/DockerApi.java | 22 ++++++------ .../docker/DockerConnectionSocketFactory.java | 6 ++-- .../platform}/docker/DockerDnsResolver.java | 2 +- .../platform}/docker/DockerException.java | 2 +- .../DockerHttpClientConnectionManager.java | 2 +- .../docker/DockerSchemePortResolver.java | 2 +- .../buildpack/platform}/docker/Errors.java | 2 +- .../boot/buildpack/platform}/docker/Http.java | 4 +-- .../platform}/docker/HttpClientHttp.java | 8 ++--- .../docker/LoadImageUpdateEvent.java | 2 +- .../platform}/docker/LogUpdateEvent.java | 2 +- .../platform}/docker/ProgressUpdateEvent.java | 2 +- .../docker/PullImageUpdateEvent.java | 2 +- .../platform}/docker/TotalProgressBar.java | 2 +- .../platform}/docker/TotalProgressEvent.java | 2 +- .../docker/TotalProgressPullListener.java | 4 +-- .../platform}/docker/UpdateEvent.java | 2 +- .../platform}/docker/UpdateListener.java | 2 +- .../platform}/docker/package-info.java | 2 +- .../docker/type/ContainerConfig.java | 4 +-- .../docker/type/ContainerContent.java | 4 +-- .../docker/type/ContainerReference.java | 2 +- .../platform}/docker/type/Image.java | 4 +-- .../platform}/docker/type/ImageArchive.java | 16 ++++----- .../platform}/docker/type/ImageConfig.java | 4 +-- .../platform}/docker/type/ImageName.java | 2 +- .../platform}/docker/type/ImageReference.java | 2 +- .../platform}/docker/type/Layer.java | 12 +++---- .../platform}/docker/type/LayerId.java | 2 +- .../platform}/docker/type/RandomString.java | 2 +- .../platform}/docker/type/VolumeName.java | 2 +- .../platform}/docker/type/package-info.java | 2 +- .../boot/buildpack/platform}/io/Content.java | 2 +- .../buildpack/platform}/io/DefaultOwner.java | 2 +- .../buildpack/platform}/io/IOConsumer.java | 2 +- .../buildpack/platform}/io/IOSupplier.java | 2 +- .../platform}/io/InspectedContent.java | 2 +- .../boot/buildpack/platform}/io/Layout.java | 2 +- .../boot/buildpack/platform}/io/Owner.java | 2 +- .../buildpack/platform}/io/TarArchive.java | 2 +- .../platform}/io/TarLayoutWriter.java | 2 +- .../platform}/io/ZipFileTarArchive.java | 2 +- .../buildpack/platform}/io/package-info.java | 2 +- .../buildpack/platform}/json/JsonStream.java | 2 +- .../platform}/json/MappedObject.java | 2 +- .../platform}/json/SharedObjectMapper.java | 2 +- .../platform}/json/package-info.java | 2 +- .../platform}/socket/AbstractSocket.java | 2 +- .../platform}/socket/BsdDomainSocket.java | 2 +- .../platform}/socket/DomainSocket.java | 4 +-- .../platform}/socket/FileDescriptor.java | 2 +- .../platform}/socket/LinuxDomainSocket.java | 2 +- .../platform}/socket/NamedPipeSocket.java | 2 +- .../platform}/socket/package-info.java | 2 +- .../boot/buildpack/platform}/toml/Toml.java | 2 +- .../platform}/toml/package-info.java | 2 +- .../platform}/build/ApiVersionTests.java | 2 +- .../platform}/build/BuildLogTests.java | 2 +- .../platform}/build/BuildOwnerTests.java | 2 +- .../platform}/build/BuildRequestTests.java | 8 ++--- .../platform}/build/BuilderMetadataTests.java | 8 ++--- .../platform}/build/BuilderTests.java | 20 +++++------ .../build/EphemeralBuilderTests.java | 12 +++---- .../platform}/build/LifecycleTests.java | 26 +++++++------- .../build/LifecycleVersionTests.java | 2 +- .../buildpack/platform}/build/PhaseTests.java | 6 ++-- .../build/PrintStreamBuildLogTests.java | 12 +++---- .../platform}/build/StackIdTests.java | 6 ++-- .../docker/DockerApiIntegrationTests.java | 4 +-- .../platform}/docker/DockerApiTests.java | 32 +++++++++--------- .../docker/DockerExceptionTests.java | 2 +- .../platform}/docker/ErrorsTests.java | 6 ++-- .../platform}/docker/HttpClientHttpTests.java | 4 +-- .../docker/LoadImageUpdateEventTests.java | 4 +-- .../platform}/docker/LogUpdateEventTests.java | 2 +- .../docker/ProgressUpdateEventTests.java | 4 +-- .../docker/PullImageUpdateEventTests.java | 4 +-- .../docker/PullUpdateEventTests.java | 4 +-- .../docker/TotalProgressBarTests.java | 2 +- .../docker/TotalProgressEventTests.java | 2 +- .../TotalProgressPullListenerTests.java | 6 ++-- .../docker/type/ContainerConfigTests.java | 4 +-- .../docker/type/ContainerContentTests.java | 4 +-- .../docker/type/ContainerReferenceTests.java | 2 +- .../docker/type/ImageArchiveTests.java | 6 ++-- .../docker/type/ImageConfigTests.java | 4 +-- .../platform}/docker/type/ImageNameTests.java | 2 +- .../docker/type/ImageReferenceTests.java | 2 +- .../platform}/docker/type/ImageTests.java | 4 +-- .../platform}/docker/type/LayerIdTests.java | 2 +- .../platform}/docker/type/LayerTests.java | 10 +++--- .../docker/type/RandomStringTests.java | 2 +- .../docker/type/VolumeNameTests.java | 2 +- .../buildpack/platform}/io/ContentTests.java | 2 +- .../platform}/io/DefaultOwnerTests.java | 2 +- .../platform}/io/InspectedContentTests.java | 2 +- .../buildpack/platform}/io/OwnerTests.java | 2 +- .../platform}/io/TarArchiveTests.java | 2 +- .../platform}/io/TarLayoutWriterTests.java | 2 +- .../platform}/io/ZipFileTarArchiveTests.java | 2 +- .../platform}/json/AbstractJsonTests.java | 2 +- .../platform}/json/JsonStreamTests.java | 2 +- .../platform}/json/MappedObjectTests.java | 4 +-- .../json/SharedObjectMapperTests.java | 2 +- .../platform}/socket/FileDescriptorTests.java | 4 +-- .../buildpack/platform}/toml/TomlTests.java | 2 +- .../platform}/build/builder-metadata.json | 0 .../boot/buildpack/platform}/build/image.json | 0 .../platform}/build/lifecycle-analyzer.json | 0 .../platform}/build/lifecycle-builder.json | 0 .../platform}/build/lifecycle-cacher.json | 0 .../platform}/build/lifecycle-detector.json | 0 .../platform}/build/lifecycle-exporter.json | 0 .../platform}/build/lifecycle-restorer.json | 0 .../build/print-stream-build-log.txt | 0 .../build/run-image-with-bad-stack.json | 0 .../buildpack/platform}/build/run-image.json | 0 .../docker/create-container-response.json | 0 .../buildpack/platform}/docker/errors.json | 0 .../platform}/docker/load-stream.json | 0 .../docker/log-update-event-ansi.stream | Bin .../platform}/docker/log-update-event.stream | Bin .../platform}/docker/pull-stream.json | 0 .../platform}/docker/pull-update-full.json | 0 .../platform}/docker/pull-update-minimal.json | 0 .../docker/pull-with-empty-details.json | 0 .../docker/type/container-config.json | 0 .../docker/type/image-archive-config.json | 0 .../docker/type/image-archive-manifest.json | 0 .../platform}/docker/type/image-config.json | 0 .../platform}/docker/type/image.json | 0 .../platform}/docker/type/manifest.json | 0 .../boot/buildpack/platform}/json/stream.json | 0 .../platform}/json/test-mapped-object.json | 0 .../spring-boot-maven-plugin/build.gradle | 2 +- .../boot/maven/BuildImageMojo.java | 14 ++++---- .../org/springframework/boot/maven/Image.java | 10 +++--- .../boot/maven/ImageTests.java | 6 ++-- 156 files changed, 301 insertions(+), 301 deletions(-) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack => spring-boot-buildpack-platform}/build.gradle (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/AbstractBuildLog.java (85%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/ApiVersion.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/BuildLog.java (87%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/BuildOwner.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/BuildRequest.java (96%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/Builder.java (84%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/BuilderMetadata.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/EphemeralBuilder.java (87%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/Lifecycle.java (93%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/LifecycleVersion.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/Phase.java (93%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/PrintStreamBuildLog.java (84%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/StackId.java (91%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/build/package-info.java (91%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/DockerApi.java (92%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/DockerConnectionSocketFactory.java (88%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/DockerDnsResolver.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/DockerException.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/DockerHttpClientConnectionManager.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/DockerSchemePortResolver.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/Errors.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/Http.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/HttpClientHttp.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/LoadImageUpdateEvent.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/LogUpdateEvent.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/ProgressUpdateEvent.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/PullImageUpdateEvent.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/TotalProgressBar.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/TotalProgressEvent.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/TotalProgressPullListener.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/UpdateEvent.java (92%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/UpdateListener.java (96%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/package-info.java (91%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/ContainerConfig.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/ContainerContent.java (93%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/ContainerReference.java (96%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/Image.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/ImageArchive.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/ImageConfig.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/ImageName.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/ImageReference.java (99%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/Layer.java (85%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/LayerId.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/RandomString.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/VolumeName.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/docker/type/package-info.java (90%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/io/Content.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/io/DefaultOwner.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/io/IOConsumer.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/io/IOSupplier.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/io/InspectedContent.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/io/Layout.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/io/Owner.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/io/TarArchive.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/io/TarLayoutWriter.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/io/ZipFileTarArchive.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/io/package-info.java (91%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/json/JsonStream.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/json/MappedObject.java (99%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/json/SharedObjectMapper.java (96%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/json/package-info.java (91%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/socket/AbstractSocket.java (96%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/socket/BsdDomainSocket.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/socket/DomainSocket.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/socket/FileDescriptor.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/socket/LinuxDomainSocket.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/socket/NamedPipeSocket.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/socket/package-info.java (92%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/toml/Toml.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform}/toml/package-info.java (91%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/build/ApiVersionTests.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/build/BuildLogTests.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/build/BuildOwnerTests.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/build/BuildRequestTests.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/build/BuilderMetadataTests.java (92%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/build/BuilderTests.java (87%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/build/EphemeralBuilderTests.java (92%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/build/LifecycleTests.java (88%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/build/LifecycleVersionTests.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/build/PhaseTests.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/build/PrintStreamBuildLogTests.java (88%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/build/StackIdTests.java (92%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/DockerApiIntegrationTests.java (89%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/DockerApiTests.java (91%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/DockerExceptionTests.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/ErrorsTests.java (88%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/HttpClientHttpTests.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/LoadImageUpdateEventTests.java (88%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/LogUpdateEventTests.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/ProgressUpdateEventTests.java (93%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/PullImageUpdateEventTests.java (88%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/PullUpdateEventTests.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/TotalProgressBarTests.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/TotalProgressEventTests.java (96%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/TotalProgressPullListenerTests.java (91%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/type/ContainerConfigTests.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/type/ContainerContentTests.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/type/ContainerReferenceTests.java (96%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/type/ImageArchiveTests.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/type/ImageConfigTests.java (93%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/type/ImageNameTests.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/type/ImageReferenceTests.java (99%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/type/ImageTests.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/type/LayerIdTests.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/type/LayerTests.java (87%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/type/RandomStringTests.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/docker/type/VolumeNameTests.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/io/ContentTests.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/io/DefaultOwnerTests.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/io/InspectedContentTests.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/io/OwnerTests.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/io/TarArchiveTests.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/io/TarLayoutWriterTests.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/io/ZipFileTarArchiveTests.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/json/AbstractJsonTests.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/json/JsonStreamTests.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/json/MappedObjectTests.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/json/SharedObjectMapperTests.java (96%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/socket/FileDescriptorTests.java (94%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform}/toml/TomlTests.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/build/builder-metadata.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/build/image.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/build/lifecycle-analyzer.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/build/lifecycle-builder.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/build/lifecycle-cacher.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/build/lifecycle-detector.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/build/lifecycle-exporter.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/build/lifecycle-restorer.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/build/print-stream-build-log.txt (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/build/run-image-with-bad-stack.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/build/run-image.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/create-container-response.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/errors.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/load-stream.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/log-update-event-ansi.stream (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/log-update-event.stream (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/pull-stream.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/pull-update-full.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/pull-update-minimal.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/pull-with-empty-details.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/type/container-config.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/type/image-archive-config.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/type/image-archive-manifest.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/type/image-config.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/type/image.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/docker/type/manifest.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/json/stream.json (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack => spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform}/json/test-mapped-object.json (100%) diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup index 608ecf8a848..9278708eaf2 100644 --- a/eclipse/spring-boot-project.setup +++ b/eclipse/spring-boot-project.setup @@ -127,7 +127,7 @@ name="spring-boot-tools"> + pattern="spring-boot-(tools|antlib|configuration-.*|loader|.*-tools|*.layertools|.*-plugin|autoconfigure-processor|buildpack.*)"/> diff --git a/settings.gradle b/settings.gradle index 13c5353026a..c51bffe4eaf 100644 --- a/settings.gradle +++ b/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' diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index afa053125b3..a88b0779bfc 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/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', diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/build.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle index c2d39b69397..546469e5000 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/build.gradle +++ b/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 +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/AbstractBuildLog.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/AbstractBuildLog.java similarity index 85% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/AbstractBuildLog.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/AbstractBuildLog.java index 466c28a43e8..8436050a505 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/AbstractBuildLog.java +++ b/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. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/ApiVersion.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/ApiVersion.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/ApiVersion.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/ApiVersion.java index f91ed85e59b..27e97c10291 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/ApiVersion.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuildLog.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java similarity index 87% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuildLog.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java index a57332915a9..5612d6a8afd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuildLog.java +++ b/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. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuildOwner.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildOwner.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuildOwner.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildOwner.java index 3ff65660a5e..372da10ecf3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuildOwner.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuildRequest.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuildRequest.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java index 5d2a5839d3e..ccaf53c9d41 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuildRequest.java +++ b/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; /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/Builder.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Builder.java similarity index 84% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/Builder.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Builder.java index 89dc39041ff..ea37c1c769f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/Builder.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuilderMetadata.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuilderMetadata.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuilderMetadata.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuilderMetadata.java index b1b2662cb20..5267a269e05 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/BuilderMetadata.java +++ b/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; /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/EphemeralBuilder.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilder.java similarity index 87% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/EphemeralBuilder.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilder.java index 2b5141c69d3..23479e4d2ba 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/EphemeralBuilder.java +++ b/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. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/Lifecycle.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Lifecycle.java similarity index 93% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/Lifecycle.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Lifecycle.java index d5dce332e5d..33801ed9513 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/Lifecycle.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/LifecycleVersion.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/LifecycleVersion.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/LifecycleVersion.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/LifecycleVersion.java index d23b1a8b30c..8c0b725439a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/LifecycleVersion.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/Phase.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Phase.java similarity index 93% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/Phase.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Phase.java index 8fb9752ae2b..bc16a257e82 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/Phase.java +++ b/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; /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/PrintStreamBuildLog.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/PrintStreamBuildLog.java similarity index 84% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/PrintStreamBuildLog.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/PrintStreamBuildLog.java index 21db26caa7c..7fdfe6d6047 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/PrintStreamBuildLog.java +++ b/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}. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/StackId.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/StackId.java similarity index 91% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/StackId.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/StackId.java index 4b2d7c87bbf..30d9f974fa6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/StackId.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/package-info.java similarity index 91% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/package-info.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/package-info.java index 441d48c0b80..77300b6d675 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/build/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApi.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApi.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java index 393e583b934..631cfa11ebb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApi.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerConnectionSocketFactory.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerConnectionSocketFactory.java similarity index 88% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerConnectionSocketFactory.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerConnectionSocketFactory.java index ec9e1fab8d9..f32dc3593e6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerConnectionSocketFactory.java +++ b/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 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerDnsResolver.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerDnsResolver.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerDnsResolver.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerDnsResolver.java index 3113d81e121..8a0421e8c27 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerDnsResolver.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerException.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerException.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerException.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerException.java index aea74d8b055..2d41a5611ed 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerException.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerHttpClientConnectionManager.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerHttpClientConnectionManager.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerHttpClientConnectionManager.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerHttpClientConnectionManager.java index 74c4c38f052..25d66996f51 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerHttpClientConnectionManager.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerSchemePortResolver.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerSchemePortResolver.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerSchemePortResolver.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerSchemePortResolver.java index e8b166dedba..69a4303941e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/DockerSchemePortResolver.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/Errors.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/Errors.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/Errors.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/Errors.java index 8618b2f0221..e6deb4641fa 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/Errors.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/Http.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/Http.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/Http.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/Http.java index 0a4f3671a1c..3c7a4cdcaca 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/Http.java +++ b/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}. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/HttpClientHttp.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/HttpClientHttp.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/HttpClientHttp.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/HttpClientHttp.java index d7afcd177e3..74e32016cc9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/HttpClientHttp.java +++ b/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}. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/LoadImageUpdateEvent.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/LoadImageUpdateEvent.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/LoadImageUpdateEvent.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/LoadImageUpdateEvent.java index 33e8995fa19..2fb0f5ad58c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/LoadImageUpdateEvent.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/LogUpdateEvent.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/LogUpdateEvent.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/LogUpdateEvent.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/LogUpdateEvent.java index 6849ced82b4..c7a3cffe892 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/LogUpdateEvent.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/ProgressUpdateEvent.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ProgressUpdateEvent.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/ProgressUpdateEvent.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ProgressUpdateEvent.java index da9adc1fdf8..271b6c19a2b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/ProgressUpdateEvent.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/PullImageUpdateEvent.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/PullImageUpdateEvent.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/PullImageUpdateEvent.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/PullImageUpdateEvent.java index 1b0cc0b74e5..8422084c10a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/PullImageUpdateEvent.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressBar.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressBar.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressBar.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressBar.java index f4ae52adfdc..6d828437b82 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressBar.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressEvent.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressEvent.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressEvent.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressEvent.java index c541ad52f12..e14b5d661db 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressEvent.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressPullListener.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressPullListener.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressPullListener.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressPullListener.java index 46148f38c87..77aec7c78b4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressPullListener.java +++ b/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 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/UpdateEvent.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/UpdateEvent.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/UpdateEvent.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/UpdateEvent.java index d46f488e622..2e62b52e491 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/UpdateEvent.java +++ b/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. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/UpdateListener.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/UpdateListener.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/UpdateListener.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/UpdateListener.java index 1a8e1a3e43e..0fdf3980fa5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/UpdateListener.java +++ b/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}. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/package-info.java similarity index 91% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/package-info.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/package-info.java index 6aead8fda08..c6b88a0c72a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ContainerConfig.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerConfig.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ContainerConfig.java index 36ae3ce5bd2..686df203f61 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerConfig.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerContent.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ContainerContent.java similarity index 93% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerContent.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ContainerContent.java index c7ed460e343..c0f5dd217d4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerContent.java +++ b/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; /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerReference.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ContainerReference.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerReference.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ContainerReference.java index f80bd807bcd..f5a5c6ac5a3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerReference.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/Image.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Image.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/Image.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Image.java index 0d0c3f329a7..4d2e2bec766 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/Image.java +++ b/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}. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageArchive.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageArchive.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageArchive.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageArchive.java index ef043f81179..309f6664bd1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageArchive.java +++ b/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; /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageConfig.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageConfig.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageConfig.java index 2ac1e451af5..f24422d7fe3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageConfig.java +++ b/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. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageName.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageName.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageName.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageName.java index f2eaa129b5b..2749cdf00db 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageName.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageReference.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageReference.java similarity index 99% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageReference.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageReference.java index c53749e4555..fe9f0643431 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageReference.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/Layer.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Layer.java similarity index 85% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/Layer.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Layer.java index 2bf4ae04362..6d481eb12d7 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/Layer.java +++ b/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; /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/LayerId.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/LayerId.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/LayerId.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/LayerId.java index be089d83a28..ac3041e670d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/LayerId.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/RandomString.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/RandomString.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/RandomString.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/RandomString.java index 37880609c87..d9696d3db7f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/RandomString.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/VolumeName.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/VolumeName.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/VolumeName.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/VolumeName.java index c42728e306e..61dbfafd05d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/VolumeName.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/package-info.java similarity index 90% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/package-info.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/package-info.java index 20c6549d2ce..f67ce1a7c32 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/docker/type/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/Content.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/Content.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/Content.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/Content.java index 39ffc5ac0de..66b369b7e9a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/Content.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/DefaultOwner.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/DefaultOwner.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/DefaultOwner.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/DefaultOwner.java index cc49597ee1f..1fc71958fa5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/DefaultOwner.java +++ b/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. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/IOConsumer.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/IOConsumer.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/IOConsumer.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/IOConsumer.java index 9ca8f891da5..699b56b3396 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/IOConsumer.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/IOSupplier.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/IOSupplier.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/IOSupplier.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/IOSupplier.java index 20b71ea9949..df8d237e959 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/IOSupplier.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/InspectedContent.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/InspectedContent.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/InspectedContent.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/InspectedContent.java index d3f945860ea..e09a27c4c4c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/InspectedContent.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/Layout.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/Layout.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/Layout.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/Layout.java index 66406efaa37..bc0460dc0ff 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/Layout.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/Owner.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/Owner.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/Owner.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/Owner.java index 95c4382f57b..88c00bed4ee 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/Owner.java +++ b/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. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/TarArchive.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/TarArchive.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/TarArchive.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/TarArchive.java index af822f8d444..70a8e7ca979 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/TarArchive.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/TarLayoutWriter.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/TarLayoutWriter.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/TarLayoutWriter.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/TarLayoutWriter.java index 4fc0ca84a87..ffdc377aa01 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/TarLayoutWriter.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/ZipFileTarArchive.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/ZipFileTarArchive.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/ZipFileTarArchive.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/ZipFileTarArchive.java index b49e041b035..09d3e661d1a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/ZipFileTarArchive.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/package-info.java similarity index 91% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/package-info.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/package-info.java index fdfa72917c7..6e1750c6d43 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/io/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/JsonStream.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/JsonStream.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/JsonStream.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/JsonStream.java index b3579577e4c..87dd8ecbcb9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/JsonStream.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/MappedObject.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/MappedObject.java similarity index 99% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/MappedObject.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/MappedObject.java index 23a3441517a..83e83408e95 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/MappedObject.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/SharedObjectMapper.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/SharedObjectMapper.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/SharedObjectMapper.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/SharedObjectMapper.java index 58ab1ea708a..b73ac09dda4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/SharedObjectMapper.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/package-info.java similarity index 91% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/package-info.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/package-info.java index f75c1472d9a..c7b1f8b5602 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/json/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/AbstractSocket.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/AbstractSocket.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/AbstractSocket.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/AbstractSocket.java index f4d89dceb03..50cc2e73034 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/AbstractSocket.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/BsdDomainSocket.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/BsdDomainSocket.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/BsdDomainSocket.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/BsdDomainSocket.java index 2732bdbc671..dd3525b3eda 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/BsdDomainSocket.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/DomainSocket.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/DomainSocket.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/DomainSocket.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/DomainSocket.java index 3a6610d1d32..96f1c4f8c17 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/DomainSocket.java +++ b/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. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/FileDescriptor.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/FileDescriptor.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/FileDescriptor.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/FileDescriptor.java index b260c2bde7e..f136188ded0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/FileDescriptor.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/LinuxDomainSocket.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/LinuxDomainSocket.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/LinuxDomainSocket.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/LinuxDomainSocket.java index 292d9607340..b99f7ddd0c2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/LinuxDomainSocket.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/NamedPipeSocket.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/NamedPipeSocket.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/NamedPipeSocket.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/NamedPipeSocket.java index 032e75ec88d..40f40158340 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/NamedPipeSocket.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/package-info.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/package-info.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/package-info.java index 18a44ee8cf1..b4cc36f3a9e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/toml/Toml.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/toml/Toml.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/toml/Toml.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/toml/Toml.java index c0b26a3a6e5..936c077425e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/toml/Toml.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/toml/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/toml/package-info.java similarity index 91% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/toml/package-info.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/toml/package-info.java index 35bb4e73663..efef3d0ac08 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/toml/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/ApiVersionTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/ApiVersionTests.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/ApiVersionTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/ApiVersionTests.java index 486fb4f955e..47af377570d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/ApiVersionTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuildLogTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildLogTests.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuildLogTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildLogTests.java index 53e77531ad0..bf4ecd25461 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuildLogTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuildOwnerTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildOwnerTests.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuildOwnerTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildOwnerTests.java index beb021fe422..cd8fb02d0e7 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuildOwnerTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuildRequestTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildRequestTests.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuildRequestTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildRequestTests.java index 23fc47d5e48..66b50c60dea 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuildRequestTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuilderMetadataTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderMetadataTests.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuilderMetadataTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderMetadataTests.java index d8b1a0cb8a6..6b97ba30034 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuilderMetadataTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuilderTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderTests.java similarity index 87% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuilderTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderTests.java index f8884e7cbb8..29b31b32e90 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/BuilderTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/EphemeralBuilderTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilderTests.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/EphemeralBuilderTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilderTests.java index fad47b7f1c4..5335253d8c1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/EphemeralBuilderTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/LifecycleTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleTests.java similarity index 88% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/LifecycleTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleTests.java index 5b2cf55b6c0..aad19e0a6d3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/LifecycleTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/LifecycleVersionTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleVersionTests.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/LifecycleVersionTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleVersionTests.java index 3033e1e2a82..2f645c5b8bd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/LifecycleVersionTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/PhaseTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/PhaseTests.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/PhaseTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/PhaseTests.java index 0ca0e63cf61..d39434c767b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/PhaseTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/PrintStreamBuildLogTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/PrintStreamBuildLogTests.java similarity index 88% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/PrintStreamBuildLogTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/PrintStreamBuildLogTests.java index be0fc39ffe7..b4834e42c44 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/PrintStreamBuildLogTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/StackIdTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/StackIdTests.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/StackIdTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/StackIdTests.java index 19ef2f77e03..3204772eabe 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/build/StackIdTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java similarity index 89% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiIntegrationTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java index fd77bfa1ff3..4ac2202a849 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiIntegrationTests.java +++ b/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; /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java similarity index 91% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java index b67656e0767..fb30bf9983f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerExceptionTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerExceptionTests.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerExceptionTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerExceptionTests.java index c83904c4b42..f0b794ee18f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerExceptionTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/ErrorsTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ErrorsTests.java similarity index 88% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/ErrorsTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ErrorsTests.java index f7f3e84de87..2cb819336a2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/ErrorsTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/HttpClientHttpTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/HttpClientHttpTests.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/HttpClientHttpTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/HttpClientHttpTests.java index bf93f5c432e..50463611c90 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/HttpClientHttpTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/LoadImageUpdateEventTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/LoadImageUpdateEventTests.java similarity index 88% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/LoadImageUpdateEventTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/LoadImageUpdateEventTests.java index d0a9e093f4f..e3cf8e6833b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/LoadImageUpdateEventTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/LogUpdateEventTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/LogUpdateEventTests.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/LogUpdateEventTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/LogUpdateEventTests.java index 64389d81ccf..d794c307b8e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/LogUpdateEventTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/ProgressUpdateEventTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ProgressUpdateEventTests.java similarity index 93% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/ProgressUpdateEventTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ProgressUpdateEventTests.java index badca775e3f..1236b510527 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/ProgressUpdateEventTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/PullImageUpdateEventTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/PullImageUpdateEventTests.java similarity index 88% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/PullImageUpdateEventTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/PullImageUpdateEventTests.java index cc373dd100a..c3e2580704c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/PullImageUpdateEventTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/PullUpdateEventTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/PullUpdateEventTests.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/PullUpdateEventTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/PullUpdateEventTests.java index 9b3e94c4ec8..afe606b779c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/PullUpdateEventTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressBarTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressBarTests.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressBarTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressBarTests.java index edcb731e555..280b9aab3ce 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressBarTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressEventTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressEventTests.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressEventTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressEventTests.java index a33c701f0b7..e018c341160 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressEventTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressPullListenerTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressPullListenerTests.java similarity index 91% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressPullListenerTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressPullListenerTests.java index d6b7fa5d638..3f15b1e3c8f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/TotalProgressPullListenerTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerConfigTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerConfigTests.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerConfigTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerConfigTests.java index b3c6ed5b5ee..f72e68fce21 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerConfigTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerContentTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerContentTests.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerContentTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerContentTests.java index 35d01ad17a4..c5390ac1de3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerContentTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerReferenceTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerReferenceTests.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerReferenceTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerReferenceTests.java index 0c04369db4f..43f8cc33cf9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ContainerReferenceTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageArchiveTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageArchiveTests.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageArchiveTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageArchiveTests.java index bc626ba169d..ded72426f90 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageArchiveTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageConfigTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageConfigTests.java similarity index 93% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageConfigTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageConfigTests.java index 2a64f2ca11a..70a8b782cd7 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageConfigTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageNameTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageNameTests.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageNameTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageNameTests.java index ba17f3ef99c..c964c21d226 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageNameTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageReferenceTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageReferenceTests.java similarity index 99% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageReferenceTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageReferenceTests.java index 652f6409045..0227085f0f5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageReferenceTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageTests.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageTests.java index 931d197d4b4..f2c75e8e0e8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/ImageTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/LayerIdTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/LayerIdTests.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/LayerIdTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/LayerIdTests.java index 5d50a631527..50129a223d3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/LayerIdTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/LayerTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/LayerTests.java similarity index 87% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/LayerTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/LayerTests.java index 3bd3c4f774a..ae5f0ba30de 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/LayerTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/RandomStringTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/RandomStringTests.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/RandomStringTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/RandomStringTests.java index b1804f2f002..8305239a9fd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/RandomStringTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/VolumeNameTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/VolumeNameTests.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/VolumeNameTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/VolumeNameTests.java index e1088009007..365caa9e680 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/type/VolumeNameTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/ContentTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/ContentTests.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/ContentTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/ContentTests.java index ca615d093ee..5dd9e148738 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/ContentTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/DefaultOwnerTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/DefaultOwnerTests.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/DefaultOwnerTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/DefaultOwnerTests.java index 61df85eff0f..1398ec76ae0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/DefaultOwnerTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/InspectedContentTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/InspectedContentTests.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/InspectedContentTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/InspectedContentTests.java index 489770691b9..99972918476 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/InspectedContentTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/OwnerTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/OwnerTests.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/OwnerTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/OwnerTests.java index ddccba4a4c0..a281a002063 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/OwnerTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/TarArchiveTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/TarArchiveTests.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/TarArchiveTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/TarArchiveTests.java index e27ce68389b..3ff8d098013 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/TarArchiveTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/TarLayoutWriterTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/TarLayoutWriterTests.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/TarLayoutWriterTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/TarLayoutWriterTests.java index ed3f5adadf0..ec443b4367a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/TarLayoutWriterTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/ZipFileTarArchiveTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/ZipFileTarArchiveTests.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/ZipFileTarArchiveTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/ZipFileTarArchiveTests.java index 6b83e5378df..1e267db579b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/io/ZipFileTarArchiveTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/AbstractJsonTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/AbstractJsonTests.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/AbstractJsonTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/AbstractJsonTests.java index 82258dde8f8..84ad2dcacb3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/AbstractJsonTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/JsonStreamTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/JsonStreamTests.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/JsonStreamTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/JsonStreamTests.java index 3c7bea820b2..1dfbb4a667b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/JsonStreamTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/MappedObjectTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/MappedObjectTests.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/MappedObjectTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/MappedObjectTests.java index f59fc33e135..4c272617aa4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/MappedObjectTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/SharedObjectMapperTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/SharedObjectMapperTests.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/SharedObjectMapperTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/SharedObjectMapperTests.java index f04d8e32f93..c7cb7524d88 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/json/SharedObjectMapperTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/socket/FileDescriptorTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/socket/FileDescriptorTests.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/socket/FileDescriptorTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/socket/FileDescriptorTests.java index 565bb7d8934..1c25f597caa 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/socket/FileDescriptorTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/toml/TomlTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/toml/TomlTests.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/toml/TomlTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/toml/TomlTests.java index 9ebdede1088..d7509980569 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/toml/TomlTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/builder-metadata.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/builder-metadata.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/builder-metadata.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/builder-metadata.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/image.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/image.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/image.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/image.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/lifecycle-analyzer.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/lifecycle-analyzer.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/lifecycle-analyzer.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/lifecycle-analyzer.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/lifecycle-builder.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/lifecycle-builder.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/lifecycle-builder.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/lifecycle-builder.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/lifecycle-cacher.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/lifecycle-cacher.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/lifecycle-cacher.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/lifecycle-cacher.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/lifecycle-detector.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/lifecycle-detector.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/lifecycle-detector.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/lifecycle-detector.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/lifecycle-exporter.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/lifecycle-exporter.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/lifecycle-exporter.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/lifecycle-exporter.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/lifecycle-restorer.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/lifecycle-restorer.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/lifecycle-restorer.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/lifecycle-restorer.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/print-stream-build-log.txt b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/print-stream-build-log.txt similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/print-stream-build-log.txt rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/print-stream-build-log.txt diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/run-image-with-bad-stack.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/run-image-with-bad-stack.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/run-image-with-bad-stack.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/run-image-with-bad-stack.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/run-image.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/run-image.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/build/run-image.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/build/run-image.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/create-container-response.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/create-container-response.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/create-container-response.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/create-container-response.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/errors.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/errors.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/errors.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/errors.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/load-stream.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/load-stream.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/load-stream.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/load-stream.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/log-update-event-ansi.stream b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/log-update-event-ansi.stream similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/log-update-event-ansi.stream rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/log-update-event-ansi.stream diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/log-update-event.stream b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/log-update-event.stream similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/log-update-event.stream rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/log-update-event.stream diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/pull-stream.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/pull-stream.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/pull-stream.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/pull-stream.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/pull-update-full.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/pull-update-full.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/pull-update-full.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/pull-update-full.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/pull-update-minimal.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/pull-update-minimal.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/pull-update-minimal.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/pull-update-minimal.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/pull-with-empty-details.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/pull-with-empty-details.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/pull-with-empty-details.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/pull-with-empty-details.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/type/container-config.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/container-config.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/type/container-config.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/container-config.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/type/image-archive-config.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image-archive-config.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/type/image-archive-config.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image-archive-config.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/type/image-archive-manifest.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image-archive-manifest.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/type/image-archive-manifest.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image-archive-manifest.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/type/image-config.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image-config.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/type/image-config.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image-config.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/type/image.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/type/image.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/type/manifest.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/manifest.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/docker/type/manifest.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/manifest.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/json/stream.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/json/stream.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/json/stream.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/json/stream.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/json/test-mapped-object.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/json/test-mapped-object.json similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/resources/org/springframework/boot/cloudnativebuildpack/json/test-mapped-object.json rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/json/test-mapped-object.json diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index b7b4368d2ab..e4f58e14e42 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/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' diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java index 1632b87b275..47c89eadeb9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java index de0eeb2d640..a19434d5bb2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java +++ b/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; /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java index 84123cf86e0..d81da2c1325 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java +++ b/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;