Skip to content

Commit

Permalink
Implement RFC 0050: Partial Rename Buildpacks
Browse files Browse the repository at this point in the history 
    Partially renames 'Paketo <tech> Buildpack' to 'Paketo Buildpack for <tech>' where present in README or Go code.

    Implements RFC 0050, paketo-buildpacks/rfcs#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 <[email protected]>
  • Loading branch information
Daniel Mikusa committed Sep 1, 2022
1 parent 941af2c commit 982492d
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 29 deletions.
44 changes: 22 additions & 22 deletions java/java_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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").
Expand Down Expand Up @@ -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").
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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").
Expand All @@ -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").
Expand Down Expand Up @@ -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").
Expand Down Expand Up @@ -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").
Expand Down Expand Up @@ -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").
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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").
Expand Down Expand Up @@ -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").
Expand Down
14 changes: 7 additions & 7 deletions java/native-image/java_native_image_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand All @@ -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)
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 982492d

Please sign in to comment.