Merge branch 'develop'

Author: aws-sam-cli-bot

aws_lambda_builders/__init__.py

@@ -5,5 +5,5 @@
 # Changing version will trigger a new release!
 # Please make the version change as the last step of your development.
 
-__version__ = "1.52.0"
+__version__ = "1.53.0"
 RPC_PROTOCOL_VERSION = "0.3"

aws_lambda_builders/workflows/java_gradle/gradle_validator.py

@@ -83,5 +83,5 @@ def _get_jvm_string(self, gradle_path):
 
         for line in stdout.splitlines():
             l_dec = decode(line)
-            if "JVM" in l_dec:
+            if l_dec.startswith("JVM") or l_dec.startswith("Launcher JVM"):
                 return l_dec

tests/unit/workflows/java_gradle/test_gradle_validator.py

@@ -69,8 +69,14 @@ def test_emits_warning_when_gradle_excutable_fails(self):
         validator.validate(runtime_path=self.runtime_path)
         self.mock_log.warning.assert_called_with(GradleValidator.VERSION_STRING_WARNING, self.runtime_path)
 
-    def test_emits_warning_when_version_string_not_found(self):
-        version_string = "The Java Version:          9.0.0".encode()
+    @parameterized.expand(
+        [
+            "The Java Version:          9.0.0",
+            "Daemon JVM:    /Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk/Contents/Home (no JDK specified, using current Java home)",
+        ]
+    )
+    def test_emits_warning_when_version_string_not_found(self, path):
+        version_string = path.encode()
         self.mock_os_utils.popen.side_effect = [FakePopen(stdout=version_string, returncode=0)]
         validator = GradleValidator(
             runtime=self.runtime, architecture=self.architecture, os_utils=self.mock_os_utils, log=self.mock_log