From acf22013abc9b4e5ae317d5ad1558504da522a04 Mon Sep 17 00:00:00 2001 From: Vikas Chandra Date: Wed, 31 Jan 2018 15:00:01 +0530 Subject: Bug 530218 - 147 junit failures in PDE build with java 9 Change-Id: Ic52b026e3e261ee7180c2255fd4735b480c22230 Signed-off-by: Vikas Chandra --- .../eclipse/pde/build/tests/BuildConfiguration.java | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/BuildConfiguration.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/BuildConfiguration.java index 332ec961..6b51f698 100644 --- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/BuildConfiguration.java +++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/BuildConfiguration.java @@ -43,7 +43,26 @@ public class BuildConfiguration { defaultBuildConfig.put("basews", Platform.getWS()); defaultBuildConfig.put("basearch", Platform.getOSArch()); defaultBuildConfig.put("filterP2Base", TRUE); - defaultBuildConfig.put("bootclasspath", System.getProperty("sun.boot.class.path")); + + String version = System.getProperty("java.specification.version"); //$NON-NLS-1$ + boolean isJava9OrGreater = false; + if (version != null) { + String[] nums = version.split("\\."); //$NON-NLS-1$ + if (nums.length == 1) { + // java 9 and above + try { + int major = Integer.parseInt(nums[0]); + if (major >= 9) { + isJava9OrGreater = true; + } + + } catch (NumberFormatException e) { + } + } + } + if (isJava9OrGreater == false) + defaultBuildConfig.put("bootclasspath", System.getProperty("sun.boot.class.path")); + defaultScriptConfig = (Properties) defaultBuildConfig.clone(); if (!defaultBuildConfig.containsKey("configs")) defaultScriptConfig.put("configs", "*,*,*"); -- cgit v1.2.3