Skip to content

Commit

Permalink
Merge pull request #8 from BarDweller/main
Browse files Browse the repository at this point in the history
Use build provided version in extension.toml
  • Loading branch information
dmikusa committed Nov 2, 2023
2 parents c37823e + 5ec0ca3 commit a2a055a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
8 changes: 1 addition & 7 deletions cmd/main/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,16 @@ import (
"os"

"github.com/paketo-buildpacks/libjvm/v2"
"github.com/paketo-buildpacks/libjvm/v2/helper"
"github.com/paketo-buildpacks/libpak/v2/log"
ubi8javaextension "github.com/paketo-community/ubi-java-extension/v1"

"github.com/paketo-buildpacks/libpak/v2"
)

func main() {
logger := log.NewPaketoLogger(os.Stdout)

// not used directly, but this forces the helper module to be included in the module
// we need the helper module because of the way that `scripts/build/sh` builds the helper cmd
_ = helper.ActiveProcessorCount{Logger: logger}

libpak.ExtensionMain(
ubi8javaextension.Detect,
libjvm.NewGenerate(logger, ubi8javaextension.Generate()).Generate,
libjvm.NewGenerate(log.NewPaketoLogger(os.Stdout), ubi8javaextension.Generate()).Generate,
)
}
2 changes: 1 addition & 1 deletion extension.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ api = "0.9"
[extension]
id = "paketo-community/ubi-java-extension"
name = "Paketo UBI Java Extension"
version = "0.0.1"
version = "{{.version}}"
description = "This extension installs the appropriate java runtime via dnf"

[metadata]
Expand Down
7 changes: 7 additions & 0 deletions tools.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// go:build tools

package ubi8javaextension

import (
_ "github.com/paketo-buildpacks/libjvm/v2/helper"
)

0 comments on commit a2a055a

Please sign in to comment.