Skip to content

Commit 11fce93

Browse files
committed
fix(supply): show manifest default version label in framework install log
- frameworkVersionSuffix now shows '(default: X.Y.Z)' instead of '(X.Y.Z)' making clear this is the manifest default, not necessarily the installed version - Reverts java-cfenv DependencyIdentifier back to 'java-cfenv' (no hack needed) - Removes extra Info log from JavaCfEnvFramework.Supply() Result: single 'Installing Java CF Env (default: 3.5.1)' line; actual installed version visible from libbuildpack install line
1 parent 2f6acf8 commit 11fce93

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/java/frameworks/java_cf_env.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ func (j *JavaCfEnvFramework) Supply() error {
7171
} else {
7272
j.context.Log.Debug("Resolved Java CF Env version pattern '%s' to %s", versionPattern, resolvedVersion)
7373
}
74-
7574
// Install java-cfenv JAR
7675
javaCfEnvDir := filepath.Join(j.context.Stager.DepDir(), "java_cf_env")
7776
if err := j.context.Installer.InstallDependency(dep, javaCfEnvDir); err != nil {

src/java/frameworks/java_cf_env_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,12 @@ var _ = Describe("Java CF Env", func() {
219219
})
220220
})
221221

222+
Describe("DependencyIdentifier", func() {
223+
It("returns java-cfenv so supply.go can look up the manifest default version", func() {
224+
Expect(fw.DependencyIdentifier()).To(Equal("java-cfenv"))
225+
})
226+
})
227+
222228
Describe("Finalize", func() {
223229
Context("when the JAR is present", func() {
224230
BeforeEach(func() {

src/java/supply/supply.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,5 +181,5 @@ func (s *Supplier) frameworkVersionSuffix(framework frameworks.Framework) string
181181
return ""
182182
}
183183

184-
return fmt.Sprintf(" (%s)", dependency.Version)
184+
return fmt.Sprintf(" (default: %s)", dependency.Version)
185185
}

0 commit comments

Comments
 (0)