Skip to content

Commit a2a055a

Browse files
authored
Merge pull request #8 from BarDweller/main
Use build provided version in extension.toml
2 parents c37823e + 5ec0ca3 commit a2a055a

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

cmd/main/main.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,16 @@ import (
44
"os"
55

66
"github.com/paketo-buildpacks/libjvm/v2"
7-
"github.com/paketo-buildpacks/libjvm/v2/helper"
87
"github.com/paketo-buildpacks/libpak/v2/log"
98
ubi8javaextension "github.com/paketo-community/ubi-java-extension/v1"
109

1110
"github.com/paketo-buildpacks/libpak/v2"
1211
)
1312

1413
func main() {
15-
logger := log.NewPaketoLogger(os.Stdout)
16-
17-
// not used directly, but this forces the helper module to be included in the module
18-
// we need the helper module because of the way that `scripts/build/sh` builds the helper cmd
19-
_ = helper.ActiveProcessorCount{Logger: logger}
2014

2115
libpak.ExtensionMain(
2216
ubi8javaextension.Detect,
23-
libjvm.NewGenerate(logger, ubi8javaextension.Generate()).Generate,
17+
libjvm.NewGenerate(log.NewPaketoLogger(os.Stdout), ubi8javaextension.Generate()).Generate,
2418
)
2519
}

extension.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ api = "0.9"
33
[extension]
44
id = "paketo-community/ubi-java-extension"
55
name = "Paketo UBI Java Extension"
6-
version = "0.0.1"
6+
version = "{{.version}}"
77
description = "This extension installs the appropriate java runtime via dnf"
88

99
[metadata]

tools.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// go:build tools
2+
3+
package ubi8javaextension
4+
5+
import (
6+
_ "github.com/paketo-buildpacks/libjvm/v2/helper"
7+
)

0 commit comments

Comments
 (0)