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 spring-projectsgh-19851
afriedel · Jan 22, 2020 · e28338d · e28338d
1 parent 2888896
commit e28338d
Show file tree

Hide file tree

Showing 156 changed files with 301 additions and 301 deletions.
diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup
@@ -127,7 +127,7 @@
         name="spring-boot-tools">
       <predicate
           xsi:type="predicates:NamePredicate"
-          pattern="spring-boot-(tools|antlib|configuration-.*|loader|.*-tools|*.layertools|.*-plugin|autoconfigure-processor|cloudnativebuildpack)"/>
+          pattern="spring-boot-(tools|antlib|configuration-.*|loader|.*-tools|*.layertools|.*-plugin|autoconfigure-processor|buildpack.*)"/>
     </workingSet>
     <workingSet
         name="spring-boot-starters">

diff --git 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
@@ -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/...ng-boot-cloudnativebuildpack/build.gradle → ...ring-boot-buildpack-platform/build.gradle b/...ng-boot-cloudnativebuildpack/build.gradle → ...ring-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'
-}
+}
diff --git a/...tivebuildpack/build/AbstractBuildLog.java → ...pack/platform/build/AbstractBuildLog.java b/...tivebuildpack/build/AbstractBuildLog.java → ...pack/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/...loudnativebuildpack/build/ApiVersion.java → .../buildpack/platform/build/ApiVersion.java b/...loudnativebuildpack/build/ApiVersion.java → .../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/.../cloudnativebuildpack/build/BuildLog.java → ...ot/buildpack/platform/build/BuildLog.java b/.../cloudnativebuildpack/build/BuildLog.java → ...ot/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/...loudnativebuildpack/build/BuildOwner.java → .../buildpack/platform/build/BuildOwner.java b/...loudnativebuildpack/build/BuildOwner.java → .../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/...udnativebuildpack/build/BuildRequest.java → ...uildpack/platform/build/BuildRequest.java b/...udnativebuildpack/build/BuildRequest.java → ...uildpack/platform/build/BuildRequest.java
@@ -14,17 +14,17 @@
  * 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;
 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/...t/cloudnativebuildpack/build/Builder.java → ...oot/buildpack/platform/build/Builder.java b/...t/cloudnativebuildpack/build/Builder.java → ...oot/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/...ativebuildpack/build/BuilderMetadata.java → ...dpack/platform/build/BuilderMetadata.java b/...ativebuildpack/build/BuilderMetadata.java → ...dpack/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.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/...tivebuildpack/build/EphemeralBuilder.java → ...pack/platform/build/EphemeralBuilder.java b/...tivebuildpack/build/EphemeralBuilder.java → ...pack/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/...cloudnativebuildpack/build/Lifecycle.java → ...t/buildpack/platform/build/Lifecycle.java b/...cloudnativebuildpack/build/Lifecycle.java → ...t/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/...tivebuildpack/build/LifecycleVersion.java → ...pack/platform/build/LifecycleVersion.java b/...tivebuildpack/build/LifecycleVersion.java → ...pack/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/...oot/cloudnativebuildpack/build/Phase.java → .../boot/buildpack/platform/build/Phase.java b/...oot/cloudnativebuildpack/build/Phase.java → .../boot/buildpack/platform/build/Phase.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.ArrayList;
 import java.util.Arrays;
 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/...ebuildpack/build/PrintStreamBuildLog.java → ...k/platform/build/PrintStreamBuildLog.java b/...ebuildpack/build/PrintStreamBuildLog.java → ...k/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/...t/cloudnativebuildpack/build/StackId.java → ...oot/buildpack/platform/build/StackId.java b/...t/cloudnativebuildpack/build/StackId.java → ...oot/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/...udnativebuildpack/build/package-info.java → ...uildpack/platform/build/package-info.java b/...udnativebuildpack/build/package-info.java → ...uildpack/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/...loudnativebuildpack/docker/DockerApi.java → .../buildpack/platform/docker/DockerApi.java b/...loudnativebuildpack/docker/DockerApi.java → .../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 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/...docker/DockerConnectionSocketFactory.java → ...docker/DockerConnectionSocketFactory.java b/...docker/DockerConnectionSocketFactory.java → ...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.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/...vebuildpack/docker/DockerDnsResolver.java → ...ck/platform/docker/DockerDnsResolver.java b/...vebuildpack/docker/DockerDnsResolver.java → ...ck/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/...tivebuildpack/docker/DockerException.java → ...pack/platform/docker/DockerException.java b/...tivebuildpack/docker/DockerException.java → ...pack/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/...er/DockerHttpClientConnectionManager.java → ...er/DockerHttpClientConnectionManager.java b/...er/DockerHttpClientConnectionManager.java → ...er/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;