Bug 568295 - [16] testLimitModulesTest might fail with Java 16
Change-Id: I4396f64a329e35c005dec7b589e71078c29b7c2b
diff --git a/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
index 93d1a6d..0c8e6a6 100644
--- a/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.debug.tests; singleton:=true
-Bundle-Version: 3.11.1100.qualifier
+Bundle-Version: 3.11.1150.qualifier
Bundle-ClassPath: javadebugtests.jar
Bundle-Activator: org.eclipse.jdt.debug.testplugin.JavaTestPlugin
Bundle-Vendor: %providerName
diff --git a/org.eclipse.jdt.debug.tests/pom.xml b/org.eclipse.jdt.debug.tests/pom.xml
index 1449cd9..d93fd40 100644
--- a/org.eclipse.jdt.debug.tests/pom.xml
+++ b/org.eclipse.jdt.debug.tests/pom.xml
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug.tests</artifactId>
- <version>3.11.1100-SNAPSHOT</version>
+ <version>3.11.1150-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ModuleOptionsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ModuleOptionsTests.java
index 95d0c2c..80c975f 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ModuleOptionsTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ModuleOptionsTests.java
@@ -83,6 +83,18 @@
+ "jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported," // jdk.scripting.nashorn removed in 15
+ "jdk.unsupported.desktop," //
+ "jdk.xml.dom";
+ private static final String ASSUMED_DEFAULT_MODULES_16 = "java.se," //
+ + "jdk.accessibility,jdk.attach,jdk.compiler,jdk.dynalink,jdk.httpserver," //
+ + "jdk.incubator.foreign,jdk.incubator.vector," // jdk.incubator.vector added in 16
+ + "jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jdi," //
+ + "jdk.jfr," //
+ + "jdk.jshell,jdk.jsobject,jdk.management," //
+ + "jdk.management.jfr," //
+ + "jdk.net," //
+ + "jdk.nio.mapmode," //
+ + "jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,"
+ + "jdk.unsupported.desktop," //
+ + "jdk.xml.dom";
public ModuleOptionsTests(String name) {
@@ -216,6 +228,22 @@
+ "jdk.unsupported.desktop," //
+ "jdk.xml.dom";
break;
+ case ASSUMED_DEFAULT_MODULES_16:
+ expectedModules = "java.se," //
+ + "jdk.accessibility," //
+ + "jdk.dynalink,"
+ + "jdk.httpserver," //
+ + "jdk.incubator.foreign,jdk.incubator.vector," // jdk.incubator.vector added in 16
+ + "jdk.jartool,jdk.jconsole,jdk.jshell," //
+ + "jdk.jsobject," //
+ + "jdk.management.jfr," //
+ + "jdk.net," //
+ + "jdk.nio.mapmode," //
+ + "jdk.sctp,"
+ + "jdk.security.auth,jdk.security.jgss,jdk.unsupported," //
+ + "jdk.unsupported.desktop," //
+ + "jdk.xml.dom";
+ break;
default:
fail("Unknown set of default modules " + String.join(",", defaultModules));
return;
