Skip to content

Commit a58cfa6

Browse files
lost-namesanathkr
authored andcommitted
fix: fixes java version matching for gradle when only major version provided (#104) (#110)
1 parent 57d1181 commit a58cfa6

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

aws_lambda_builders/workflows/java_gradle/gradle_validator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def validated_binary_path(self):
4343
def _get_major_version(self, gradle_path):
4444
vs = self._get_jvm_string(gradle_path)
4545
if vs:
46-
m = re.search(r'JVM:\s+(\d.*)', vs)
46+
m = re.search(r'JVM:\s+([\d\.]+)', vs)
4747
version = m.group(1).split('.')
4848
# For Java 8 or earlier, version strings begin with 1.{Major Version}
4949
if version[0] == '1':

tests/unit/workflows/java_gradle/test_gradle_validator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ def setUp(self, MockOSUtils):
3030
@parameterized.expand([
3131
'1.7.0',
3232
'1.8.9',
33-
'11.0.0'
33+
'11.0.0',
34+
'12 (Fluff)',
35+
'12'
3436
])
3537
def test_accepts_any_jvm_mv(self, version):
3638
version_string = ('JVM: %s' % version).encode()

0 commit comments

Comments
 (0)