Disables loading certificates when NIK is used with Java 18+

paketo-buildpacks · Nov 29, 2022 · caa4c97 · caa4c97
1 parent 563c8ff
commit caa4c97
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/jdk.go b/jdk.go
@@ -88,7 +88,7 @@ func (j JDK) Contribute(layer libcnb.Layer) (libcnb.Layer, error) {
 				return libcnb.Layer{}, fmt.Errorf("unable to load certificates\n%w", err)
 			}
 		} else {
-			j.Logger.Bodyf("%s: The JVM cacerts entries cannot be loaded with Java 18, for more information see: https://github.com/paketo-buildpacks/libjvm/issues/158", color.YellowString("Warning"))
+			j.Logger.Bodyf("%s: The JVM cacerts entries cannot be loaded with Java 18+, for more information see: https://github.com/paketo-buildpacks/libjvm/issues/158", color.YellowString("Warning"))
 		}
 		return layer, nil
 	})

diff --git a/jlink.go b/jlink.go
@@ -93,7 +93,7 @@ func (j JLink) Contribute(layer libcnb.Layer) (libcnb.Layer, error) {
 				return libcnb.Layer{}, fmt.Errorf("unable to load certificates\n%w", err)
 			}
 		} else {
-			j.Logger.Bodyf("%s: The JVM cacerts entries cannot be loaded with Java 18, for more information see: https://github.com/paketo-buildpacks/libjvm/issues/158", color.YellowString("Warning"))
+			j.Logger.Bodyf("%s: The JVM cacerts entries cannot be loaded with Java 18+, for more information see: https://github.com/paketo-buildpacks/libjvm/issues/158", color.YellowString("Warning"))
 		}
 
 		if IsBuildContribution(j.Metadata) {

diff --git a/jre.go b/jre.go
@@ -94,7 +94,7 @@ func (j JRE) Contribute(layer libcnb.Layer) (libcnb.Layer, error) {
 				return libcnb.Layer{}, fmt.Errorf("unable to load certificates\n%w", err)
 			}
 		} else {
-			j.Logger.Bodyf("%s: The JVM cacerts entries cannot be loaded with Java 18, for more information see: https://github.com/paketo-buildpacks/libjvm/issues/158", color.YellowString("Warning"))
+			j.Logger.Bodyf("%s: The JVM cacerts entries cannot be loaded with Java 18+, for more information see: https://github.com/paketo-buildpacks/libjvm/issues/158", color.YellowString("Warning"))
 		}
 
 		if IsBuildContribution(j.Metadata) {

diff --git a/nik.go b/nik.go
@@ -123,8 +123,12 @@ func (n NIK) Contribute(layer libcnb.Layer) (libcnb.Layer, error) {
 			return  libcnb.Layer{}, fmt.Errorf("unable to set keystore file permissions\n%w", err)
 		}
 
-		if err := n.CertificateLoader.Load(keyStorePath, "changeit"); err != nil {
-			return libcnb.Layer{}, fmt.Errorf("unable to load certificates\n%w", err)
+		if IsBeforeJava18(n.JDKDependency.Version) {
+			if err := n.CertificateLoader.Load(keyStorePath, "changeit"); err != nil {
+				return libcnb.Layer{}, fmt.Errorf("unable to load certificates\n%w", err)
+			}
+		} else {
+			n.Logger.Bodyf("%s: The JVM cacerts entries cannot be loaded with Java 18+, for more information see: https://github.com/paketo-buildpacks/libjvm/issues/158", color.YellowString("Warning"))
 		}
 
 		if n.NativeDependency != nil {