Skip to content

Commit 721f203

Browse files
authored
* JBDS-4165 Version parsing error
Fix parse major, minor and patch versions from full version to use with semver module instead of full version with underscore
1 parent cb6539f commit 721f203

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

browser/model/jdk-install.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@ class JdkInstall extends InstallableItem {
3434
}
3535

3636
detectExistingInstall(done = function(){}) {
37-
let versionRegex = /version\s\"(\d+\.\d+\.\d+)_.*\"/,
38-
selectedFolder = '',
39-
extension = '',
40-
command = 'java -XshowSettings';
37+
let versionRegex = /version\s\"(\d+\.\d+\.\d+)_.*\"/;
38+
let versionRegex1 = /(\d+\.\d+\.\d+)_.*/;
39+
let selectedFolder = '';
40+
let extension = '';
41+
let command = 'java -XshowSettings';
4142

42-
this.addOption('install',this.version,'',true);
43+
this.addOption('install',versionRegex1.exec(this.version)[1],'',true);
4344

4445
Promise.resolve().then(()=>{
4546
return this.findMsiInstalledJava();

requirements-linux.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"name": "OpenJDK",
6060
"description": "A free and open source implementation of the Java Platform, Standard Edition (Java SE)",
6161
"bundle": "yes",
62-
"version": "1.8.0.111",
62+
"version": "1.8.0_111",
6363
"dmUrl": "https://developers.redhat.com/download-manager/jdf/file/java-1.8.0-openjdk-1.8.0.111-1.b15.redhat.windows.x86_64.msi?workflow=direct",
6464
"url": "http://download-node-02.eng.bos.redhat.com/brewroot/packages/openjdk8-win/1.8.0.111/1.b15/win/java-1.8.0-openjdk-1.8.0.111-1.b15.redhat.windows.x86_64.msi",
6565
"filename": "java-1.8.0-openjdk-1.8.0.111-1.b15.redhat.windows.x86_64.msi",

0 commit comments

Comments
 (0)