diff --git a/platform/platform-impl/src/com/intellij/util/JdkBundle.java b/platform/platform-impl/src/com/intellij/util/JdkBundle.java index f932301a89ab..f6f90e546c07 100644 --- a/platform/platform-impl/src/com/intellij/util/JdkBundle.java +++ b/platform/platform-impl/src/com/intellij/util/JdkBundle.java @@ -33,7 +33,7 @@ public class JdkBundle { @NotNull private static final Pattern[] VERSION_UPDATE_PATTERNS = { - Pattern.compile("^java version \"([\\d]+\\.[\\d]+\\.[\\d]+)_([\\d]+)\".*", Pattern.MULTILINE), + Pattern.compile("^java version \"([\\d]+\\.[\\d]+\\.[\\d]+)_([\\d]+).*\".*", Pattern.MULTILINE), Pattern.compile("^openjdk version \"([\\d]+\\.[\\d]+\\.[\\d]+)_([\\d]+).*\".*", Pattern.MULTILINE), Pattern.compile("^[a-zA-Z() \"\\d]*([\\d]+\\.[\\d]+\\.?[\\d]*).*", Pattern.MULTILINE) }; diff --git a/platform/util/testSrc/com/intellij/util/VersionUtilTest.java b/platform/util/testSrc/com/intellij/util/VersionUtilTest.java index b6bbc8d81f96..938d0cab902c 100644 --- a/platform/util/testSrc/com/intellij/util/VersionUtilTest.java +++ b/platform/util/testSrc/com/intellij/util/VersionUtilTest.java @@ -15,7 +15,7 @@ public class VersionUtilTest extends TestCase { Pattern.compile("^[a-zA-Z() \\d]*([\\d]+\\.[\\d]+\\.?[\\d]*).*", Pattern.MULTILINE) }; private static final Pattern[] VERSION_UPDATE_PATTERNS = { - Pattern.compile("^java version \"([\\d]+\\.[\\d]+\\.[\\d]+)_([\\d]+)\".*", Pattern.MULTILINE), + Pattern.compile("^java version \"([\\d]+\\.[\\d]+\\.[\\d]+)_([\\d]+).*\".*", Pattern.MULTILINE), Pattern.compile("^openjdk version \"([\\d]+\\.[\\d]+\\.[\\d]+)_([\\d]+).*\".*", Pattern.MULTILINE), Pattern.compile("^[a-zA-Z() \"\\d]*([\\d]+\\.[\\d]+\\.?[\\d]*).*", Pattern.MULTILINE) }; @@ -39,6 +39,7 @@ public class VersionUtilTest extends TestCase { {"java version \"1.6.0\"", new Version(1, 6, 0), new Integer(0)}, {"java version \"1.6.0_36\"", new Version(1, 6, 0), new Integer(36)}, {"java version \"1.7.0_85\"", new Version(1, 7, 0), new Integer(85)}, + {"java version \"1.8.0_122-ea\"", new Version(1, 8, 0), new Integer(122)}, {"openjdk version \"1.8.0_45-internal\"", new Version(1, 8, 0), new Integer(45)}, {"openjdk version \"1.8.1_60-release\"", new Version(1, 8, 1), new Integer(60)} };