From 982492dce3d9a19621d4c72532f5c0f151af537c Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Thu, 1 Sep 2022 13:24:18 -0400 Subject: [PATCH] Implement RFC 0050: Partial Rename Buildpacks Partially renames 'Paketo Buildpack' to 'Paketo Buildpack for ' where present in README or Go code. Implements RFC 0050, https://github.com/paketo-buildpacks/rfcs/issues/233, for this project. This is done for a subset of buildpacks: - spring-boot - appdynamics - datadog - jprofiler - google-stackdriver - adoptium - sbt - maven - gradle - syft - executable-jar This should unblock the builders until the rest of the buildpacks can be released under the new name. Signed-off-by: Daniel Mikusa --- java/java_test.go | 44 ++++++++++----------- java/native-image/java_native_image_test.go | 14 +++---- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/java/java_test.go b/java/java_test.go index 029be4ca..6b59bf31 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -110,7 +110,7 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(logs).To(ContainLines(ContainSubstring("Paketo CA Certificates Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo SBT Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for SBT"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo DistZip Buildpack"))) container, err = docker.Container.Run. @@ -139,9 +139,9 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(logs).To(ContainLines(ContainSubstring("Paketo CA Certificates Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Maven Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Executable JAR Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Spring Boot Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Maven"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Executable JAR"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Spring Boot"))) container, err = docker.Container.Run. WithPublish("8080"). @@ -169,9 +169,9 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(logs).To(ContainLines(ContainSubstring("Paketo CA Certificates Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Maven Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Executable JAR Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Spring Boot Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Maven"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Executable JAR"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Spring Boot"))) container, err = docker.Container.Run. WithPublish("8080"). @@ -206,7 +206,7 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(logs).To(ContainLines(ContainSubstring("Paketo CA Certificates Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Gradle Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Gradle"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo DistZip Buildpack"))) container, err = docker.Container.Run. @@ -238,8 +238,8 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(logs).To(ContainLines(ContainSubstring("Paketo CA Certificates Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Gradle Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Executable JAR Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Gradle"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Executable JAR"))) container, err = docker.Container.Run. WithPublish("8080"). @@ -265,8 +265,8 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(logs).To(ContainLines(ContainSubstring("Paketo CA Certificates Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Executable JAR Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Spring Boot Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Executable JAR"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Spring Boot"))) container, err = docker.Container.Run. WithPublish("8080"). @@ -297,9 +297,9 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(logs).To(ContainLines(ContainSubstring("Paketo CA Certificates Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Gradle Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Executable JAR Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Spring Boot Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Gradle"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Executable JAR"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Spring Boot"))) container, err = docker.Container.Run. WithPublish("8080"). @@ -331,7 +331,7 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(logs).To(ContainLines(ContainSubstring("Paketo CA Certificates Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo Leiningen Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Executable JAR Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Executable JAR"))) container, err = docker.Container.Run. WithPublish("8080"). @@ -363,9 +363,9 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(logs).To(ContainLines(ContainSubstring("Paketo CA Certificates Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Maven Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Executable JAR Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Spring Boot Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Maven"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Executable JAR"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Spring Boot"))) container, err = docker.Container.Run. WithPublish("8080"). @@ -393,7 +393,7 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(logs).To(ContainLines(ContainSubstring("Paketo CA Certificates Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Maven Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Maven"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo Apache Tomcat Buildpack"))) container, err = docker.Container.Run. @@ -426,7 +426,7 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(logs).To(ContainLines(ContainSubstring("Paketo CA Certificates Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo Clojure Tools Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Executable JAR Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Executable JAR"))) container, err = docker.Container.Run. WithPublish("8080"). @@ -463,7 +463,7 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(logs).To(ContainLines(ContainSubstring("Paketo CA Certificates Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo Clojure Tools Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Executable JAR Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Executable JAR"))) container, err = docker.Container.Run. WithPublish("8080"). diff --git a/java/native-image/java_native_image_test.go b/java/native-image/java_native_image_test.go index 8db1d9af..d2e48b8c 100644 --- a/java/native-image/java_native_image_test.go +++ b/java/native-image/java_native_image_test.go @@ -100,9 +100,9 @@ func testJNIWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Eventually(container).Should(BeAvailable()) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Maven Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Executable JAR Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Spring Boot Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Maven"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Executable JAR"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Spring Boot"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo Native Image Buildpack"))) Eventually(container).Should(Serve(ContainSubstring("UP")).OnPort(8080).WithEndpoint("/actuator/health")) @@ -126,8 +126,8 @@ func testJNIWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(err).ToNot(HaveOccurred(), logs.String) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Maven Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Executable JAR Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Maven"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Executable JAR"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo Native Image Buildpack"))) container, err = docker.Container.Run.Execute(image.ID) @@ -162,8 +162,8 @@ func testJNIWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { Expect(err).ToNot(HaveOccurred(), logs.String) Expect(logs).To(ContainLines(ContainSubstring("Paketo BellSoft Liberica Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Maven Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Paketo Executable JAR Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Maven"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Executable JAR"))) Expect(logs).To(ContainLines(ContainSubstring("Paketo Native Image Buildpack"))) container, err = docker.Container.Run.