Merge pull request #1358 from cloudfoundry/fix_1338

Fix pointing exact version with BP_JAVA_VERSION

Author: stokpop

src/java/jres/jre.go

@@ -310,16 +310,37 @@ func GetJREVersion(ctx *common.Context, jreName string) (libbuildpack.Dependency
 	return dep, nil
 }
 
+var exactVersionWithBuildRegex = regexp.MustCompile(`^\d+\.\d+\.\d+\+\d+$`)
+var exactVersionRegex = regexp.MustCompile(`^\d+\.\d+\.\d+$`)
+
 func normalizeVersionPattern(version string) string {
+	if strings.Contains(version, "*") {
+		return version
+	}
+	// Exact version with build metadata (e.g. "17.0.19+11") — pass through as-is.
+	// Must be checked before the general "+" replacement below.
+	if isValidVersionWithBuild(version) {
+		return version
+	}
 	if strings.Contains(version, "+") {
 		return strings.ReplaceAll(version, "+", "*")
 	}
-	if strings.Contains(version, "*") {
+	// Exact patch version (e.g. "17.0.13") — already fully specified, don't append ".*"
+	// which would produce an unmatchable pattern like "17.0.13.*".
+	if isValidVersion(version) {
 		return version
 	}
 	return version + ".*"
 }
 
+func isValidVersion(version string) bool {
+	return exactVersionRegex.MatchString(version)
+}
+
+func isValidVersionWithBuild(version string) bool {
+	return exactVersionWithBuildRegex.MatchString(version)
+}
+
 func parseJBPConfigVersion(configValue string) string {
 	re := regexp.MustCompile(`version:\s*['"]?([0-9]+[0-9.*+]*)['"]?`)
 	matches := re.FindStringSubmatch(configValue)

src/java/jres/jre_test.go

@@ -177,11 +177,11 @@ dependencies:
   cf_stacks:
   - cflinuxfs4
 - name: openjdk
-  version: 17.0.13
-  uri: https://example.com/openjdk-17.tar.gz
-  sha256: 2222222222222222222222222222222222222222222222222222222222222222
+  version: 17.0.19+11
+  uri: https://example.com/openjdk-17.0.19+11.tar.gz
+  sha256: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   cf_stacks:
-  - cflinuxfs4
+  - cflinuxfs4  
 - name: openjdk
   version: 21.0.5
   uri: https://example.com/openjdk-21.tar.gz
@@ -295,7 +295,7 @@ dependencies:
 				dep, err := jres.GetJREVersion(ctx, "openjdk")
 				Expect(err).NotTo(HaveOccurred())
 				Expect(dep.Name).To(Equal("openjdk"))
-				Expect(dep.Version).To(Equal("17.0.13"))
+				Expect(dep.Version).To(Equal("17.0.19+11"))
 			})
 
 			It("resolves major version 21", func() {
@@ -311,7 +311,31 @@ dependencies:
 				dep, err := jres.GetJREVersion(ctx, "openjdk")
 				Expect(err).NotTo(HaveOccurred())
 				Expect(dep.Name).To(Equal("openjdk"))
-				Expect(dep.Version).To(Equal("17.0.13"))
+				Expect(dep.Version).To(Equal("17.0.19+11"))
+			})
+
+			It("handles version patterns with wildcards", func() {
+				os.Setenv("BP_JAVA_VERSION", "17.+")
+				dep, err := jres.GetJREVersion(ctx, "openjdk")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(dep.Name).To(Equal("openjdk"))
+				Expect(dep.Version).To(Equal("17.0.19+11"))
+			})
+
+			It("resolves exact patch version", func() {
+				os.Setenv("BP_JAVA_VERSION", "17.0.19")
+				dep, err := jres.GetJREVersion(ctx, "openjdk")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(dep.Name).To(Equal("openjdk"))
+				Expect(dep.Version).To(Equal("17.0.19+11"))
+			})
+
+			It("resolves exact version with build metadata (X.Y.Z+W format)", func() {
+				os.Setenv("BP_JAVA_VERSION", "17.0.19+11")
+				dep, err := jres.GetJREVersion(ctx, "openjdk")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(dep.Name).To(Equal("openjdk"))
+				Expect(dep.Version).To(Equal("17.0.19+11"))
 			})
 		})
 
@@ -370,7 +394,15 @@ dependencies:
 				dep, err := jres.GetJREVersion(ctx, "openjdk")
 				Expect(err).NotTo(HaveOccurred())
 				Expect(dep.Name).To(Equal("openjdk"))
-				Expect(dep.Version).To(Equal("17.0.13"))
+				Expect(dep.Version).To(Equal("17.0.19+11"))
+			})
+
+			It("resolves exact version 17.0.19+11 pattern", func() {
+				os.Setenv("JBP_CONFIG_OPEN_JDK_JRE", "{jre: {version: 17.0.19+11}}")
+				dep, err := jres.GetJREVersion(ctx, "openjdk")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(dep.Name).To(Equal("openjdk"))
+				Expect(dep.Version).To(Equal("17.0.19+11"))
 			})
 
 			It("resolves version 11.+ pattern", func() {