Add Java composites

* with tests copied from https://github.com/paketo-buildpacks/builder-jammy-tiny/tree/main/smoke

Author: anthonydahanne

.github/CODEOWNERS

@@ -1 +1,2 @@
-* @paketo-buildpacks/builders-maintainers
+* @paketo-community/builders-maintainers
+* @paketo-community/java-maintainers

.github/workflows/push-image.yml

@@ -52,9 +52,9 @@ jobs:
         PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }}
         GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}
       run: |
-        DOCKERHUB_ORG="${GITHUB_REPOSITORY_OWNER/-/}" # translates 'paketo-buildpacks' to 'paketobuildpacks'
+        DOCKERHUB_ORG="${GITHUB_REPOSITORY_OWNER/-/}" # translates 'paketo-community' to 'paketocommunity'
         # Strip off the Github org prefix from repo name
-        # paketo-buildpacks/builder-with-some-name --> builder-with-some-name
+        # paketo-community/builder-with-some-name --> builder-with-some-name
         registry_repo=$(echo "${{ github.repository }}" | sed 's/^.*\///')
 
         echo "${PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD}" | docker login --username "${PAKETO_BUILDPACKS_DOCKERHUB_USERNAME}" --password-stdin

README.md

@@ -1,23 +1,23 @@
-# Paketo Jammy Buildpackless Tiny Builder
+# Paketo Jammy Java Tiny Builder
 
-## `paketobuildpacks/builder-jammy-buildpackless-tiny`
+## `paketobuildpacks/builder-jammy-java-tiny`
 
 This builder uses the [Paketo Jammy Tiny
 Stack](https://github.com/paketo-buildpacks/jammy-tiny-stack) (Ubuntu Jammy
-Jellyfish build image, distroless-like run image) and contains **no buildpacks
-nor order groups**. To use this builder, you must specify buildpacks at build
+Jellyfish build image, distroless-like run image) and contains 
+***only Java composite buildpacks**. To use this builder, 
+you must specify buildpacks at build
 time using whatever mechanisms your CNB platform of choice offers.
 
 For example, with the `pack` CLI, use `--buildpack` as follows:
 ```
-pack build go-with-buildpackless-builder \
-           --buildpack gcr.io/paketo-buildpacks/go \
-           --builder paketobuildpacks/builder-jammy-buildpackless-tiny:latest
+pack build great-java-app \
+    --builder paketobuildpacks/builder-jammy-java-tiny:latest
 ```
 
 To see which versions of build and run images and the lifecycle are in a given
 builder version, see the
-[Releases](https://github.com/paketo-buildpacks/builder-jammy-buildpackless-tiny/releases)
+[Releases](https://github.com/paketo-buildpacks/builder-jammy-java-tiny/releases)
 on this repository. This information is also available in the `builder.toml`.
 
 For more information about this builder and how to use it, visit the [Paketo

builder.toml

@@ -1,8 +1,28 @@
-description = "Tiny base image (Ubuntu Jammy Jellyfish build image, distroless-like run image) with no buildpacks included. To use, specify buildpacks at build time."
+description = "Tiny base image (Ubuntu Jammy Jellyfish build image, distroless-like run image) with only Java buildpacks included. To use, specify buildpacks at build time."
+
+[[buildpacks]]
+  uri = "docker://gcr.io/paketo-buildpacks/java-native-image:9.8.0"
+  version = "9.8.0"
+
+[[buildpacks]]
+  uri = "docker://gcr.io/paketo-buildpacks/java:15.2.0"
+  version = "15.2.0"
 
 [lifecycle]
   version = "0.20.0"
 
+[[order]]
+
+[[order.group]]
+  id = "paketo-buildpacks/java-native-image"
+  version = "9.8.0"
+
+[[order]]
+
+[[order.group]]
+  id = "paketo-buildpacks/java"
+  version = "15.2.0"
+
 [stack]
   build-image = "docker.io/paketobuildpacks/build-jammy-tiny:0.2.43"
   id = "io.buildpacks.stacks.jammy.tiny"

go.mod

@@ -1,4 +1,4 @@
-module github.com/paketo-buildpacks/builder-jammy-buildpackless-tiny
+module github.com/paketo-community/builder-jammy-java-tiny
 
 go 1.22.5
 

smoke.json

@@ -1,31 +1,25 @@
 package smoke_test
 
 import (
-	"encoding/json"
 	"flag"
-	"os"
 	"testing"
 	"time"
 
+	"github.com/onsi/gomega/format"
 	"github.com/sclevine/spec"
 	"github.com/sclevine/spec/report"
 
 	. "github.com/onsi/gomega"
 )
 
-var (
-	Builder string
-
-	config struct {
-		Procfile string `json:"procfile"`
-	}
-)
+var Builder string
 
 func init() {
 	flag.StringVar(&Builder, "name", "", "")
 }
 
 func TestSmoke(t *testing.T) {
+	format.MaxLength = 0
 	Expect := NewWithT(t).Expect
 
 	flag.Parse()
@@ -34,13 +28,8 @@ func TestSmoke(t *testing.T) {
 
 	SetDefaultEventuallyTimeout(60 * time.Second)
 
-	file, err := os.Open("../smoke.json")
-	Expect(err).NotTo(HaveOccurred())
-
-	Expect(json.NewDecoder(file).Decode(&config)).To(Succeed())
-	Expect(file.Close()).To(Succeed())
-
-	suite := spec.New("Buildpackless Smoke", spec.Parallel(), spec.Report(report.Terminal{}))
-	suite("Procfile", testProcfile)
+	suite := spec.New("Smoke", spec.Parallel(), spec.Report(report.Terminal{}))
+	suite("Java Native Image", testJavaNativeImage)
+	suite("Java", testJava)
 	suite.Run(t)
 }

smoke/init_test.go

@@ -0,0 +1,80 @@
+package smoke_test
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/paketo-buildpacks/occam"
+	"github.com/sclevine/spec"
+
+	. "github.com/onsi/gomega"
+	. "github.com/paketo-buildpacks/occam/matchers"
+)
+
+func testJavaNativeImage(t *testing.T, context spec.G, it spec.S) {
+	var (
+		Expect     = NewWithT(t).Expect
+		Eventually = NewWithT(t).Eventually
+
+		pack   occam.Pack
+		docker occam.Docker
+	)
+
+	it.Before(func() {
+		pack = occam.NewPack().WithVerbose().WithNoColor()
+		docker = occam.NewDocker()
+	})
+
+	context("detects a Java Native Image app", func() {
+		var (
+			image     occam.Image
+			container occam.Container
+
+			name   string
+			source string
+		)
+
+		it.Before(func() {
+			var err error
+			name, err = occam.RandomName()
+			Expect(err).NotTo(HaveOccurred())
+		})
+
+		it.After(func() {
+			Expect(docker.Container.Remove.Execute(container.ID)).To(Succeed())
+			Expect(docker.Volume.Remove.Execute(occam.CacheVolumeNames(name))).To(Succeed())
+			Expect(docker.Image.Remove.Execute(image.ID)).To(Succeed())
+			Expect(os.RemoveAll(source)).To(Succeed())
+		})
+
+		it("builds successfully", func() {
+			var err error
+			source, err = occam.Source(filepath.Join("testdata", "java-native-image"))
+			Expect(err).NotTo(HaveOccurred())
+
+			var logs fmt.Stringer
+			image, logs, err = pack.Build.
+				WithPullPolicy("never").
+				WithBuilder(Builder).
+				WithEnv(map[string]string{"BP_NATIVE_IMAGE": "true", "BP_JVM_VERSION": "17", "BP_MAVEN_BUILD_ARGUMENTS": "-Pnative --batch-mode -Dmaven.test.skip=true --no-transfer-progress package", "USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM": "false"}).
+				Execute(name, source)
+			Expect(err).ToNot(HaveOccurred(), logs.String)
+
+			container, err = docker.Container.Run.
+				WithEnv(map[string]string{"PORT": "8080"}).
+				WithPublish("8080").
+				Execute(image.ID)
+			Expect(err).NotTo(HaveOccurred())
+
+			Eventually(container).Should(BeAvailable())
+
+			Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for BellSoft Liberica")))
+			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 Buildpack for Native Image")))
+		})
+	})
+}

smoke/java_native_image_test.go

@@ -9,50 +9,37 @@ import (
 	"github.com/paketo-buildpacks/occam"
 	"github.com/sclevine/spec"
 
-	"runtime"
-
 	. "github.com/onsi/gomega"
 	. "github.com/paketo-buildpacks/occam/matchers"
 )
 
-func testProcfile(t *testing.T, context spec.G, it spec.S) {
+func testJava(t *testing.T, context spec.G, it spec.S) {
 	var (
 		Expect     = NewWithT(t).Expect
 		Eventually = NewWithT(t).Eventually
 
 		pack   occam.Pack
 		docker occam.Docker
-		arch   string
 	)
 
 	it.Before(func() {
 		pack = occam.NewPack().WithVerbose().WithNoColor()
 		docker = occam.NewDocker()
-		arch = runtime.GOARCH
 	})
 
-	context("procfile buildpack specified at build time", func() {
+	context("detects a Java app", func() {
 		var (
 			image     occam.Image
 			container occam.Container
 
-			name    string
-			source  string
-			process string
+			name   string
+			source string
 		)
 
 		it.Before(func() {
 			var err error
 			name, err = occam.RandomName()
 			Expect(err).NotTo(HaveOccurred())
-
-			if arch == "amd64" {
-				fmt.Println("Running on AMD64 architecture")
-				process = "amd64-process"
-			} else if arch == "arm64" {
-				fmt.Println("Running on ARM64 architecture")
-				process = "arm64-process"
-			}
 		})
 
 		it.After(func() {
@@ -62,18 +49,17 @@ func testProcfile(t *testing.T, context spec.G, it spec.S) {
 			Expect(os.RemoveAll(source)).To(Succeed())
 		})
 
-		it("builds Procfile app successfully", func() {
+		it("builds successfully", func() {
 			var err error
-			source, err = occam.Source(filepath.Join("testdata", "procfile"))
+			// this is OK, the app also works for running with a JVM
+			source, err = occam.Source(filepath.Join("testdata", "java-native-image"))
 			Expect(err).NotTo(HaveOccurred())
 
 			var logs fmt.Stringer
 			image, logs, err = pack.Build.
+				WithPullPolicy("never").
 				WithBuilder(Builder).
-				WithBuildpacks(
-					config.Procfile,
-				).
-				WithAdditionalBuildArgs("--default-process", process).
+				WithEnv(map[string]string{"BP_JVM_VERSION": "17"}).
 				Execute(name, source)
 			Expect(err).ToNot(HaveOccurred(), logs.String)
 
@@ -85,7 +71,10 @@ func testProcfile(t *testing.T, context spec.G, it spec.S) {
 
 			Eventually(container).Should(BeAvailable())
 
-			Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Procfile")))
+			Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for BellSoft Liberica")))
+			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")))
 		})
 	})
 }

smoke/procfile_test.go smoke/java_test.gosmoke/procfile_test.go renamed to smoke/java_test.go

@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/