fix: fixes java version matching for gradle when only major version p…

…rovided (#104) (#110)
aws · Apr 9, 2019 · a58cfa6 · a58cfa6
1 parent 57d1181
commit a58cfa6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/aws_lambda_builders/workflows/java_gradle/gradle_validator.py b/aws_lambda_builders/workflows/java_gradle/gradle_validator.py
@@ -43,7 +43,7 @@ def validated_binary_path(self):
     def _get_major_version(self, gradle_path):
         vs = self._get_jvm_string(gradle_path)
         if vs:
-            m = re.search(r'JVM:\s+(\d.*)', vs)
+            m = re.search(r'JVM:\s+([\d\.]+)', vs)
             version = m.group(1).split('.')
             # For Java 8 or earlier, version strings begin with 1.{Major Version}
             if version[0] == '1':

diff --git a/tests/unit/workflows/java_gradle/test_gradle_validator.py b/tests/unit/workflows/java_gradle/test_gradle_validator.py
@@ -30,7 +30,9 @@ def setUp(self, MockOSUtils):
     @parameterized.expand([
         '1.7.0',
         '1.8.9',
-        '11.0.0'
+        '11.0.0',
+        '12 (Fluff)',
+        '12'
     ])
     def test_accepts_any_jvm_mv(self, version):
         version_string = ('JVM:          %s' % version).encode()